| 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 8b48ce27cb44531654322b50b2b1c24476743a1e..0ceee46df26b5944a7b5b5bebad725cd8d703104 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -552,9 +552,6 @@ void CompositedLayerMapping::
|
| if (!clipping_container)
|
| return;
|
|
|
| - if (clipping_container->EnclosingLayer() == scroll_parent)
|
| - return;
|
| -
|
| if (compositing_ancestor->GetLayoutObject().IsDescendantOf(
|
| clipping_container))
|
| return;
|
| @@ -584,6 +581,9 @@ void CompositedLayerMapping::
|
| owning_layer_is_masked =
|
| !AncestorRoundedCornersWontClip(compositing_ancestor);
|
| }
|
| +
|
| + if (clipping_container->EnclosingLayer() == scroll_parent)
|
| + owning_layer_is_clipped = owning_layer_is_masked;
|
| }
|
|
|
| const PaintLayer* CompositedLayerMapping::ScrollParent() {
|
|
|