| Index: sky/engine/core/rendering/RenderLayer.cpp
|
| diff --git a/sky/engine/core/rendering/RenderLayer.cpp b/sky/engine/core/rendering/RenderLayer.cpp
|
| index df9432662546d06e73279d545cf8ead4a7f568bf..be9337024d50b6a4bc1016b80eef8534e3bd580c 100644
|
| --- a/sky/engine/core/rendering/RenderLayer.cpp
|
| +++ b/sky/engine/core/rendering/RenderLayer.cpp
|
| @@ -1214,7 +1214,7 @@ void RenderLayer::paintLayer(GraphicsContext* context, const LayerPaintingInfo&
|
| // Make sure the parent's clip rects have been calculated.
|
| ClipRect clipRect = paintingInfo.paintDirtyRect;
|
| if (parent()) {
|
| - ClipRectsContext clipRectsContext(paintingInfo.rootLayer, (paintFlags & PaintLayerUncachedClipRects) ? UncachedClipRects : PaintingClipRects, IgnoreOverlayScrollbarSize);
|
| + ClipRectsContext clipRectsContext(paintingInfo.rootLayer, (paintFlags & PaintLayerUncachedClipRects) ? UncachedClipRects : PaintingClipRects);
|
| if (shouldRespectOverflowClip(paintFlags, renderer()) == IgnoreOverflowClip)
|
| clipRectsContext.setIgnoreOverflowClip();
|
| clipRect = clipper().backgroundClipRect(clipRectsContext);
|
| @@ -1329,7 +1329,7 @@ void RenderLayer::paintLayerContents(GraphicsContext* context, const LayerPainti
|
| // Collect the fragments. This will compute the clip rectangles and paint offsets for each layer fragment, as well as whether or not the content of each
|
| // fragment should paint.
|
| collectFragments(layerFragments, localPaintingInfo.rootLayer, localPaintingInfo.paintDirtyRect,
|
| - (paintFlags & PaintLayerUncachedClipRects) ? UncachedClipRects : PaintingClipRects, IgnoreOverlayScrollbarSize,
|
| + (paintFlags & PaintLayerUncachedClipRects) ? UncachedClipRects : PaintingClipRects,
|
| shouldRespectOverflowClip(paintFlags, renderer()), &offsetFromRoot, localPaintingInfo.subPixelAccumulation);
|
| updatePaintingInfoForFragments(layerFragments, localPaintingInfo, paintFlags, shouldPaintContent, &offsetFromRoot);
|
| }
|
| @@ -1515,12 +1515,12 @@ void RenderLayer::paintChildren(unsigned childrenToVisit, GraphicsContext* conte
|
| }
|
|
|
| void RenderLayer::collectFragments(LayerFragments& fragments, const RenderLayer* rootLayer, const LayoutRect& dirtyRect,
|
| - ClipRectsCacheSlot clipRectsCacheSlot, OverlayScrollbarSizeRelevancy inOverlayScrollbarSizeRelevancy, ShouldRespectOverflowClip respectOverflowClip, const LayoutPoint* offsetFromRoot,
|
| + ClipRectsCacheSlot clipRectsCacheSlot, ShouldRespectOverflowClip respectOverflowClip, const LayoutPoint* offsetFromRoot,
|
| const LayoutSize& subPixelAccumulation, const LayoutRect* layerBoundingBox)
|
| {
|
| // For unpaginated layers, there is only one fragment.
|
| LayerFragment fragment;
|
| - ClipRectsContext clipRectsContext(rootLayer, clipRectsCacheSlot, inOverlayScrollbarSizeRelevancy, subPixelAccumulation);
|
| + ClipRectsContext clipRectsContext(rootLayer, clipRectsCacheSlot, subPixelAccumulation);
|
| if (respectOverflowClip == IgnoreOverflowClip)
|
| clipRectsContext.setIgnoreOverflowClip();
|
| clipper().calculateRects(clipRectsContext, dirtyRect, fragment.layerBounds, fragment.backgroundRect, fragment.foregroundRect, fragment.outlineRect, offsetFromRoot);
|
| @@ -1853,7 +1853,7 @@ RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, RenderLayer* cont
|
| if (transform() && !appliedTransform) {
|
| // Make sure the parent's clip rects have been calculated.
|
| if (parent()) {
|
| - ClipRect clipRect = clipper().backgroundClipRect(ClipRectsContext(rootLayer, RootRelativeClipRects, IncludeOverlayScrollbarSize));
|
| + ClipRect clipRect = clipper().backgroundClipRect(ClipRectsContext(rootLayer, RootRelativeClipRects));
|
| // Go ahead and test the enclosing clip now.
|
| if (!clipRect.intersects(hitTestLocation))
|
| return 0;
|
| @@ -1933,7 +1933,7 @@ RenderLayer* RenderLayer::hitTestLayer(RenderLayer* rootLayer, RenderLayer* cont
|
|
|
| // Collect the fragments. This will compute the clip rectangles for each layer fragment.
|
| LayerFragments layerFragments;
|
| - collectFragments(layerFragments, rootLayer, hitTestRect, RootRelativeClipRects, IncludeOverlayScrollbarSize);
|
| + collectFragments(layerFragments, rootLayer, hitTestRect, RootRelativeClipRects);
|
|
|
| // Next we want to see if the mouse pos is inside the child RenderObjects of the layer. Check
|
| // every fragment in reverse order.
|
|
|