| Index: Source/core/layout/LayoutObject.cpp
|
| diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp
|
| index 3dd14adb668dff34bc8254334ce61394e7e440bf..f50efc7fb29c33d9682ed307d1941349014622ce 100644
|
| --- a/Source/core/layout/LayoutObject.cpp
|
| +++ b/Source/core/layout/LayoutObject.cpp
|
| @@ -1201,8 +1201,14 @@ void LayoutObject::invalidateTreeIfNeeded(const PaintInvalidationState& paintInv
|
| if (!shouldCheckForPaintInvalidation(paintInvalidationState))
|
| return;
|
|
|
| - invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationState.paintInvalidationContainer());
|
| - clearPaintInvalidationState(paintInvalidationState);
|
| + PaintInvalidationReason reason = invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationState.paintInvalidationContainer());
|
| + if (reason != PaintInvalidationDelayedFull) {
|
| + clearPaintInvalidationState(paintInvalidationState);
|
| + } else {
|
| + // Mark this object as needing paint invalidation again in the next frame, due to the request for delayed paint invalidation.
|
| + setShouldDoFullPaintInvalidation();
|
| + }
|
| +
|
| invalidatePaintOfSubtreesIfNeeded(paintInvalidationState);
|
| }
|
|
|
| @@ -3112,7 +3118,6 @@ void LayoutObject::setShouldDoFullPaintInvalidation(PaintInvalidationReason reas
|
| m_bitfields.setFullPaintInvalidationReason(reason);
|
| }
|
|
|
| - ASSERT(document().lifecycle().state() != DocumentLifecycle::InPaintInvalidation);
|
| frame()->page()->animator().scheduleVisualUpdate(); // In case that this is called outside of FrameView::updateLayoutAndStyleForPainting().
|
| markContainerChainForPaintInvalidation();
|
| }
|
|
|