Title: [223631] trunk/Source/WebCore
- Revision
- 223631
- Author
- [email protected]
- Date
- 2017-10-18 14:54:28 -0700 (Wed, 18 Oct 2017)
Log 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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (223630 => 223631)
--- trunk/Source/WebCore/ChangeLog 2017-10-18 21:52:09 UTC (rev 223630)
+++ trunk/Source/WebCore/ChangeLog 2017-10-18 21:54:28 UTC (rev 223631)
@@ -1,3 +1,21 @@
+2017-10-18 Zalan Bujtas <[email protected]>
+
+ [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 <[email protected]>
Global constructors exposed to service workers should go on ServiceWorkerGlobalScope interface
Modified: trunk/Source/WebCore/page/FrameView.cpp (223630 => 223631)
--- trunk/Source/WebCore/page/FrameView.cpp 2017-10-18 21:52:09 UTC (rev 223630)
+++ trunk/Source/WebCore/page/FrameView.cpp 2017-10-18 21:54:28 UTC (rev 223631)
@@ -882,15 +882,10 @@
bool FrameView::updateCompositingLayersAfterStyleChange()
{
- RenderView* renderView = this->renderView();
- if (!renderView)
- return false;
-
// If we expect to update compositing after an incipient layout, don't do so here.
- if (inPreLayoutStyleUpdate() || layoutPending() || renderView->needsLayout())
+ if (!renderView() || needsLayout() || isInLayout())
return false;
-
- return renderView->compositor().didRecalcStyleWithNoPendingLayout();
+ return renderView()->compositor().didRecalcStyleWithNoPendingLayout();
}
void FrameView::updateCompositingLayersAfterLayout()
@@ -1417,8 +1412,6 @@
performPostLayoutTasks();
}
- m_layoutPhase = InPreLayoutStyleUpdate;
-
// Viewport-dependent media queries may cause us to need completely different style information.
auto* styleResolver = document.styleScope().resolverIfExists();
if (!styleResolver || styleResolver->hasMediaQueriesAffectedByViewportChange()) {
Modified: trunk/Source/WebCore/page/FrameView.h (223630 => 223631)
--- trunk/Source/WebCore/page/FrameView.h 2017-10-18 21:52:09 UTC (rev 223630)
+++ trunk/Source/WebCore/page/FrameView.h 2017-10-18 21:54:28 UTC (rev 223631)
@@ -657,7 +657,6 @@
enum LayoutPhase {
OutsideLayout,
InPreLayout,
- InPreLayoutStyleUpdate,
InRenderTreeLayout,
InViewSizeAdjust,
InPostLayout,
@@ -665,8 +664,6 @@
};
LayoutPhase layoutPhase() const { return m_layoutPhase; }
- bool inPreLayoutStyleUpdate() const { return m_layoutPhase == InPreLayoutStyleUpdate; }
-
bool isFrameView() const final { return true; }
friend class RenderWidget;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
