Index: third_party/WebKit/Source/core/layout/LayoutObject.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.cpp b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
index 33ebe5d70e5514d82cfa6dbdc943c3469146d4cd..e808104586ba148b45faa0a50bf821f0501df340 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp |
@@ -1194,7 +1194,7 @@ static void invalidatePaintRectangleOnWindow(const LayoutBoxModelObject& paintIn |
void LayoutObject::invalidatePaintUsingContainer(const LayoutBoxModelObject& paintInvalidationContainer, const LayoutRect& dirtyRect, PaintInvalidationReason invalidationReason) const |
{ |
- if (RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()) |
+ if (RuntimeEnabledFeatures::slimmingPaintV2Enabled()) |
return; |
if (paintInvalidationContainer.frameView()->shouldThrottleRendering()) |
@@ -1446,29 +1446,6 @@ PaintInvalidationReason LayoutObject::invalidatePaintIfNeeded(PaintInvalidationS |
return invalidationReason; |
} |
-void LayoutObject::invalidatePaintIfNeededForSynchronizedPainting(const PaintInfo& paintInfo) |
-{ |
- ASSERT(RuntimeEnabledFeatures::slimmingPaintSynchronizedPaintingEnabled()); |
- ASSERT(document().lifecycle().state() == DocumentLifecycle::InPaint); |
- ASSERT(paintInfo.paintInvalidationState); |
- ASSERT(paintInfo.paintContainer()); |
- |
- PaintController& paintController = paintInfo.context->paintController(); |
- if (paintController.clientHasCheckedPaintInvalidation(displayItemClient())) { |
- ASSERT(paintController.clientCacheIsValid(displayItemClient()) |
- == (invalidatePaintIfNeeded(*paintInfo.paintInvalidationState, *paintInfo.paintContainer()) == PaintInvalidationNone)); |
- return; |
- } |
- |
- PaintInvalidationReason reason = invalidatePaintIfNeeded(*paintInfo.paintInvalidationState, *paintInfo.paintContainer()); |
- clearPaintInvalidationState(*paintInfo.paintInvalidationState); |
- |
- if (reason == PaintInvalidationDelayedFull) |
- paintInfo.paintInvalidationState->pushDelayedPaintInvalidationTarget(*this); |
- |
- paintController.setClientHasCheckedPaintInvalidation(displayItemClient()); |
-} |
- |
PaintInvalidationReason LayoutObject::paintInvalidationReason(const LayoutBoxModelObject& paintInvalidationContainer, |
const LayoutRect& oldBounds, const LayoutPoint& oldPositionFromPaintInvalidationBacking, |
const LayoutRect& newBounds, const LayoutPoint& newPositionFromPaintInvalidationBacking) const |