Changeset 156093 in webkit

Timestamp:

Sep 19, 2013, 6:36:02 AM (11 years ago)

Author:

Antti Koivisto

Message:

[CTTE] Hide nonPseudoNode and generatingNode, replace with Element versions
​https://bugs.webkit.org/show_bug.cgi?id=121606

Reviewed by Andreas Kling.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (3 diffs)
• rendering/RenderBox.cpp (modified) (3 diffs)
• rendering/RenderLayerModelObject.h (modified) (2 diffs)
• rendering/RenderRegion.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-19  Antti Koivisto  <antti@apple.com>
+
+        [CTTE] Hide nonPseudoNode and generatingNode, replace with Element versions
+        https://bugs.webkit.org/show_bug.cgi?id=121606
+
+        Reviewed by Andreas Kling.
+
 2013-09-19  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -4316 +4316 @@
 
     if (!box->renderer().nonPseudoNode())
-        return createLegacyEditingPosition(nonPseudoNode(), start ? caretMinOffset() : caretMaxOffset());
+        return createLegacyEditingPosition(nonPseudoElement(), start ? caretMinOffset() : caretMaxOffset());
 
     if (!box->isInlineTextBox())
@@ -4346 +4346 @@
 
     // If this is an anonymous renderer, we just recur normally
-    Node* childNode = child->nonPseudoNode();
-    if (!childNode)
+    Element* childElement= child->nonPseudoElement();
+    if (!childElement)
         return child->positionForPoint(pointInChildCoordinates);
 
@@ -4364 +4364 @@
     LayoutUnit logicalLeft = parent->isHorizontalWritingMode() ? pointInChildCoordinates.x() : pointInChildCoordinates.y();
     if (logicalLeft < childMiddle)
-        return ancestor->createVisiblePosition(childNode->nodeIndex(), DOWNSTREAM);
-    return ancestor->createVisiblePosition(childNode->nodeIndex() + 1, UPSTREAM);
+        return ancestor->createVisiblePosition(childElement->nodeIndex(), DOWNSTREAM);
+    return ancestor->createVisiblePosition(childElement->nodeIndex() + 1, UPSTREAM);
 }
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -4072 +4072 @@
     // no children...return this render object's element, if there is one, and offset 0
     if (!firstChild())
-        return createVisiblePosition(nonPseudoNode() ? firstPositionInOrBeforeNode(nonPseudoNode()) : Position());
-
-    if (isTable() && nonPseudoNode()) {
+        return createVisiblePosition(nonPseudoElement() ? firstPositionInOrBeforeNode(nonPseudoElement()) : Position());
+
+    if (isTable() && nonPseudoElement()) {
         LayoutUnit right = contentWidth() + borderAndPaddingWidth();
         LayoutUnit bottom = contentHeight() + borderAndPaddingHeight();
@@ -4080 +4080 @@
         if (point.x() < 0 || point.x() > right || point.y() < 0 || point.y() > bottom) {
             if (point.x() <= right / 2)
-                return createVisiblePosition(firstPositionInOrBeforeNode(nonPseudoNode()));
-            return createVisiblePosition(lastPositionInOrAfterNode(nonPseudoNode()));
+                return createVisiblePosition(firstPositionInOrBeforeNode(nonPseudoElement()));
+            return createVisiblePosition(lastPositionInOrAfterNode(nonPseudoElement()));
         }
     }
@@ -4149 +4149 @@
         return closestRenderer->positionForPoint(adjustedPoint - closestRenderer->locationOffset());
     
-    return createVisiblePosition(firstPositionInOrBeforeNode(nonPseudoNode()));
+    return createVisiblePosition(firstPositionInOrBeforeNode(nonPseudoElement()));
 }
 

trunk/Source/WebCore/rendering/RenderLayerModelObject.h

@@ -53 +53 @@
     // This is null for anonymous renderers.
     Element* element() const { return toElement(RenderObject::node()); }
+    Element* nonPseudoElement() const { return toElement(RenderObject::nonPseudoNode()); }
+    Element* generatingElement() const { return toElement(RenderObject::generatingNode()); }
 
 protected:
@@ -64 +66 @@
 
     void node() const WTF_DELETED_FUNCTION;
+    void nonPseudoNode() const WTF_DELETED_FUNCTION;
+    void generatingNode() const WTF_DELETED_FUNCTION;
 
     RenderLayer* m_layer;

trunk/Source/WebCore/rendering/RenderRegion.h

@@ -154 +154 @@
     LayoutRect rectFlowPortionForBox(const RenderBox*, const LayoutRect&) const;
 
-    Element* generatingElement() const { return toElement(RenderObject::generatingNode()); }
-
 protected:
     RenderOverflow* ensureOverflowForBox(const RenderBox*);