Changeset 223631 in webkit

Timestamp:

Oct 18, 2017 2:54:28 PM (7 years ago)

Author:

Alan Bujtas

Message:

[FrameView::layout cleanup] Remove InPreLayoutStyleUpdate.
​https://bugs.webkit.org/show_bug.cgi?id=178483
<rdar://problem/35058800>

Reviewed by Simon Fraser.

Its client, updateCompositingLayersAfterStyleChange only needs to know if there's a upcoming
layer update (part of FrameView::layout()).

No change in functionality.

• page/FrameView.cpp:

(WebCore::FrameView::updateCompositingLayersAfterStyleChange):
(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) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-18  Zalan Bujtas  <zalan@apple.com>
+
+        [FrameView::layout cleanup] Remove InPreLayoutStyleUpdate.
+        https://bugs.webkit.org/show_bug.cgi?id=178483
+        <rdar://problem/35058800>
+
+        Reviewed by Simon Fraser.
+
+        Its client, updateCompositingLayersAfterStyleChange only needs to know if there's a upcoming
+        layer update (part of FrameView::layout()).
+
+        No change in functionality.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::updateCompositingLayersAfterStyleChange):
+        (WebCore::FrameView::layout):
+        * page/FrameView.h:
+
 2017-10-18  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -883 +883 @@
 bool FrameView::updateCompositingLayersAfterStyleChange()
 {
-    RenderView* renderView = this->renderView();
-    if (!renderView)
+    // If we expect to update compositing after an incipient layout, don't do so here.
+    if (!renderView() || needsLayout() || isInLayout())
         return false;
-
-    // If we expect to update compositing after an incipient layout, don't do so here.
-    if (inPreLayoutStyleUpdate() || layoutPending() || renderView->needsLayout())
-        return false;
-
-    return renderView->compositor().didRecalcStyleWithNoPendingLayout();
+    return renderView()->compositor().didRecalcStyleWithNoPendingLayout();
 }
 
@@ -1417 +1412 @@
             performPostLayoutTasks();
         }
-
-        m_layoutPhase = InPreLayoutStyleUpdate;
 
         // Viewport-dependent media queries may cause us to need completely different style information.

trunk/Source/WebCore/page/FrameView.h

@@ -658 +658 @@
         OutsideLayout,
         InPreLayout,
-        InPreLayoutStyleUpdate,
         InRenderTreeLayout,
         InViewSizeAdjust,
@@ -665 +664 @@
     };
     LayoutPhase layoutPhase() const { return m_layoutPhase; }
-
-    bool inPreLayoutStyleUpdate() const { return m_layoutPhase == InPreLayoutStyleUpdate; }
 
     bool isFrameView() const final { return true; }