Changeset 86104 in webkit

Timestamp:

May 9, 2011 4:37:03 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-05-09 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Darin Adler.

REGRESSION(r86039): DragCaretController doesn't draw caret
​https://bugs.webkit.org/show_bug.cgi?id=60505

Removed an early exit in setCaretPosition introduced by r86039.
Also replaced calls to containerNode by deprecatedNode since rendering code doesn't
support container node for rendering caret.

• editing/FrameSelection.cpp: (WebCore::DragCaretController::setCaretPosition):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/FrameSelection.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-09  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Darin Adler.
+
+        REGRESSION(r86039): DragCaretController doesn't draw caret
+        https://bugs.webkit.org/show_bug.cgi?id=60505
+
+        Removed an early exit in setCaretPosition introduced by r86039.
+        Also replaced calls to containerNode by deprecatedNode since rendering code doesn't
+        support container node for rendering caret.
+
+        * editing/FrameSelection.cpp:
+        (WebCore::DragCaretController::setCaretPosition):
+
 2011-04-29  Martin Robinson  <mrobinson@igalia.com>
 

trunk/Source/WebCore/editing/FrameSelection.cpp

@@ -144 +144 @@
 void DragCaretController::setCaretPosition(const VisiblePosition& position)
 {
-    if (m_position == position)
-        return;
-
-    if (Node* node = m_position.deepEquivalent().containerNode())
+    if (Node* node = m_position.deepEquivalent().deprecatedNode())
         invalidateCaretRect(node);
     m_position = position;
     m_caretRectNeedsUpdate = true;
     Document* document = 0;
-    if (Node* node = m_position.deepEquivalent().containerNode()) {
+    if (Node* node = m_position.deepEquivalent().deprecatedNode()) {
         invalidateCaretRect(node);
         document = node->document();