| Index: Source/core/paint/DeprecatedPaintLayer.cpp
|
| diff --git a/Source/core/paint/DeprecatedPaintLayer.cpp b/Source/core/paint/DeprecatedPaintLayer.cpp
|
| index c4a0f5b487ea4b8368bb91e1a4961fe51ab03765..ea5ca4adb958b53c529104ad7a03b529d764bc0b 100644
|
| --- a/Source/core/paint/DeprecatedPaintLayer.cpp
|
| +++ b/Source/core/paint/DeprecatedPaintLayer.cpp
|
| @@ -1387,7 +1387,7 @@ void DeprecatedPaintLayer::appendSingleFragmentIgnoringPagination(DeprecatedPain
|
| ClipRectsContext clipRectsContext(rootLayer, clipRectsCacheSlot, inOverlayScrollbarSizeRelevancy, subPixelAccumulation);
|
| if (respectOverflowClip == IgnoreOverflowClip)
|
| clipRectsContext.setIgnoreOverflowClip();
|
| - clipper().calculateRects(clipRectsContext, dirtyRect, fragment.layerBounds, fragment.backgroundRect, fragment.foregroundRect, fragment.outlineRect, offsetFromRoot);
|
| + clipper().calculateRects(clipRectsContext, dirtyRect, fragment.layerBounds, fragment.backgroundRect, fragment.foregroundRect, offsetFromRoot);
|
| fragments.append(fragment);
|
| }
|
|
|
| @@ -1413,9 +1413,8 @@ void DeprecatedPaintLayer::collectFragments(DeprecatedPaintLayerFragments& fragm
|
| LayoutRect layerBoundsInFlowThread;
|
| ClipRect backgroundRectInFlowThread;
|
| ClipRect foregroundRectInFlowThread;
|
| - ClipRect outlineRectInFlowThread;
|
| - clipper().calculateRects(paginationClipRectsContext, LayoutRect(LayoutRect::infiniteIntRect()), layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread,
|
| - outlineRectInFlowThread, &offsetWithinPaginatedLayer);
|
| + clipper().calculateRects(paginationClipRectsContext, LayoutRect(LayoutRect::infiniteIntRect()), layerBoundsInFlowThread,
|
| + backgroundRectInFlowThread, foregroundRectInFlowThread, &offsetWithinPaginatedLayer);
|
|
|
| // Take our bounding box within the flow thread and clip it.
|
| LayoutRect layerBoundingBoxInFlowThread = layerBoundingBox ? *layerBoundingBox : physicalBoundingBox(offsetWithinPaginatedLayer);
|
| @@ -1460,7 +1459,7 @@ void DeprecatedPaintLayer::collectFragments(DeprecatedPaintLayerFragments& fragm
|
| DeprecatedPaintLayerFragment& fragment = fragments.at(i);
|
|
|
| // Set our four rects with all clipping applied that was internal to the flow thread.
|
| - fragment.setRects(layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread, outlineRectInFlowThread);
|
| + fragment.setRects(layerBoundsInFlowThread, backgroundRectInFlowThread, foregroundRectInFlowThread);
|
|
|
| // Shift to the root-relative physical position used when painting the flow thread in this fragment.
|
| fragment.moveBy(fragment.paginationOffset + offsetOfPaginationLayerFromRoot + subPixelAccumulationIfNeeded);
|
|
|