| 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 7f99056f295989d367d4e20e5db8bc2c3d001678..101e9457a46145baca86bc6c8e4d2ba29bbf9f54 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutObject.cpp
|
| @@ -1576,15 +1576,19 @@ void LayoutObject::incrementallyInvalidatePaint(const LayoutBoxModelObject& pain
|
|
|
| void LayoutObject::fullyInvalidatePaint(const LayoutBoxModelObject& paintInvalidationContainer, PaintInvalidationReason invalidationReason, const LayoutRect& oldBounds, const LayoutRect& newBounds)
|
| {
|
| - // Otherwise do full paint invalidation.
|
| - LayoutRect invalidationRect = oldBounds;
|
| - adjustInvalidationRectForCompositedScrolling(invalidationRect, paintInvalidationContainer);
|
| - invalidatePaintUsingContainer(paintInvalidationContainer, invalidationRect, invalidationReason);
|
| - if (newBounds != oldBounds) {
|
| - invalidationRect = newBounds;
|
| + // The following logic avoids invalidating twice if one set of bounds contains the other.
|
| + if (!newBounds.contains(oldBounds)) {
|
| + LayoutRect invalidationRect = oldBounds;
|
| adjustInvalidationRectForCompositedScrolling(invalidationRect, paintInvalidationContainer);
|
| invalidatePaintUsingContainer(paintInvalidationContainer, invalidationRect, invalidationReason);
|
| +
|
| + if (oldBounds.contains(newBounds))
|
| + return;
|
| }
|
| +
|
| + LayoutRect invalidationRect = newBounds;
|
| + adjustInvalidationRectForCompositedScrolling(invalidationRect, paintInvalidationContainer);
|
| + invalidatePaintUsingContainer(paintInvalidationContainer, invalidationRect, invalidationReason);
|
| }
|
|
|
| void LayoutObject::invalidatePaintForOverflow()
|
|
|