Index: third_party/WebKit/Source/core/layout/LayoutObject.h |
diff --git a/third_party/WebKit/Source/core/layout/LayoutObject.h b/third_party/WebKit/Source/core/layout/LayoutObject.h |
index de88310f5786ba342e80b7a2ff454b9945d4e90e..ed980f55e816c8f255d71ce21d71b6edfa2278a8 100644 |
--- a/third_party/WebKit/Source/core/layout/LayoutObject.h |
+++ b/third_party/WebKit/Source/core/layout/LayoutObject.h |
@@ -1355,11 +1355,7 @@ public: |
bool shouldCheckForPaintInvalidation(const PaintInvalidationState& paintInvalidationState) const |
{ |
- // Should check for paint invalidation if some ancestor changed location, because this object |
- // may also change paint offset or location in paint invalidation container, even if there is |
- // no paint invalidation flag set. |
- return paintInvalidationState.forcedSubtreeInvalidationWithinContainer() |
- || paintInvalidationState.forcedSubtreeInvalidationRectUpdateWithinContainer() |
+ return paintInvalidationState.hasForcedSubtreeInvalidationFlags() |
|| shouldCheckForPaintInvalidationRegardlessOfPaintInvalidationState(); |
} |
@@ -1511,7 +1507,7 @@ protected: |
void setPreviousPaintInvalidationRect(const LayoutRect& rect) { m_previousPaintInvalidationRect = rect; } |
- virtual PaintInvalidationReason getPaintInvalidationReason(const LayoutBoxModelObject& paintInvalidationContainer, |
+ virtual PaintInvalidationReason getPaintInvalidationReason(const PaintInvalidationState&, |
const LayoutRect& oldPaintInvalidationRect, const LayoutPoint& oldPositionFromPaintInvalidationBacking, |
const LayoutRect& newPaintInvalidationRect, const LayoutPoint& newPositionFromPaintInvalidationBacking) const; |