Changeset 252866 in webkit

Timestamp:

Nov 25, 2019 11:06:25 AM (4 years ago)

Author:

Alan Bujtas

Message:

[LFC] Do not run layout when setNeedsLayout is disabled
​https://bugs.webkit.org/show_bug.cgi?id=204586
<rdar://problem/57475333>

Reviewed by Antti Koivisto.

setNeedsLayout is disabled while the content size is set on the ScrollView. It triggers a forced layout in WebkitLegacy.

• layout/LayoutContext.cpp:

(WebCore::Layout::LayoutContext::layout):

• page/FrameViewLayoutContext.cpp:

(WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• layout/LayoutContext.cpp (modified) (2 diffs)
• page/FrameViewLayoutContext.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-11-25  Zalan Bujtas  <zalan@apple.com>
+
+        [LFC] Do not run layout when setNeedsLayout is disabled
+        https://bugs.webkit.org/show_bug.cgi?id=204586
+        <rdar://problem/57475333>
+
+        Reviewed by Antti Koivisto.
+
+        setNeedsLayout is disabled while the content size is set on the ScrollView. It triggers a forced layout in WebkitLegacy.
+
+        * layout/LayoutContext.cpp:
+        (WebCore::Layout::LayoutContext::layout):
+        * page/FrameViewLayoutContext.cpp:
+        (WebCore::FrameViewLayoutContext::layoutUsingFormattingContext):
+
 2019-11-25  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/layout/LayoutContext.cpp

@@ -60 +60 @@
 {
     PhaseScope scope(Phase::Type::Layout);
+
+    auto& formattingContextRootsForLayout = invalidationState.formattingContextRoots();
+    if (formattingContextRootsForLayout.computesEmpty())
+        return;
+
     // Set the geometry on the root.
     // Note that we never layout the root box. It has to have an already computed geometry (in case of ICB, it's the view geometry).
@@ -73 +78 @@
     displayBox.setContentBoxHeight(rootContentBoxSize.height());
     displayBox.setContentBoxWidth(rootContentBoxSize.width());
-
-    auto& formattingContextRootsForLayout = invalidationState.formattingContextRoots();
-    ASSERT(!formattingContextRootsForLayout.computesEmpty());
     for (auto& formattingContextRoot : formattingContextRootsForLayout)
         layoutFormattingContextSubtree(formattingContextRoot, invalidationState);

trunk/Source/WebCore/page/FrameViewLayoutContext.cpp

@@ -74 +74 @@
     auto invalidationState = Layout::InvalidationState { };
     auto invalidationContext = Layout::InvalidationContext { invalidationState };
-    invalidationContext.styleChanged(*m_layoutState->root().firstChild(), StyleDifference::Layout);
+
+    // FrameView::setContentsSize temporary disables layout.
+    if (!m_disableSetNeedsLayoutCount)
+        invalidationContext.styleChanged(*m_layoutState->root().firstChild(), StyleDifference::Layout);
 
     auto layoutContext = Layout::LayoutContext { *m_layoutState };