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

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

Issue 1308953005: Revert "Virtual test suites for slimming paint phase 2" (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 c0a398585890cfc7c03fe99df9a98aa98071bb23..1f1e46a5bdcb9954b087fab11b4e5bc039c923d7 100644
--- a/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp
+++ b/Source/core/layout/compositing/DeprecatedPaintLayerCompositor.cpp
@@ -878,16 +878,9 @@ void DeprecatedPaintLayerCompositor::resetTrackedPaintInvalidationRects()
void DeprecatedPaintLayerCompositor::setTracksPaintInvalidations(bool tracksPaintInvalidations)
{
-#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
-
+ ASSERT(lifecycle().state() ==
+ (RuntimeEnabledFeatures::slimmingPaintV2Enabled()
+ ? DocumentLifecycle::CompositingForSlimmingPaintV2Clean : DocumentLifecycle::PaintInvalidationClean));
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