Changeset 80317 in webkit

Timestamp:

Mar 3, 2011 8:58:20 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

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

Reviewed by Kent Tamura.

Stop calling deprecatedNode and deprecatedEditingOffset in InsertTextCommand
​https://bugs.webkit.org/show_bug.cgi?id=55352

Stopped calling deprecatedNode and deprecatedEditingOffset in the following functions:

• editing/CompositeEditCommand.cpp: (WebCore::CompositeEditCommand::positionOutsideTabSpan): Takes care of all types of positions and no longer calls deprecated functions.
• editing/InsertTextCommand.cpp: (WebCore::InsertTextCommand::positionInsideTextNode): Ditto; renamed from prepareForTextInsertion. Check if the text node inside a tab span before checking if the container node is a text node because the position before or after a text node can still be inside a tab span. (WebCore::InsertTextCommand::input): No longer calls deprecated functions.
• editing/InsertTextCommand.h:
• editing/ModifySelectionListLevel.cpp: (WebCore::getStartEndListChildren): Call anchorNode() instead of deprecatedNode() because the start or the end of selection could be an immediate child of a list node (e.g. br inside ul)

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/CompositeEditCommand.cpp (modified) (1 diff)
• editing/InsertTextCommand.cpp (modified) (4 diffs)
• editing/InsertTextCommand.h (modified) (1 diff)
• editing/ModifySelectionListLevel.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-03  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Reviewed by Kent Tamura.
+
+        Stop calling deprecatedNode and deprecatedEditingOffset in InsertTextCommand
+        https://bugs.webkit.org/show_bug.cgi?id=55352
+
+        Stopped calling deprecatedNode and deprecatedEditingOffset in the following functions:
+
+        * editing/CompositeEditCommand.cpp:
+        (WebCore::CompositeEditCommand::positionOutsideTabSpan): Takes care of all types of positions and
+        no longer calls deprecated functions.
+        * editing/InsertTextCommand.cpp:
+        (WebCore::InsertTextCommand::positionInsideTextNode): Ditto; renamed from prepareForTextInsertion.
+        Check if the text node inside a tab span before checking if the container node is a text node
+        because the position before or after a text node can still be inside a tab span.
+        (WebCore::InsertTextCommand::input): No longer calls deprecated functions.
+        * editing/InsertTextCommand.h:
+        * editing/ModifySelectionListLevel.cpp:
+        (WebCore::getStartEndListChildren): Call anchorNode() instead of deprecatedNode() because the start
+        or the end of selection could be an immediate child of a list node (e.g. br inside ul)
+
 2011-03-03  Hans Wennborg  <hans@chromium.org>
 

trunk/Source/WebCore/editing/CompositeEditCommand.cpp

@@ -343 +343 @@
 Position CompositeEditCommand::positionOutsideTabSpan(const Position& pos)
 {
-    if (!isTabSpanTextNode(pos.deprecatedNode()))
+    if (!isTabSpanTextNode(pos.anchorNode()))
         return pos;
-    
-    Node* tabSpan = tabSpanNode(pos.deprecatedNode());
-    
-    if (pos.deprecatedEditingOffset() <= caretMinOffset(pos.deprecatedNode()))
+
+    if (pos.anchorType() == Position::PositionIsAfterAnchor)
+        return positionInParentAfterNode(pos.anchorNode());
+    if (pos.anchorType() == Position::PositionIsBeforeAnchor)
+        return positionInParentBeforeNode(pos.anchorNode());
+
+    Node* tabSpan = tabSpanNode(pos.containerNode());
+
+    if (pos.offsetInContainerNode() <= caretMinOffset(pos.containerNode()))
         return positionInParentBeforeNode(tabSpan);
-        
-    if (pos.deprecatedEditingOffset() >= caretMaxOffset(pos.deprecatedNode()))
+
+    if (pos.offsetInContainerNode() >= caretMaxOffset(pos.containerNode()))
         return positionInParentAfterNode(tabSpan);
 
-    splitTextNodeContainingElement(static_cast<Text *>(pos.deprecatedNode()), pos.deprecatedEditingOffset());
+    splitTextNodeContainingElement(static_cast<Text *>(pos.containerNode()), pos.offsetInContainerNode());
     return positionInParentBeforeNode(tabSpan);
 }

trunk/Source/WebCore/editing/InsertTextCommand.cpp

@@ -48 +48 @@
 }
 
-Position InsertTextCommand::prepareForTextInsertion(const Position& p)
+Position InsertTextCommand::positionInsideTextNode(const Position& p)
 {
     Position pos = p;
+    if (isTabSpanTextNode(pos.anchorNode())) {
+        RefPtr<Node> textNode = document()->createEditingTextNode("");
+        insertNodeAtTabSpanPosition(textNode.get(), pos);
+        return firstPositionInNode(textNode.get());
+    }
+
     // Prepare for text input by looking at the specified position.
     // It may be necessary to insert a text node to receive characters.
-    if (!pos.deprecatedNode()->isTextNode()) {
+    if (!pos.containerNode()->isTextNode()) {
         RefPtr<Node> textNode = document()->createEditingTextNode("");
         insertNodeAt(textNode.get(), pos);
-        return firstPositionInNode(textNode.get());
-    }
-
-    if (isTabSpanTextNode(pos.deprecatedNode())) {
-        RefPtr<Node> textNode = document()->createEditingTextNode("");
-        insertNodeAtTabSpanPosition(textNode.get(), pos);
         return firstPositionInNode(textNode.get());
     }
@@ -142 +142 @@
     // It is possible for the node that contains startPosition to contain only unrendered whitespace,
     // and so deleteInsignificantText could remove it.  Save the position before the node in case that happens.
-    Position positionBeforeStartNode(positionInParentBeforeNode(startPosition.deprecatedNode()));
+    Position positionBeforeStartNode(positionInParentBeforeNode(startPosition.containerNode()));
     deleteInsignificantText(startPosition.upstream(), startPosition.downstream());
     if (!startPosition.anchorNode()->inDocument())
@@ -160 +160 @@
     } else {
         // Make sure the document is set up to receive text
-        startPosition = prepareForTextInsertion(startPosition);
+        startPosition = positionInsideTextNode(startPosition);
+        ASSERT(startPosition.anchorType() == Position::PositionIsOffsetInAnchor);
+        ASSERT(startPosition.containerNode());
+        ASSERT(startPosition.containerNode()->isTextNode());
         if (placeholder.isNotNull())
             removePlaceholderAt(placeholder);
-        Text* textNode = static_cast<Text*>(startPosition.deprecatedNode());
-        int offset = startPosition.deprecatedEditingOffset();
+        Text* textNode = static_cast<Text*>(startPosition.containerNode());
+        const unsigned offset = startPosition.offsetInContainerNode();
 
         insertTextIntoNode(textNode, offset, text);
@@ -178 +181 @@
             ASSERT(whitespaceRebalance == RebalanceAllWhitespaces);
             if (canRebalance(startPosition) && canRebalance(endPosition))
-                rebalanceWhitespaceOnTextSubstring(textNode, startPosition.deprecatedEditingOffset(), endPosition.deprecatedEditingOffset());
+                rebalanceWhitespaceOnTextSubstring(textNode, startPosition.offsetInContainerNode(), endPosition.offsetInContainerNode());
         }
     }

trunk/Source/WebCore/editing/InsertTextCommand.h

@@ -54 +54 @@
     virtual bool isInsertTextCommand() const;
 
-    Position prepareForTextInsertion(const Position&);
+    Position positionInsideTextNode(const Position&);
     Position insertTab(const Position&);
     

trunk/Source/WebCore/editing/ModifySelectionListLevel.cpp

@@ -53 +53 @@
 
     // start must be in a list child
-    Node* startListChild = enclosingListChild(selection.start().deprecatedNode());
+    Node* startListChild = enclosingListChild(selection.start().anchorNode());
     if (!startListChild)
         return false;
-        
+
     // end must be in a list child
-    Node* endListChild = selection.isRange() ? enclosingListChild(selection.end().deprecatedNode()) : startListChild;
+    Node* endListChild = selection.isRange() ? enclosingListChild(selection.end().anchorNode()) : startListChild;
     if (!endListChild)
         return false;