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

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

Issue 1307293002: Virtual test suites for slimming paint phase 2 (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Add more failure expectations discovered on real bots 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 | « LayoutTests/virtual/spv2/paint/README.txt ('k') | 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 0758e5f999cbdd82c45d3a0eee9c16c83beb3b02..53657cedd899cc8ab4f52e093fa34c4a0a19b8e6 100644
--- a/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp
+++ b/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp
@@ -878,9 +878,16 @@ void DeprecatedPaintLayerCompositor::resetTrackedPaintInvalidationRects()
void DeprecatedPaintLayerCompositor::setTracksPaintInvalidations(bool tracksPaintInvalidations)
{
- ASSERT(lifecycle().state() ==
- (RuntimeEnabledFeatures::slimmingPaintV2Enabled()
- ? DocumentLifecycle::CompositingForSlimmingPaintV2Clean : DocumentLifecycle::PaintInvalidationClean));
+#if ENABLE(ASSERT)
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) {
+ ASSERT(lifecycle().state() == DocumentLifecycle::CompositingForSlimmingPaintV2Clean
+ // TODO(wangxianzhu): Remove this when we remove the old path for spv2.
+ || lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
+ } else {
+ ASSERT(lifecycle().state() == DocumentLifecycle::PaintInvalidationClean);
+ }
+#endif
+
m_isTrackingPaintInvalidations = tracksPaintInvalidations;
}
« no previous file with comments | « LayoutTests/virtual/spv2/paint/README.txt ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698