diff options
| -rw-r--r-- | third_party/WebKit/Source/core/frame/FrameView.cpp | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp index a6d1b8d..0c4d969 100644 --- a/third_party/WebKit/Source/core/frame/FrameView.cpp +++ b/third_party/WebKit/Source/core/frame/FrameView.cpp @@ -2382,23 +2382,27 @@ void FrameView::updateLifecyclePhasesInternal(LifeCycleUpdateOption phases) } if (LayoutView* view = layoutView()) { - TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", InspectorUpdateLayerTreeEvent::data(m_frame.get())); + { + TRACE_EVENT1("devtools.timeline", "UpdateLayerTree", "data", InspectorUpdateLayerTreeEvent::data(m_frame.get())); - // This was required for slimming paint v1 but is only temporarily - // needed for slimming paint v2. - view->compositor()->updateIfNeededRecursive(); - scrollContentsIfNeededRecursive(); + // This was required for slimming paint v1 but is only temporarily + // needed for slimming paint v2. + view->compositor()->updateIfNeededRecursive(); + scrollContentsIfNeededRecursive(); - ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean); + ASSERT(lifecycle().state() >= DocumentLifecycle::CompositingClean); - if (phases == AllPhases) { - invalidateTreeIfNeededRecursive(); + if (phases == AllPhases) { + invalidateTreeIfNeededRecursive(); - if (view->compositor()->inCompositingMode()) - scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); + if (view->compositor()->inCompositingMode()) + scrollingCoordinator()->updateAfterCompositingChangeIfNeeded(); - updateCompositedSelectionIfNeeded(); + updateCompositedSelectionIfNeeded(); + } + } + if (phases == AllPhases) { if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) updatePaintProperties(); |