Paint local attachment backgrounds into composited scrolling contents layer

third_party/WebKit/Source/core/layout/compositing/CompositedLayerMapping.cpp

 /*
  * Copyright (C) 2009, 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 80 matching lines @@
     return pixelSnappedIntRect(toLayoutBox(layoutObject)->contentBoxRect());
 }
 
 static IntRect backgroundRect(const LayoutObject* layoutObject)
 {
     if (!layoutObject->isBox())
         return IntRect();
 
     LayoutRect rect;
     const LayoutBox* box = toLayoutBox(layoutObject);
-    return pixelSnappedIntRect(box->backgroundClipRect());
+    return pixelSnappedIntRect(box->backgroundRect(BackgroundClipRect));
 }
 
 static inline bool isAcceleratedCanvas(const LayoutObject* layoutObject)
 {
     if (layoutObject->isCanvas()) {
         HTMLCanvasElement* canvas = toHTMLCanvasElement(layoutObject->node());
         if (CanvasRenderingContext* context = canvas->renderingContext())
             return context->isAccelerated();
     }
     return false;
@@ skipping 2448 matching lines @@
     }
     if (previousIndex == indexToClear && layerToRemove->groupedMapping() == this) {
         compositor()->paintInvalidationOnCompositingChange(layerToRemove);
         return true;
     }
     return false;
 }
 
 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();
 }
 
 bool CompositedLayerMapping::updateSquashingLayerAssignment(PaintLayer* squashedLayer, size_t nextSquashedLayerIndex)
 {
     GraphicsLayerPaintInfo paintInfo;
     paintInfo.paintLayer = squashedLayer;
     // NOTE: composited bounds are updated elsewhere
     // NOTE: offsetFromLayoutObject is updated elsewhere
 
@@ skipping 103 matching lines @@
     } else if (graphicsLayer == m_scrollingContentsLayer.get()) {
         name = "Scrolling Contents Layer";
     } else {
         ASSERT_NOT_REACHED();
     }
 
     return name;
 }
 
 } // namespace blink