| Index: third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp b/third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp
|
| index 5db6656abb6b5f35936e87b80f952fd0c2ca67a9..bd8878a302b1dba1b02acd1c370850ad6cce395d 100644
|
| --- a/third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/LayerClipRecorder.cpp
|
| @@ -64,17 +64,20 @@ void LayerClipRecorder::collectRoundedRectClips(
|
| PaintLayerFlags paintFlags,
|
| BorderRadiusClippingRule rule,
|
| Vector<FloatRoundedRect>& roundedRectClips) {
|
| - // If the clip rect has been tainted by a border radius, then we have to walk up our layer chain applying the clips from
|
| - // any layers with overflow. The condition for being able to apply these clips is that the overflow object be in our
|
| - // containing block chain so we check that also.
|
| + // If the clip rect has been tainted by a border radius, then we have to walk
|
| + // up our layer chain applying the clips from any layers with overflow. The
|
| + // condition for being able to apply these clips is that the overflow object
|
| + // be in our containing block chain so we check that also.
|
| for (PaintLayer* layer = rule == IncludeSelfForBorderRadius
|
| ? &paintLayer
|
| : paintLayer.parent();
|
| layer; layer = layer->parent()) {
|
| - // Composited scrolling layers handle border-radius clip in the compositor via a mask layer. We do not
|
| - // want to apply a border-radius clip to the layer contents itself, because that would require re-rastering
|
| - // every frame to update the clip. We only want to make sure that the mask layer is properly clipped so
|
| - // that it can in turn clip the scrolled contents in the compositor.
|
| + // Composited scrolling layers handle border-radius clip in the compositor
|
| + // via a mask layer. We do not want to apply a border-radius clip to the
|
| + // layer contents itself, because that would require re-rastering every
|
| + // frame to update the clip. We only want to make sure that the mask layer
|
| + // is properly clipped so that it can in turn clip the scrolled contents in
|
| + // the compositor.
|
| if (layer->needsCompositedScrolling() &&
|
| !(paintFlags & PaintLayerPaintingChildClippingMaskPhase))
|
| break;
|
| @@ -85,8 +88,9 @@ void LayerClipRecorder::collectRoundedRectClips(
|
| LayoutPoint delta(fragmentOffset);
|
| layer->convertToLayerCoords(localPaintingInfo.rootLayer, delta);
|
|
|
| - // The PaintLayer's size is pixel-snapped if it is a LayoutBox. We can't use a pre-snapped border rect for clipping, since getRoundedInnerBorderFor assumes
|
| - // it has not been snapped yet.
|
| + // The PaintLayer's size is pixel-snapped if it is a LayoutBox. We can't
|
| + // use a pre-snapped border rect for clipping, since
|
| + // getRoundedInnerBorderFor assumes it has not been snapped yet.
|
| LayoutSize size(layer->layoutBox()
|
| ? toLayoutBox(layer->layoutObject())->size()
|
| : LayoutSize(layer->size()));
|
|
|