Changeset 81384 in webkit

Timestamp:

Mar 17, 2011 1:49:11 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

2011-03-17 Ryosuke Niwa <​rniwa@webkit.org>

Reviewed by Adele Peterson and Enrica Casucci.

Assert that editing does not ignore position's anchorNode if position is an offset in anchor
​https://bugs.webkit.org/show_bug.cgi?id=56027

Debug build fix.

• dom/Element.cpp: (WebCore::Element::updateFocusAppearance): "this" can be an input element so can't always instantiate a position inside the node. Call firstPositionInOrBeforeNode instead.
• editing/ReplaceSelectionCommand.cpp: (WebCore::positionAvoidingPrecedingNodes): Exit early when a node's content is ignored by editing instead of just when the node is br.
• editing/htmlediting.cpp: (WebCore::lastEditablePositionBeforePositionInRoot): The shadow ancestor node is usually an input element so don't instantiate a position inside it. Call firstPositionInOrBeforeNode instead.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Element.cpp (modified) (2 diffs)
• editing/ReplaceSelectionCommand.cpp (modified) (1 diff)
• editing/htmlediting.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-17  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Adele Peterson and Enrica Casucci.
+
+        Assert that editing does not ignore position's anchorNode if position is an offset in anchor
+        https://bugs.webkit.org/show_bug.cgi?id=56027
+
+        Debug build fix.
+
+        * dom/Element.cpp:
+        (WebCore::Element::updateFocusAppearance): "this" can be an input element so can't always instantiate
+        a position inside the node. Call firstPositionInOrBeforeNode instead.
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::positionAvoidingPrecedingNodes): Exit early when a node's content is ignored by editing instead
+        of just when the node is br.
+        * editing/htmlediting.cpp:
+        (WebCore::lastEditablePositionBeforePositionInRoot): The shadow ancestor node is usually an input element
+        so don't instantiate a position inside it. Call firstPositionInOrBeforeNode instead.
+
 2011-03-17  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/dom/Element.cpp

@@ -58 +58 @@
 #include "WebKitAnimationList.h"
 #include "XMLNames.h"
+#include "htmlediting.h"
 #include <wtf/text/CString.h>
 
@@ -1555 +1556 @@
 
         // FIXME: We should restore the previous selection if there is one.
-        VisibleSelection newSelection = VisibleSelection(firstPositionInNode(this), DOWNSTREAM);
+        VisibleSelection newSelection = VisibleSelection(firstPositionInOrBeforeNode(this), DOWNSTREAM);
         
         if (frame->selection()->shouldChangeSelection(newSelection)) {

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -111 +111 @@
 {
     // If we're already on a break, it's probably a placeholder and we shouldn't change our position.
-    if (pos.deprecatedNode()->hasTagName(brTag))
+    if (editingIgnoresContent(pos.deprecatedNode()))
         return pos;
 

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -301 +301 @@
 
     Position p = position;
-    
-    if (Node* shadowAncestor = p.deprecatedNode()->shadowAncestorNode())
+
+    if (Node* shadowAncestor = p.deprecatedNode()->shadowAncestorNode()) {
         if (shadowAncestor != p.deprecatedNode())
-            p = firstPositionInNode(shadowAncestor);
+            p = firstPositionInOrBeforeNode(shadowAncestor);
+    }
     
     while (p.deprecatedNode() && !isEditablePosition(p) && p.deprecatedNode()->isDescendantOf(highestRoot))