Changeset 223742 in webkit

Timestamp:

Oct 19, 2017 9:52:06 PM (7 years ago)

Author:

Alan Bujtas

Message:

[FrameView::layout cleanup] Move style update related logic to a separate function
​https://bugs.webkit.org/show_bug.cgi?id=178558
<rdar://problem/35088218>

Reviewed by Simon Fraser.

No change in functionality.

• page/FrameView.cpp:

(WebCore::FrameView::ensureStyleIsUpToDateForLayout):
(WebCore::FrameView::layout):

• page/FrameView.h:

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-19  Zalan Bujtas  <zalan@apple.com>
+
+        [FrameView::layout cleanup] Move style update related logic to a separate function
+        https://bugs.webkit.org/show_bug.cgi?id=178558
+        <rdar://problem/35088218>
+
+        Reviewed by Simon Fraser.
+
+        No change in functionality.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::ensureStyleIsUpToDateForLayout):
+        (WebCore::FrameView::layout):
+        * page/FrameView.h:
+
 2017-10-19  JF Bastien  <jfbastien@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1364 +1364 @@
 }
 
+void FrameView::updateStyleForLayout()
+{
+    Document& document = *frame().document();
+    // Viewport-dependent media queries may cause us to need completely different style information.
+    auto* styleResolver = document.styleScope().resolverIfExists();
+    if (!styleResolver || styleResolver->hasMediaQueriesAffectedByViewportChange()) {
+        LOG(Layout, "  hasMediaQueriesAffectedByViewportChange, enqueueing style recalc");
+        document.styleScope().didChangeStyleSheetEnvironment();
+        // FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
+        InspectorInstrumentation::mediaQueryResultChanged(document);
+    }
+    document.evaluateMediaQueryList();
+    // If there is any pagination to apply, it will affect the RenderView's style, so we should
+    // take care of that now.
+    applyPaginationToViewport();
+    // Always ensure our style info is up-to-date. This can happen in situations where
+    // the layout beats any sort of style recalc update that needs to occur.
+    document.updateStyleIfNeeded();
+}
+
 void FrameView::layout(bool allowSubtreeLayout)
 {
@@ -1421 +1441 @@
             performPostLayoutTasks();
 
-        // Viewport-dependent media queries may cause us to need completely different style information.
-        auto* styleResolver = document.styleScope().resolverIfExists();
-        if (!styleResolver || styleResolver->hasMediaQueriesAffectedByViewportChange()) {
-            LOG(Layout, "  hasMediaQueriesAffectedByViewportChange, enqueueing style recalc");
-            document.styleScope().didChangeStyleSheetEnvironment();
-            // FIXME: This instrumentation event is not strictly accurate since cached media query results do not persist across StyleResolver rebuilds.
-            InspectorInstrumentation::mediaQueryResultChanged(document);
-        }
-        document.evaluateMediaQueryList();
-        // If there is any pagination to apply, it will affect the RenderView's style, so we should
-        // take care of that now.
-        applyPaginationToViewport();
-        // Always ensure our style info is up-to-date. This can happen in situations where
-        // the layout beats any sort of style recalc update that needs to occur.
-        document.updateStyleIfNeeded();
-        // If there is only one ref to this view left, then its going to be destroyed as soon as we exit,
-        // so there's no point to continuing to layout
+        updateStyleForLayout();
         if (hasOneRef())
             return;

trunk/Source/WebCore/page/FrameView.h

@@ -738 +738 @@
 
     void adjustScrollbarsForLayout(bool firstLayout);
+    void updateStyleForLayout();
 
     void handleDeferredScrollbarsUpdateAfterDirectionChange();