Changeset 223590 in webkit

Timestamp:

Oct 17, 2017 6:42:26 PM (7 years ago)

Author:

Alan Bujtas

Message:

[FrameView::layout cleanup] Remove redundant body->renderer()->setChildNeedsLayout() call
​https://bugs.webkit.org/show_bug.cgi?id=178414
<rdar://problem/35040876>

Reviewed by Simon Fraser.

Since m_size always equals to layoutSize() at this point, we never call setChildNeedsLayout() on the body's renderer.
However a few lines below, when we adjust the frame size and check if oldSize != m_size, we actually
dirty the body's renderer.

Covered by existing tests.

• page/FrameView.cpp:

(WebCore::FrameView::layout):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-17  Zalan Bujtas  <zalan@apple.com>
+
+        [FrameView::layout cleanup] Remove redundant body->renderer()->setChildNeedsLayout() call
+        https://bugs.webkit.org/show_bug.cgi?id=178414
+        <rdar://problem/35040876>
+
+        Reviewed by Simon Fraser.
+
+        Since m_size always equals to layoutSize() at this point, we never call setChildNeedsLayout() on the body's renderer.
+        However a few lines below, when we adjust the frame size and check if oldSize != m_size, we actually
+        dirty the body's renderer.
+
+        Covered by existing tests.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::layout):
+
 2017-10-17  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1434 +1434 @@
             return;
         isSubtreeLayout = m_subtreeLayoutRoot;
+        m_needsFullRepaint = !isSubtreeLayout && (m_firstLayout || downcast<RenderView>(*layoutRoot).printing());
 
         if (!isSubtreeLayout) {
-            auto* body = document.bodyOrFrameset();
-            if (body && body->renderer()) {
-                if (is<HTMLFrameSetElement>(*body) && !frameFlatteningEnabled()) {
+            if (auto* body = document.bodyOrFrameset()) {
+                if (is<HTMLFrameSetElement>(*body) && !frameFlatteningEnabled() && body->renderer())
                     body->renderer()->setChildNeedsLayout();
-                } else if (is<HTMLBodyElement>(*body)) {
-                    if (!m_firstLayout && m_size.height() != layoutHeight() && body->renderer()->enclosingBox().stretchesToViewport())
-                        body->renderer()->setChildNeedsLayout();
-                }
             }
-
 #if !LOG_DISABLED
             if (m_firstLayout && !frame().ownerElement())
                 LOG(Layout, "FrameView %p elapsed time before first layout: %.3fs\n", this, document.timeSinceDocumentCreation().value());
 #endif
-        }
-
-        m_needsFullRepaint = !isSubtreeLayout && (m_firstLayout || downcast<RenderView>(*layoutRoot).printing());
-
-        if (!isSubtreeLayout) {
             ScrollbarMode hMode;
             ScrollbarMode vMode;