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: https://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 bba8af640a25360d9abfd9a47d65cfdf6435ccb6..7d964b8a65a3ebe25d5080972f92f381ea072b8f 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2004-06-09  Maciej Stachowiak  <mjs@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@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 178f9fb1b2e540446b63b2368075a0a7d53dd28f..d760d8fcbffa86f962801469bf00a3d6c10512d3 100644 (file)
--- 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 178f9fb1b2e540446b63b2368075a0a7d53dd28f..d760d8fcbffa86f962801469bf00a3d6c10512d3 100644 (file)
--- 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 178f9fb1b2e540446b63b2368075a0a7d53dd28f..d760d8fcbffa86f962801469bf00a3d6c10512d3 100644 (file)
--- 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);
 }