Index: third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp |
diff --git a/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp b/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp |
index 643e88ef3446c562d8b6cdb760bd3a783a5e668a..a7913447072c7942e7d02392d76f4a0c5f4fec75 100644 |
--- a/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp |
+++ b/third_party/WebKit/Source/core/dom/DocumentLifecycle.cpp |
@@ -195,7 +195,20 @@ bool DocumentLifecycle::canAdvanceTo(State nextState) const |
return true; |
if (nextState == InCompositingUpdate) |
return true; |
- if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()) |
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) { |
+ if (nextState == InCalcPaintProps) |
+ return true; |
+ } else { |
+ if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()) |
+ return true; |
+ } |
+ break; |
+ case InCalcPaintProps: |
+ if (nextState == CalcPaintPropsClean && RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
+ return true; |
+ break; |
+ case CalcPaintPropsClean: |
+ if (nextState == InPaint && RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
return true; |
break; |
case InPaint: |