Index: Source/core/layout/LayoutObject.cpp |
diff --git a/Source/core/layout/LayoutObject.cpp b/Source/core/layout/LayoutObject.cpp |
index 40bd6bda06659c3cdc866565a5d609e9fba58c21..f5e859a4720a8f87dce35e4a1bd908f6355e92dc 100644 |
--- a/Source/core/layout/LayoutObject.cpp |
+++ b/Source/core/layout/LayoutObject.cpp |
@@ -1203,14 +1203,8 @@ |
if (!shouldCheckForPaintInvalidation(paintInvalidationState)) |
return; |
- 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(); |
- } |
- |
+ invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationState.paintInvalidationContainer()); |
+ clearPaintInvalidationState(paintInvalidationState); |
invalidatePaintOfSubtreesIfNeeded(paintInvalidationState); |
} |
@@ -3123,6 +3117,7 @@ |
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(); |
} |