Changeset 157222 in webkit for trunk/Source/WebCore/rendering/RenderElement.cpp

Timestamp:

Oct 10, 2013, 6:55:29 AM (12 years ago)

Author:

[email protected]

Message:

Move RenderObject::layout() to RenderElement.
<​https://webkit.org/b/122537>

Reviewed by Antti Koivisto.

RenderText will ASSERT_NOT_REACHED() in its layout(), so move this
to RenderElement. This allows us to use the fast firstChild()
instead of virtual dispatch.

The needsLayout() bit remains on RenderObject for now. Moving that
to RenderElement is a far more involved change.

File:

• trunk/Source/WebCore/rendering/RenderElement.cpp (modified) (2 diffs)

trunk/Source/WebCore/rendering/RenderElement.cpp

@@ -55 +55 @@
 #include "SVGRenderSupport.h"
 #include "StyleResolver.h"
+#include <wtf/StackStats.h>
 
 #if USE(ACCELERATED_COMPOSITING)
@@ -1073 +1074 @@
 }
 
-}
+void RenderElement::layout()
+{
+    StackStats::LayoutCheckPoint layoutCheckPoint;
+    ASSERT(needsLayout());
+    RenderObject* child = firstChild();
+    while (child) {
+        if (child->needsLayout())
+            toRenderElement(child)->layout();
+        ASSERT(!child->needsLayout());
+        child = child->nextSibling();
+    }
+    clearNeedsLayout();
+}
+
+}