| Index: third_party/WebKit/Source/core/paint/PaintLayer.cpp
|
| diff --git a/third_party/WebKit/Source/core/paint/PaintLayer.cpp b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
|
| index 535f90699c94aab02253d897aec7dfe7afe65e9b..0eba7e6116d3256c9fbb6d118b34736709c147a5 100644
|
| --- a/third_party/WebKit/Source/core/paint/PaintLayer.cpp
|
| +++ b/third_party/WebKit/Source/core/paint/PaintLayer.cpp
|
| @@ -2659,13 +2659,15 @@ GraphicsLayer* PaintLayer::graphicsLayerBackingForScrolling() const {
|
| }
|
| }
|
|
|
| -bool PaintLayer::canPaintBackgroundOntoScrollingContentsLayer() const {
|
| - if (isRootLayer() || !scrollsOverflow() ||
|
| - !layoutObject()->hasLocalEquivalentBackground())
|
| - return false;
|
| -
|
| +BackgroundPaintLocation PaintLayer::backgroundPaintLocation() const {
|
| + BackgroundPaintLocation location =
|
| + isRootLayer() || !scrollsOverflow()
|
| + ? BackgroundPaintInGraphicsLayer
|
| + : layoutObject()->backgroundPaintLocation();
|
| m_stackingNode->updateLayerListsIfNeeded();
|
| - return !m_stackingNode->hasNegativeZOrderList();
|
| + if (m_stackingNode->hasNegativeZOrderList())
|
| + location = BackgroundPaintInGraphicsLayer;
|
| + return location;
|
| }
|
|
|
| void PaintLayer::ensureCompositedLayerMapping() {
|
|
|