[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 54ce3b1e845a974a5983f0728219f0b2cf32a887
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 10 05:28:28 2004 +0000

            Reviewed by Dave.
    
    	<rdar://problem/3671555>: Blot scrolls to the top every time you type
    
            * khtml/xml/dom_selection.cpp:
            (DOM::Selection::getRepaintRect): If the caret position is invalid, recompute it.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6806 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index bba8af6..7d964b8 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-06-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Dave.
+
+	<rdar://problem/3671555>: Blot scrolls to the top every time you type
+	
+        * khtml/xml/dom_selection.cpp:
+        (DOM::Selection::getRepaintRect): If the caret position is invalid, recompute it.
+
 2004-06-09  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3607091, implement a style that prevents zoom and min font size from taking effect.
diff --git a/WebCore/khtml/editing/SelectionController.cpp b/WebCore/khtml/editing/SelectionController.cpp
index 178f9fb..d760d8f 100644
--- a/WebCore/khtml/editing/SelectionController.cpp
+++ b/WebCore/khtml/editing/SelectionController.cpp
@@ -454,6 +454,10 @@ void Selection::layoutCaret()
 
 QRect Selection::getRepaintRect() const
 {
+    if (m_needsCaretLayout) {
+        const_cast<Selection *>(this)->layoutCaret();
+    }
+
     // EDIT FIXME: fudge a bit to make sure we don't leave behind artifacts
     return QRect(m_caretX - 1, m_caretY - 1, 3, m_caretSize + 2);
 }
diff --git a/WebCore/khtml/editing/selection.cpp b/WebCore/khtml/editing/selection.cpp
index 178f9fb..d760d8f 100644
--- a/WebCore/khtml/editing/selection.cpp
+++ b/WebCore/khtml/editing/selection.cpp
@@ -454,6 +454,10 @@ void Selection::layoutCaret()
 
 QRect Selection::getRepaintRect() const
 {
+    if (m_needsCaretLayout) {
+        const_cast<Selection *>(this)->layoutCaret();
+    }
+
     // EDIT FIXME: fudge a bit to make sure we don't leave behind artifacts
     return QRect(m_caretX - 1, m_caretY - 1, 3, m_caretSize + 2);
 }
diff --git a/WebCore/khtml/xml/dom_selection.cpp b/WebCore/khtml/xml/dom_selection.cpp
index 178f9fb..d760d8f 100644
--- a/WebCore/khtml/xml/dom_selection.cpp
+++ b/WebCore/khtml/xml/dom_selection.cpp
@@ -454,6 +454,10 @@ void Selection::layoutCaret()
 
 QRect Selection::getRepaintRect() const
 {
+    if (m_needsCaretLayout) {
+        const_cast<Selection *>(this)->layoutCaret();
+    }
+
     // EDIT FIXME: fudge a bit to make sure we don't leave behind artifacts
     return QRect(m_caretX - 1, m_caretY - 1, 3, m_caretSize + 2);
 }

-- 
WebKit Debian packaging