| 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 4726e94c533d2302a000145eab10d30750339460..183c283f6643d581e622967a72eaaa90dd9ddf8c 100644
|
| --- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| +++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp
|
| @@ -538,9 +538,6 @@ void CompositedLayerMapping::
|
| if (clippingContainer->enclosingLayer() == scrollParent)
|
| return;
|
|
|
| - if (clippingContainer->enclosingLayer()->hasRootScrollerAsDescendant())
|
| - return;
|
| -
|
| if (compositingAncestor->layoutObject().isDescendantOf(clippingContainer))
|
| return;
|
|
|
| @@ -610,12 +607,6 @@ bool CompositedLayerMapping::updateGraphicsLayerConfiguration() {
|
| if (m_owningLayer.needsCompositedScrolling())
|
| needsDescendantsClippingLayer = false;
|
|
|
| - // We disable clipping on ancestor layers of the root scroller to give it
|
| - // the same behavior w.r.t browser controls as the real root layer. See the
|
| - // RootScrollerController class for more details.
|
| - if (m_owningLayer.hasRootScrollerAsDescendant())
|
| - needsDescendantsClippingLayer = false;
|
| -
|
| const PaintLayer* scrollParent = this->scrollParent();
|
|
|
| // This is required because compositing layers are parented according to the
|
| @@ -2301,6 +2292,7 @@ bool CompositedLayerMapping::updateScrollingLayers(bool needsScrollingLayers) {
|
| m_scrollingLayer =
|
| createGraphicsLayer(CompositingReasonLayerForScrollingContainer);
|
| m_scrollingLayer->setDrawsContent(false);
|
| + m_scrollingLayer->setMasksToBounds(true);
|
|
|
| // Inner layer which renders the content that scrolls.
|
| m_scrollingContentsLayer =
|
| @@ -2319,9 +2311,6 @@ bool CompositedLayerMapping::updateScrollingLayers(bool needsScrollingLayers) {
|
| scrollingCoordinator->scrollableAreasDidChange();
|
| }
|
| }
|
| -
|
| - m_scrollingLayer->setMasksToBounds(
|
| - !m_owningLayer.hasRootScrollerAsDescendant());
|
| } else if (m_scrollingLayer) {
|
| m_scrollingLayer = nullptr;
|
| m_scrollingContentsLayer = nullptr;
|
|
|