Changeset 223631 in webkit
- Timestamp:
- Oct 18, 2017 2:54:28 PM (7 years ago)
- Location:
- trunk/Source/WebCore
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebCore/ChangeLog
r223629 r223631 1 2017-10-18 Zalan Bujtas <zalan@apple.com> 2 3 [FrameView::layout cleanup] Remove InPreLayoutStyleUpdate. 4 https://bugs.webkit.org/show_bug.cgi?id=178483 5 <rdar://problem/35058800> 6 7 Reviewed by Simon Fraser. 8 9 Its client, updateCompositingLayersAfterStyleChange only needs to know if there's a upcoming 10 layer update (part of FrameView::layout()). 11 12 No change in functionality. 13 14 * page/FrameView.cpp: 15 (WebCore::FrameView::updateCompositingLayersAfterStyleChange): 16 (WebCore::FrameView::layout): 17 * page/FrameView.h: 18 1 19 2017-10-18 Chris Dumez <cdumez@apple.com> 2 20 -
trunk/Source/WebCore/page/FrameView.cpp
r223622 r223631 883 883 bool FrameView::updateCompositingLayersAfterStyleChange() 884 884 { 885 RenderView* renderView = this->renderView();886 if (!renderView )885 // If we expect to update compositing after an incipient layout, don't do so here. 886 if (!renderView() || needsLayout() || isInLayout()) 887 887 return false; 888 889 // If we expect to update compositing after an incipient layout, don't do so here. 890 if (inPreLayoutStyleUpdate() || layoutPending() || renderView->needsLayout()) 891 return false; 892 893 return renderView->compositor().didRecalcStyleWithNoPendingLayout(); 888 return renderView()->compositor().didRecalcStyleWithNoPendingLayout(); 894 889 } 895 890 … … 1417 1412 performPostLayoutTasks(); 1418 1413 } 1419 1420 m_layoutPhase = InPreLayoutStyleUpdate;1421 1414 1422 1415 // Viewport-dependent media queries may cause us to need completely different style information. -
trunk/Source/WebCore/page/FrameView.h
r223622 r223631 658 658 OutsideLayout, 659 659 InPreLayout, 660 InPreLayoutStyleUpdate,661 660 InRenderTreeLayout, 662 661 InViewSizeAdjust, … … 665 664 }; 666 665 LayoutPhase layoutPhase() const { return m_layoutPhase; } 667 668 bool inPreLayoutStyleUpdate() const { return m_layoutPhase == InPreLayoutStyleUpdate; }669 666 670 667 bool isFrameView() const final { return true; }
Note: See TracChangeset
for help on using the changeset viewer.