Changeset 185682 in webkit

Timestamp:

Jun 17, 2015, 5:49:54 PM (11 years ago)

Author:

jhoneycutt@apple.com

Message:

Position::findParent() should take a reference
​https://bugs.webkit.org/show_bug.cgi?id=146038

Reviewed by Darin Adler.

• dom/Position.cpp:

(WebCore::Position::containerNode):
(WebCore::Position::parentAnchoredEquivalent):
Pass a reference; there is already a null check.
(WebCore::Position::previous):
Add a missing null check. Code below this expects that node is non-null.
(WebCore::Position::next):
Ditto.
(WebCore::Position::atStartOfTree):
(WebCore::Position::atEndOfTree):
Pass a reference.
(WebCore::Position::findParent):
Changed to take a reference.

• dom/Position.h:

Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Position.cpp (modified) (9 diffs)
• dom/Position.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-16  Jon Honeycutt  <jhoneycutt@apple.com>
+
+        Position::findParent() should take a reference
+        https://bugs.webkit.org/show_bug.cgi?id=146038
+
+        Reviewed by Darin Adler.
+
+        * dom/Position.cpp:
+        (WebCore::Position::containerNode):
+        (WebCore::Position::parentAnchoredEquivalent):
+        Pass a reference; there is already a null check.
+        (WebCore::Position::previous):
+        Add a missing null check. Code below this expects that node is non-null.
+        (WebCore::Position::next):
+        Ditto.
+        (WebCore::Position::atStartOfTree):
+        (WebCore::Position::atEndOfTree):
+        Pass a reference.
+        (WebCore::Position::findParent):
+        Changed to take a reference.
+
+        * dom/Position.h:
+        Ditto.
+
 2015-06-17  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/dom/Position.cpp

@@ -163 +163 @@
     case PositionIsBeforeAnchor:
     case PositionIsAfterAnchor:
-        return findParent(m_anchorNode.get());
+        return findParent(*m_anchorNode);
     }
     ASSERT_NOT_REACHED();
@@ -223 +223 @@
     // FIXME: This should only be necessary for legacy positions, but is also needed for positions before and after Tables
     if (m_offset <= 0 && (m_anchorType != PositionIsAfterAnchor && m_anchorType != PositionIsAfterChildren)) {
-        if (findParent(m_anchorNode.get()) && (editingIgnoresContent(m_anchorNode.get()) || isRenderedTable(m_anchorNode.get())))
+        if (findParent(*m_anchorNode) && (editingIgnoresContent(m_anchorNode.get()) || isRenderedTable(m_anchorNode.get())))
             return positionInParentBeforeNode(m_anchorNode.get());
         return Position(m_anchorNode.get(), 0, PositionIsOffsetInAnchor);
@@ -311 +311 @@
     if (anchorType() == PositionIsBeforeAnchor) {
         node = containerNode();
+        if (!node)
+            return *this;
+
         offset = computeOffsetInContainerNode();
     }
@@ -333 +336 @@
     }
 
-    ContainerNode* parent = findParent(node);
+    ContainerNode* parent = findParent(*node);
     if (!parent)
         return *this;
@@ -361 +364 @@
     if (anchorType() == PositionIsAfterAnchor) {
         node = containerNode();
+        if (!node)
+            return *this;
+
         offset = computeOffsetInContainerNode();
     }
@@ -377 +383 @@
     }
 
-    ContainerNode* parent = findParent(node);
+    ContainerNode* parent = findParent(*node);
     if (!parent)
         return *this;
@@ -479 +485 @@
 
     Node* container = containerNode();
-    if (container && findParent(container))
+    if (container && findParent(*container))
         return false;
 
@@ -504 +510 @@
 
     Node* container = containerNode();
-    if (container && findParent(container))
+    if (container && findParent(*container))
         return false;
 
@@ -939 +945 @@
 }
 
-ContainerNode* Position::findParent(const Node* node)
-{
-    return node->nonShadowBoundaryParentNode();
+ContainerNode* Position::findParent(const Node& node)
+{
+    return node.nonShadowBoundaryParentNode();
 }
 

trunk/Source/WebCore/dom/Position.h

@@ -199 +199 @@
     static Node* rootUserSelectAllForNode(Node*) { return 0; }
 #endif
-    static ContainerNode* findParent(const Node*);
+    static ContainerNode* findParent(const Node&);
     
     void debugPosition(const char* msg = "") const;