| Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| index 9adf44adfb0b1e491f5b03de4f17c768d6f6f75b..4b6ebecf3a13c1be0c1fe4ffbd6fab323fd2ae96 100644
|
| --- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
|
| @@ -1478,7 +1478,7 @@ bool LayoutBox::intersectsVisibleViewport()
|
| return rect.intersects(LayoutRect(layoutView->frameView()->getScrollableArea()->visibleContentRectDouble()));
|
| }
|
|
|
| -PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(PaintInvalidationState& paintInvalidationState, const LayoutBoxModelObject& paintInvalidationContainer)
|
| +PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(const PaintInvalidationState& paintInvalidationState)
|
| {
|
| PaintLayer& enclosingSelfPaintingLayer = paintInvalidationState.enclosingSelfPaintingLayer(*this);
|
| if (enclosingSelfPaintingLayer.layoutObject() != this) {
|
| @@ -1503,20 +1503,20 @@ PaintInvalidationReason LayoutBox::invalidatePaintIfNeeded(PaintInvalidationStat
|
| setShouldDoFullPaintInvalidation(PaintInvalidationFull);
|
| }
|
|
|
| - PaintInvalidationReason reason = LayoutBoxModelObject::invalidatePaintIfNeeded(paintInvalidationState, paintInvalidationContainer);
|
| + PaintInvalidationReason reason = LayoutBoxModelObject::invalidatePaintIfNeeded(paintInvalidationState);
|
|
|
| if (!view()->doingFullPaintInvalidation() && !isFullPaintInvalidationReason(reason))
|
| invalidatePaintForOverflowIfNeeded();
|
|
|
| if (PaintLayerScrollableArea* area = getScrollableArea())
|
| - area->invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState, paintInvalidationContainer);
|
| + area->invalidatePaintOfScrollControlsIfNeeded(paintInvalidationState);
|
|
|
| // This is for the next invalidatePaintIfNeeded so must be at the end.
|
| savePreviousBoxSizesIfNeeded();
|
| return reason;
|
| }
|
|
|
| -void LayoutBox::invalidatePaintOfSubtreesIfNeeded(PaintInvalidationState& childPaintInvalidationState)
|
| +void LayoutBox::invalidatePaintOfSubtreesIfNeeded(const PaintInvalidationState& childPaintInvalidationState)
|
| {
|
| LayoutBoxModelObject::invalidatePaintOfSubtreesIfNeeded(childPaintInvalidationState);
|
|
|
|
|