Changeset 150782 in webkit

Timestamp:

May 27, 2013 4:40:38 PM (11 years ago)

Author:

Darin Adler

Message:

Move isBlockFlowElement and related functions out of the Node class into editing code
​https://bugs.webkit.org/show_bug.cgi?id=116846

Reviewed by Antti Koivisto.

• dom/Node.cpp: Removed isBlockFlowElement, enclosingBlockFlowElement, and

inSameContainingBlockFlowElement. These are all editing functions that don't
belong in the Node class, and mostly-deprecated ones to boot.

• dom/Node.h: Ditto.

• dom/Position.cpp:

(WebCore::inSameEnclosingBlockFlowElement): Added. This editing-specific function
is used only here, so put it here.
(WebCore::Position::rendersInDifferentPosition): Updated to call new function above.
(WebCore::Position::leadingWhitespacePosition): Ditto.

• editing/InsertLineBreakCommand.cpp:

(WebCore::InsertLineBreakCommand::insertNodeAfterPosition): Use
deprecatedEnclosingBlockFlowElement at its new location.
(WebCore::InsertLineBreakCommand::insertNodeBeforePosition): Ditto.

• editing/InsertListCommand.cpp:

(WebCore::InsertListCommand::doApplyForSingleParagraph): use
isBlockFlowElement at its new location.

• editing/ReplaceSelectionCommand.cpp:

(WebCore::enclosingInline): Ditto.

• editing/VisiblePosition.cpp:

(WebCore::VisiblePosition::canonicalPosition): Use deprecatedEnclosingBlockFlowElement
at its new location.
(WebCore::enclosingBlockFlowElement): Ditto. Also added FIXME.

• editing/VisibleSelection.cpp:

(WebCore::makeSearchRange): Ditto.

• editing/htmlediting.cpp:

(WebCore::isBlockFlowElement): Added. Same as the Node::isBlockFlowElement
function, but here because this is an editing function, not suitable as a Node member.
(WebCore::deprecatedEnclosingBlockFlowElement): Ditto. Added "deprecated" to the name
since the Node member function had a comment saying it was deprecated. Also changed so
it tolerates a 0 for an argument, which made it easier for one caller.

• editing/htmlediting.h: Added the two new functions.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Node.cpp (modified) (2 diffs)
• dom/Node.h (modified) (2 diffs)
• dom/Position.cpp (modified) (3 diffs)
• editing/InsertLineBreakCommand.cpp (modified) (2 diffs)
• editing/InsertListCommand.cpp (modified) (1 diff)
• editing/ReplaceSelectionCommand.cpp (modified) (1 diff)
• editing/VisiblePosition.cpp (modified) (2 diffs)
• editing/VisibleSelection.cpp (modified) (1 diff)
• editing/htmlediting.cpp (modified) (1 diff)
• editing/htmlediting.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-05-27  Darin Adler  <darin@apple.com>
+
+        Move isBlockFlowElement and related functions out of the Node class into editing code
+        https://bugs.webkit.org/show_bug.cgi?id=116846
+
+        Reviewed by Antti Koivisto.
+
+        * dom/Node.cpp: Removed isBlockFlowElement, enclosingBlockFlowElement, and
+        inSameContainingBlockFlowElement. These are all editing functions that don't
+        belong in the Node class, and mostly-deprecated ones to boot.
+        * dom/Node.h: Ditto.
+
+        * dom/Position.cpp:
+        (WebCore::inSameEnclosingBlockFlowElement): Added. This editing-specific function
+        is used only here, so put it here.
+        (WebCore::Position::rendersInDifferentPosition): Updated to call new function above.
+        (WebCore::Position::leadingWhitespacePosition): Ditto.
+
+        * editing/InsertLineBreakCommand.cpp:
+        (WebCore::InsertLineBreakCommand::insertNodeAfterPosition): Use
+        deprecatedEnclosingBlockFlowElement at its new location.
+        (WebCore::InsertLineBreakCommand::insertNodeBeforePosition): Ditto.
+
+        * editing/InsertListCommand.cpp:
+        (WebCore::InsertListCommand::doApplyForSingleParagraph): use
+        isBlockFlowElement at its new location.
+        * editing/ReplaceSelectionCommand.cpp:
+        (WebCore::enclosingInline): Ditto.
+
+        * editing/VisiblePosition.cpp:
+        (WebCore::VisiblePosition::canonicalPosition): Use deprecatedEnclosingBlockFlowElement
+        at its new location.
+        (WebCore::enclosingBlockFlowElement): Ditto. Also added FIXME.
+        * editing/VisibleSelection.cpp:
+        (WebCore::makeSearchRange): Ditto.
+
+        * editing/htmlediting.cpp:
+        (WebCore::isBlockFlowElement): Added. Same as the Node::isBlockFlowElement
+        function, but here because this is an editing function, not suitable as a Node member.
+        (WebCore::deprecatedEnclosingBlockFlowElement): Ditto. Added "deprecated" to the name
+        since the Node member function had a comment saying it was deprecated. Also changed so
+        it tolerates a 0 for an argument, which made it easier for one caller.
+
+        * editing/htmlediting.h: Added the two new functions.
+
 2013-05-27  Seokju Kwon  <seokju.kwon@gmail.com>
 

trunk/Source/WebCore/dom/Node.cpp

@@ -1266 +1266 @@
 }
 
-bool Node::isBlockFlowElement() const
-{
-    return isElementNode() && renderer() && renderer()->isBlockFlow();
-}
-
-Element *Node::enclosingBlockFlowElement() const
-{
-    Node *n = const_cast<Node *>(this);
-    if (isBlockFlowElement())
-        return toElement(n);
-
-    while (1) {
-        n = n->parentNode();
-        if (!n)
-            break;
-        if (n->isBlockFlowElement() || n->hasTagName(bodyTag))
-            return toElement(n);
-    }
-    return 0;
-}
-
 bool Node::isRootEditableElement() const
 {
@@ -1313 +1292 @@
     }
     return result;
-}
-
-bool Node::inSameContainingBlockFlowElement(Node *n)
-{
-    return n ? enclosingBlockFlowElement() == n->enclosingBlockFlowElement() : false;
 }
 

trunk/Source/WebCore/dom/Node.h

@@ -305 +305 @@
     Node* enclosingLinkEventParentOrSelf();
 
-    bool isBlockFlowElement() const;
-
     // These low-level calls give the caller responsibility for maintaining the integrity of the tree.
     void setPreviousSibling(Node* previous) { m_previous = previous; }
@@ -329 +327 @@
     Node* previousLeafNode() const;
 
-    // enclosingBlockFlowElement() is deprecated. Use enclosingBlock instead.
-    Element* enclosingBlockFlowElement() const;
-
     bool isRootEditableElement() const;
     Element* rootEditableElement() const;
     Element* rootEditableElement(EditableType) const;
-
-    bool inSameContainingBlockFlowElement(Node*);
 
     // Called by the parser when this element's close tag is reached,

trunk/Source/WebCore/dom/Position.cpp

@@ -994 +994 @@
 }
 
+static bool inSameEnclosingBlockFlowElement(Node* a, Node* b)
+{
+    return a && b && deprecatedEnclosingBlockFlowElement(a) == deprecatedEnclosingBlockFlowElement(b);
+}
+
 bool Position::rendersInDifferentPosition(const Position &pos) const
 {
@@ -1030 +1035 @@
         return true;
                 
-    if (deprecatedNode()->enclosingBlockFlowElement() != pos.deprecatedNode()->enclosingBlockFlowElement())
+    if (!inSameEnclosingBlockFlowElement(deprecatedNode(), pos.deprecatedNode()))
         return true;
 
@@ -1091 +1096 @@
 
     Position prev = previousCharacterPosition(affinity);
-    if (prev != *this && prev.deprecatedNode()->inSameContainingBlockFlowElement(deprecatedNode()) && prev.deprecatedNode()->isTextNode()) {
+    if (prev != *this && inSameEnclosingBlockFlowElement(deprecatedNode(), prev.deprecatedNode()) && prev.deprecatedNode()->isTextNode()) {
         String string = toText(prev.deprecatedNode())->data();
         UChar c = string[prev.deprecatedEditingOffset()];

trunk/Source/WebCore/editing/InsertLineBreakCommand.cpp

@@ -59 +59 @@
     // position is a block, do an append. We don't want to insert
     // the BR *after* the block.
-    Element* cb = pos.deprecatedNode()->enclosingBlockFlowElement();
+    Element* cb = deprecatedEnclosingBlockFlowElement(pos.deprecatedNode());
     if (cb == pos.deprecatedNode())
         appendNode(node, cb);
@@ -71 +71 @@
     // position is a block, do an append. We don't want to insert
     // the BR *before* the block.
-    Element* cb = pos.deprecatedNode()->enclosingBlockFlowElement();
+    Element* cb = deprecatedEnclosingBlockFlowElement(pos.deprecatedNode());
     if (cb == pos.deprecatedNode())
         appendNode(node, cb);

trunk/Source/WebCore/editing/InsertListCommand.cpp

@@ -220 +220 @@
 
             Node* firstChildInList = enclosingListChild(VisiblePosition(firstPositionInNode(listNode.get())).deepEquivalent().deprecatedNode(), listNode.get());
-            Node* outerBlock = firstChildInList->isBlockFlowElement() ? firstChildInList : listNode.get();
+            Node* outerBlock = isBlockFlowElement(firstChildInList) ? firstChildInList : listNode.get();
             
             moveParagraphWithClones(firstPositionInNode(listNode.get()), lastPositionInNode(listNode.get()), newList.get(), outerBlock);

trunk/Source/WebCore/editing/ReplaceSelectionCommand.cpp

@@ -843 +843 @@
 {
     while (ContainerNode* parent = node->parentNode()) {
-        if (parent->isBlockFlowElement() || parent->hasTagName(bodyTag))
+        if (isBlockFlowElement(parent) || parent->hasTagName(bodyTag))
             return node;
         // Stop if any previous sibling is a block.
         for (Node* sibling = node->previousSibling(); sibling; sibling = sibling->previousSibling()) {
-            if (sibling->isBlockFlowElement())
+            if (isBlockFlowElement(sibling))
                 return node;
         }

trunk/Source/WebCore/editing/VisiblePosition.cpp

@@ -559 +559 @@
 
     // The new position should be in the same block flow element. Favor that.
-    Node* originalBlock = node ? node->enclosingBlockFlowElement() : 0;
+    Element* originalBlock = deprecatedEnclosingBlockFlowElement(node);
     bool nextIsOutsideOriginalBlock = !nextNode->isDescendantOf(originalBlock) && nextNode != originalBlock;
     bool prevIsOutsideOriginalBlock = !prevNode->isDescendantOf(originalBlock) && prevNode != originalBlock;
@@ -712 +712 @@
 }
 
-Element* enclosingBlockFlowElement(const VisiblePosition &visiblePosition)
+// FIXME: Maybe this should be deprecated too, like the underlying function?
+Element* enclosingBlockFlowElement(const VisiblePosition& visiblePosition)
 {
     if (visiblePosition.isNull())
         return NULL;
 
-    return visiblePosition.deepEquivalent().deprecatedNode()->enclosingBlockFlowElement();
+    return deprecatedEnclosingBlockFlowElement(visiblePosition.deepEquivalent().deprecatedNode());
 }
 

trunk/Source/WebCore/editing/VisibleSelection.cpp

@@ -208 +208 @@
     if (!de)
         return 0;
-    Node* boundary = n->enclosingBlockFlowElement();
+    Element* boundary = deprecatedEnclosingBlockFlowElement(n);
     if (!boundary)
         return 0;

trunk/Source/WebCore/editing/htmlediting.cpp

@@ -1209 +1209 @@
 }
 
+// FIXME: Should this be deprecated like deprecatedEnclosingBlockFlowElement is?
+bool isBlockFlowElement(const Node* node)
+{
+    if (!node->isElementNode())
+        return false;
+    RenderObject* renderer = node->renderer();
+    return renderer && renderer->isBlockFlow();
+}
+
+Element* deprecatedEnclosingBlockFlowElement(Node* node)
+{
+    if (!node)
+        return 0;
+    if (isBlockFlowElement(node))
+        return toElement(node);
+    while ((node = node->parentNode())) {
+        if (isBlockFlowElement(node) || node->hasTagName(bodyTag))
+            return toElement(node);
+    }
+    return 0;
+}
+
 } // namespace WebCore

trunk/Source/WebCore/editing/htmlediting.h

@@ -62 +62 @@
 Node* lowestEditableAncestor(Node*);
 
+Element* deprecatedEnclosingBlockFlowElement(Node*); // Use enclosingBlock instead.
 Element* enclosingBlock(Node*, EditingBoundaryCrossingRule = CannotCrossEditingBoundary);
 Node* enclosingTableCell(const Position&);
@@ -98 +99 @@
 bool isAtomicNode(const Node*);
 bool isBlock(const Node*);
+bool isBlockFlowElement(const Node*);
 bool isInline(const Node*);
 bool isSpecialElement(const Node*);
@@ -114 +116 @@
 bool areIdenticalElements(const Node*, const Node*);
 bool isNonTableCellHTMLBlockElement(const Node*);
+
 TextDirection directionOfEnclosingBlock(const Position&);