Index: third_party/WebKit/Source/core/frame/FrameView.cpp |
diff --git a/third_party/WebKit/Source/core/frame/FrameView.cpp b/third_party/WebKit/Source/core/frame/FrameView.cpp |
index b42da5159917ed6d0fa5d353d69374a060836dc3..39668f852e650b349c8ab2dfcf768db5c497b9fd 100644 |
--- a/third_party/WebKit/Source/core/frame/FrameView.cpp |
+++ b/third_party/WebKit/Source/core/frame/FrameView.cpp |
@@ -1468,7 +1468,7 @@ void FrameView::addBackgroundAttachmentFixedObject(LayoutObject* object) { |
this); |
// Ensure main thread scrolling reasons are recomputed. |
- if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
+ if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) { |
setNeedsPaintPropertyUpdate(); |
// The object's scroll properties are not affected by its own background. |
object->setAncestorsNeedPaintPropertyUpdateForMainThreadScrolling(); |
@@ -1484,7 +1484,7 @@ void FrameView::removeBackgroundAttachmentFixedObject(LayoutObject* object) { |
this); |
// Ensure main thread scrolling reasons are recomputed. |
- if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
+ if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) { |
setNeedsPaintPropertyUpdate(); |
// The object's scroll properties are not affected by its own background. |
object->setAncestorsNeedPaintPropertyUpdateForMainThreadScrolling(); |
@@ -2724,11 +2724,12 @@ void FrameView::updateAllLifecyclePhases() { |
// TODO(chrishtr): add a scrolling update lifecycle phase. |
void FrameView::updateLifecycleToCompositingCleanPlusScrolling() { |
- if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
updateAllLifecyclePhasesExceptPaint(); |
- else |
+ } else { |
frame().localFrameRoot()->view()->updateLifecyclePhasesInternal( |
DocumentLifecycle::CompositingClean); |
+ } |
} |
void FrameView::updateAllLifecyclePhasesExceptPaint() { |
@@ -3011,7 +3012,7 @@ void FrameView::synchronizedPaintRecursively(GraphicsLayer* graphicsLayer) { |
void FrameView::pushPaintArtifactToCompositor() { |
TRACE_EVENT0("blink", "FrameView::pushPaintArtifactToCompositor"); |
- ASSERT(RuntimeEnabledFeatures::slimmingPaintV2Enabled()); |
+ DCHECK(RuntimeEnabledFeatures::slimmingPaintV2Enabled()); |
Page* page = frame().page(); |
if (!page) |
@@ -3122,7 +3123,7 @@ void FrameView::invalidateTreeIfNeededRecursive() { |
} |
void FrameView::invalidateTreeIfNeededRecursiveInternal() { |
- DCHECK(!RuntimeEnabledFeatures::slimmingPaintV2Enabled()); |
+ DCHECK(!RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()); |
CHECK(layoutView()); |
// We need to stop recursing here since a child frame view might not be |
@@ -3568,7 +3569,7 @@ void FrameView::frameRectsChanged() { |
setLayoutSizeInternal(frameRect().size()); |
setNeedsUpdateViewportIntersection(); |
- if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
+ if (RuntimeEnabledFeatures::slimmingPaintInvalidationEnabled()) { |
// The overflow clip property depends on the frame rect. |
setNeedsPaintPropertyUpdate(); |
} |