Changeset 156816 in webkit for trunk/Source/WebCore/rendering/RenderObject.cpp

Timestamp:

Oct 2, 2013, 7:26:52 PM (12 years ago)

Author:

Antti Koivisto

Message:

Move setting of some layout bits to RenderElement
​https://bugs.webkit.org/show_bug.cgi?id=122256

Reviewed by Andreas Kling.

These bits never apply to RenderText nodes:

normalChildNeedsLayout
posChildNeedsLayout
needsSimplifiedNormalFlowLayout
normalChildNeedsLayout
positionedMovementLayout

The code for setting them can be moved to RenderElement.

Also separated the code paths for setting and clearing the bits and uninlined
everything that is not massively popular.

File:

• trunk/Source/WebCore/rendering/RenderObject.cpp (modified) (5 diffs)

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -620 +620 @@
 }
 
+void RenderObject::clearNeedsLayout()
+{
+    m_bitfields.setNeedsLayout(false);
+    setEverHadLayout(true);
+    setPosChildNeedsLayoutBit(false);
+    setNeedsSimplifiedNormalFlowLayoutBit(false);
+    setNormalChildNeedsLayoutBit(false);
+    setNeedsPositionedMovementLayoutBit(false);
+    if (isRenderElement())
+        toRenderElement(this)->setAncestorLineBoxDirty(false);
+#ifndef NDEBUG
+    checkBlockPositionedObjectsNeedLayout();
+#endif
+}
+
 void RenderObject::markContainingBlocksForLayout(bool scheduleRelayout, RenderObject* newRoot)
 {
@@ -641 +656 @@
         if (!container && !object->isRenderView())
             return;
-        if (!last->isText() && last->style()->hasOutOfFlowPosition()) {
+        if (last->style()->hasOutOfFlowPosition()) {
             bool willSkipRelativelyPositionedInlines = !object->isRenderBlock() || object->isAnonymousBlock();
             // Skip relatively positioned inlines and anonymous blocks to get to the enclosing RenderBlock.
@@ -650 +665 @@
             if (willSkipRelativelyPositionedInlines)
                 container = object->container();
-            object->setPosChildNeedsLayout(true);
+            object->setPosChildNeedsLayoutBit(true);
             simplifiedNormalFlowLayout = true;
             ASSERT(!object->isSetNeedsLayoutForbidden());
@@ -656 +671 @@
             if (object->needsSimplifiedNormalFlowLayout())
                 return;
-            object->setNeedsSimplifiedNormalFlowLayout(true);
+            object->setNeedsSimplifiedNormalFlowLayoutBit(true);
             ASSERT(!object->isSetNeedsLayoutForbidden());
         } else {
             if (object->normalChildNeedsLayout())
                 return;
-            object->setNormalChildNeedsLayout(true);
+            object->setNormalChildNeedsLayoutBit(true);
             ASSERT(!object->isSetNeedsLayoutForbidden());
         }
@@ -2210 +2225 @@
         child = child->nextSibling();
     }
-    setNeedsLayout(false);
+    clearNeedsLayout();
 }