Index: third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp |
diff --git a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp |
index 3ea4a8860e85050dcc59996cc8ac3300c77f712a..239fc14c2afdc738acc1415d86e3eb3c27c5da48 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp |
+++ b/third_party/WebKit/Source/core/layout/LayoutBoxModelObject.cpp |
@@ -379,7 +379,7 @@ static bool hasPercentageTransform(const ComputedStyle& style) |
void LayoutBoxModelObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInvalidationState) |
{ |
- ASSERT(!needsLayout()); |
+ ensureIsReadyForPaintInvalidation(); |
PaintInvalidationState newPaintInvalidationState(paintInvalidationState, *this); |
if (!shouldCheckForPaintInvalidation(newPaintInvalidationState)) |
@@ -391,7 +391,7 @@ void LayoutBoxModelObject::invalidateTreeIfNeeded(const PaintInvalidationState& |
LayoutRect previousPaintInvalidationRect = this->previousPaintInvalidationRect(); |
LayoutPoint previousPosition = previousPositionFromPaintInvalidationBacking(); |
PaintInvalidationReason reason = invalidatePaintIfNeeded(newPaintInvalidationState); |
- clearPaintInvalidationFlags(newPaintInvalidationState); |
+ clearPaintInvalidationFlags(); |
if (previousPosition != previousPositionFromPaintInvalidationBacking()) |
newPaintInvalidationState.setForceSubtreeInvalidationCheckingWithinContainer(); |