Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1356)

Unified Diff: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp

Issue 1315543004: Fix assert about lifecycle in setTracksPaintInvalidations for spv2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: ()s Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp
diff --git a/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp b/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp
index 8e789ad3cee61cba101c1beba65e492a19f878d3..1f1e46a5bdcb9954b087fab11b4e5bc039c923d7 100644
--- a/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp
+++ b/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp
@@ -878,7 +878,9 @@ void DeprecatedPaintLayerCompositor::resetTrackedPaintInvalidationRects()
void DeprecatedPaintLayerCompositor::setTracksPaintInvalidations(bool tracksPaintInvalidations)
{
- ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
+ ASSERT(lifecycle().state() ==
+ (RuntimeEnabledFeatures::slimmingPaintV2Enabled()
+ ? DocumentLifecycle::CompositingForSlimmingPaintV2Clean : DocumentLifecycle::PaintInvalidationClean));
m_isTrackingPaintInvalidations = tracksPaintInvalidations;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698