| Index: third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| diff --git a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| index b938ccffbe207cb53c29ea507fcb973da2d904a8..e0fc2ccb153e943aef7b137bca291bb70c6e39f0 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -583,9 +583,6 @@ void CompositedLayerMapping::
|
| if (!clipping_container)
|
| return;
|
|
|
| - if (clipping_container->EnclosingLayer() == scroll_parent)
|
| - return;
|
| -
|
| if (compositing_ancestor->GetLayoutObject().IsDescendantOf(
|
| clipping_container))
|
| return;
|
| @@ -616,6 +613,9 @@ void CompositedLayerMapping::
|
| owning_layer_is_clipped &&
|
| clipping_container->Style()->HasBorderRadius() &&
|
| !AncestorRoundedCornersWontClip(GetLayoutObject(), *clipping_container);
|
| +
|
| + if (clipping_container->EnclosingLayer() == scroll_parent)
|
| + owning_layer_is_clipped = owning_layer_is_masked;
|
| }
|
|
|
| const PaintLayer* CompositedLayerMapping::ScrollParent() {
|
|
|