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 6248097b19031e13208183b785a026fa7d0538de..a1cf786a8908ead1d1426fe2cd62cf63e57cdbcf 100644 |
--- a/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
+++ b/third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp |
@@ -98,7 +98,7 @@ static IntRect backgroundRect(const LayoutObject* layoutObject) |
LayoutRect rect; |
const LayoutBox* box = toLayoutBox(layoutObject); |
- return pixelSnappedIntRect(box->backgroundClipRect()); |
+ return pixelSnappedIntRect(box->backgroundRect(BackgroundClipRect)); |
} |
static inline bool isAcceleratedCanvas(const LayoutObject* layoutObject) |
@@ -2567,14 +2567,9 @@ bool CompositedLayerMapping::invalidateLayerIfNoPrecedingEntry(size_t indexToCle |
bool CompositedLayerMapping::shouldPaintBackgroundOntoScrollingContentsLayer() const |
{ |
- // TODO(flackr): Add support for painting locally attached background images. https://crbug.com/625882 |
- const FillLayer& backgroundLayer = m_owningLayer.layoutObject()->style()->backgroundLayers(); |
return !m_owningLayer.isRootLayer() |
&& m_owningLayer.scrollsOverflow() |
- && !backgroundLayer.image() |
- && !backgroundLayer.next() |
- && (backgroundLayer.attachment() == LocalBackgroundAttachment |
- || backgroundLayer.clip() == PaddingFillBox) |
+ && m_owningLayer.layoutObject()->style()->hasEntirelyLocalBackground() |
&& !m_owningLayer.stackingNode()->hasNegativeZOrderList(); |
} |