Changeset 156308 in webkit

Timestamp:

Sep 23, 2013, 4:55:20 PM (12 years ago)

Author:

akling@apple.com

Message:

CTTE: RenderObject::container() should return a RenderElement*.
<​https://webkit.org/b/121811>

Reviewed by Antti Koivisto.

The containing renderer is always a RenderElement.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/LayoutState.cpp (modified) (2 diffs)
• rendering/RenderBlockLineLayout.cpp (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (6 diffs)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (3 diffs)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)
• rendering/RenderObject.cpp (modified) (5 diffs)
• rendering/RenderObject.h (modified) (1 diff)
• rendering/RenderThemeMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-09-23  Andreas Kling  <akling@apple.com>
+
+        CTTE: RenderObject::container() should return a RenderElement*.
+        <https://webkit.org/b/121811>
+
+        Reviewed by Antti Koivisto.
+
+        The containing renderer is always a RenderElement.
+
 2013-09-23  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/rendering/LayoutState.cpp

@@ -58 +58 @@
 
     if (renderer->isOutOfFlowPositioned() && !fixed) {
-        if (RenderObject* container = renderer->container()) {
+        if (RenderElement* container = renderer->container()) {
             if (container->isInFlowPositioned() && container->isRenderInline())
                 m_paintOffset += toRenderInline(container)->offsetForInFlowPositionedInline(renderer);
@@ -157 +157 @@
 #endif
 {
-    RenderObject* container = root->container();
+    RenderElement* container = root->container();
     FloatPoint absContentPoint = container->localToAbsolute(FloatPoint(), UseTransforms);
     m_paintOffset = LayoutSize(absContentPoint.x(), absContentPoint.y());

trunk/Source/WebCore/rendering/RenderBlockLineLayout.cpp

@@ -991 +991 @@
     // FIXME: The math here is actually not really right. It's a best-guess approximation that
     // will work for the common cases
-    RenderObject* containerBlock = child->container();
+    RenderElement* containerBlock = child->container();
     LayoutUnit blockHeight = block->logicalHeight();
     if (containerBlock->isRenderInline()) {

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1817 +1817 @@
 
     bool containerSkipped;
-    RenderObject* o = container(repaintContainer, &containerSkipped);
+    RenderElement* o = container(repaintContainer, &containerSkipped);
     if (!o)
         return;
@@ -1866 +1866 @@
 
     bool ancestorSkipped;
-    RenderObject* container = this->container(ancestorToStopAt, &ancestorSkipped);
+    RenderElement* container = this->container(ancestorToStopAt, &ancestorSkipped);
     if (!container)
         return 0;
@@ -2073 +2073 @@
 
     bool containerSkipped;
-    RenderObject* o = container(repaintContainer, &containerSkipped);
+    RenderElement* o = container(repaintContainer, &containerSkipped);
     if (!o)
         return;
@@ -3074 +3074 @@
     if (child->parent()->style()->direction() == LTR) {
         LayoutUnit staticPosition = child->layer()->staticInlinePosition() - containerBlock->borderLogicalLeft();
-        for (RenderObject* curr = child->parent(); curr && curr != containerBlock; curr = curr->container()) {
+        for (RenderElement* curr = child->parent(); curr && curr != containerBlock; curr = curr->container()) {
             if (curr->isBox()) {
                 staticPosition += toRenderBox(curr)->logicalLeft();
@@ -3090 +3090 @@
         RenderBox* enclosingBox = child->parent()->enclosingBox();
         LayoutUnit staticPosition = child->layer()->staticInlinePosition() + containerLogicalWidth + containerBlock->borderLogicalLeft();
-        for (RenderObject* curr = enclosingBox; curr; curr = curr->container()) {
+        for (RenderElement* curr = enclosingBox; curr; curr = curr->container()) {
             if (curr->isBox()) {
                 if (curr != containerBlock)
@@ -3448 +3448 @@
     // FIXME: The static distance computation has not been patched for mixed writing modes.
     LayoutUnit staticLogicalTop = child->layer()->staticBlockPosition() - containerBlock->borderBefore();
-    for (RenderObject* curr = child->parent(); curr && curr != containerBlock; curr = curr->container()) {
+    for (RenderElement* curr = child->parent(); curr && curr != containerBlock; curr = curr->container()) {
         if (curr->isBox() && !curr->isTableRow())
             staticLogicalTop += toRenderBox(curr)->logicalTop();

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -2735 +2735 @@
 void RenderBoxModelObject::mapAbsoluteToLocalPoint(MapCoordinatesFlags mode, TransformState& transformState) const
 {
-    RenderObject* o = container();
+    RenderElement* o = container();
     if (!o)
         return;

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1106 +1106 @@
 
     bool containerSkipped;
-    RenderObject* o = container(repaintContainer, &containerSkipped);
+    RenderElement* o = container(repaintContainer, &containerSkipped);
     if (!o)
         return;
@@ -1186 +1186 @@
 
     bool containerSkipped;
-    RenderObject* o = container(repaintContainer, &containerSkipped);
+    RenderElement* o = container(repaintContainer, &containerSkipped);
     if (!o)
         return;
@@ -1224 +1224 @@
 
     bool ancestorSkipped;
-    RenderObject* container = this->container(ancestorToStopAt, &ancestorSkipped);
+    RenderElement* container = this->container(ancestorToStopAt, &ancestorSkipped);
     if (!container)
         return 0;

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -2278 +2278 @@
         return hasCoordinatedScrolling() && isViewportConstrainedFixedOrStickyLayer(layer);
 
-    RenderObject* container = renderer->container();
+    RenderElement* container = renderer->container();
     // If the renderer is not hooked up yet then we have to wait until it is.
     if (!container) {

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -658 +658 @@
     ASSERT(!isSetNeedsLayoutForbidden());
 
-    RenderObject* object = container();
+    RenderElement* object = container();
     RenderObject* last = this;
 
@@ -671 +671 @@
         // Don't mark the outermost object of an unrooted subtree. That object will be
         // marked when the subtree is added to the document.
-        RenderObject* container = object->container();
+        RenderElement* container = object->container();
         if (!container && !object->isRenderView())
             return;
@@ -2251 +2251 @@
     const RenderObject* currContainer = this;
     do {
-        RenderObject* nextContainer = currContainer->container();
+        RenderElement* nextContainer = currContainer->container();
         ASSERT(nextContainer);  // This means we reached the top without finding container.
         if (!nextContainer)
@@ -2327 +2327 @@
 }
 
-RenderObject* RenderObject::container(const RenderLayerModelObject* repaintContainer, bool* repaintContainerSkipped) const
+RenderElement* RenderObject::container(const RenderLayerModelObject* repaintContainer, bool* repaintContainerSkipped) const
 {
     if (repaintContainerSkipped)
@@ -2341 +2341 @@
     // the layout of the positioned object.  This does mean that computePositionedLogicalWidth and
     // computePositionedLogicalHeight have to use container().
-    RenderObject* o = parent();
+    RenderElement* o = parent();
 
     if (isText())

trunk/Source/WebCore/rendering/RenderObject.h

@@ -631 +631 @@
     // If repaintContainer and repaintContainerSkipped are not null, on return *repaintContainerSkipped
     // is true if the renderer returned is an ancestor of repaintContainer.
-    RenderObject* container(const RenderLayerModelObject* repaintContainer = 0, bool* repaintContainerSkipped = 0) const;
+    RenderElement* container(const RenderLayerModelObject* repaintContainer = 0, bool* repaintContainerSkipped = 0) const;
 
     virtual RenderObject* hoverAncestor() const;

trunk/Source/WebCore/rendering/RenderThemeMac.mm

@@ -876 +876 @@
     const RenderObject* renderer = partRenderer;
     while (renderer && renderer != inputRenderer) {
-        RenderObject* containingRenderer = renderer->container();
+        RenderElement* containingRenderer = renderer->container();
         offsetFromInputRenderer -= roundedIntSize(renderer->offsetFromContainer(containingRenderer, LayoutPoint()));
         renderer = containingRenderer;