Paint local attachment backgrounds into composited scrolling contents layer

third_party/WebKit/Source/core/layout/LayoutBox.cpp

Index: third_party/WebKit/Source/core/layout/LayoutBox.cpp
diff --git a/third_party/WebKit/Source/core/layout/LayoutBox.cpp b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
index bfa8daeabf98e24ca0b10994f63097df39737ca2..e4cc4c1bcc3efa7cef77e79f25ce8075d5ddbf7e 100644
--- a/third_party/WebKit/Source/core/layout/LayoutBox.cpp
+++ b/third_party/WebKit/Source/core/layout/LayoutBox.cpp
@@ -707,15 +707,38 @@ FloatQuad LayoutBox::absoluteContentQuad() const
     return localToAbsoluteQuad(FloatRect(rect));
 }
 
-LayoutRect LayoutBox::backgroundClipRect() const
-{
-    // TODO(flackr): Check for the maximum background clip rect.
-    switch (style()->backgroundClip()) {
+LayoutRect LayoutBox::backgroundRect(BackgroundRectType rectOpacity) const
+{
+    EFillBox backgroundBox = TextFillBox;
+    // Find the largest background rect of the given opaqueness.
+    if (const FillLayer* current = &(style()->backgroundLayers())) {
+        do {
+            const FillLayer* cur = current;
+            current = current->next();
+            if (rectOpacity == BackgroundKnownOpaqueRect) {
+                if (cur->blendMode() != WebBlendModeNormal || cur->composite() != CompositeSourceOver)
+                    continue;
+                // Check if the image or color has alpha.
+                if (const StyleImage* image = cur->image()) {
+                    if (!image->knownToBeOpaque(*this))
+                        continue;
+                } else if (!cur->next()) {
+                    Color backgroundColor = resolveColor(CSSPropertyBackgroundColor);
+                    if (backgroundColor.hasAlpha())
+                        continue;
+                } else {
+                    continue;
+                }
+            }
+            EFillBox currentClip = cur->clip();
+            // Adjust clip if attachment is local.
+            if (currentClip == BorderFillBox && cur->attachment() == LocalBackgroundAttachment)
+                currentClip = PaddingFillBox;
+            backgroundBox = enclosingFillBox(backgroundBox, currentClip);
+        } while (current);
+    }
+    switch (backgroundBox) {
     case BorderFillBox:
-        // A 'border-box' clip on scrollable elements local attachment is treated as 'padding-box'.
-        // https://www.w3.org/TR/css3-background/#the-background-attachment
-        if (!style()->isOverflowVisible() && style()->backgroundLayers().attachment() == LocalBackgroundAttachment)
-            return paddingBoxRect();
         return borderBoxRect();
         break;
     case PaddingFillBox:
@@ -1379,10 +1402,6 @@ bool LayoutBox::backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) c
     if (isDocumentElement() || backgroundStolenForBeingBody())
         return false;
 
-    Color backgroundColor = resolveColor(CSSPropertyBackgroundColor);
-    if (backgroundColor.hasAlpha())
-        return false;
-
     // If the element has appearance, it might be painted by theme.
     // We cannot be sure if theme paints the background opaque.
     // In this case it is safe to not assume opaqueness.
@@ -1396,10 +1415,9 @@ bool LayoutBox::backgroundIsKnownToBeOpaqueInRect(const LayoutRect& localRect) c
         return false;
     if (hasClipPath())
         return false;
-    // FIXME: The background color clip is defined by the last layer.
-    if (style()->backgroundLayers().next())
+    if (style()->hasBlendMode())
         return false;
-    return backgroundClipRect().contains(localRect);
+    return backgroundRect(BackgroundKnownOpaqueRect).contains(localRect);
 }
 
 static bool isCandidateForOpaquenessTest(const LayoutBox& childBox)
@@ -1755,13 +1773,12 @@ void LayoutBox::mapAncestorToLocal(const LayoutBoxModelObject* ancestor, Transfo
 
     bool isFixedPos = style()->position() == FixedPosition;
 
-    if (style()->canContainFixedPositionObjects() && !isFixedPos) {
-        // If this box has a transform or contains paint, it acts as a fixed position container for fixed descendants,
-        // and may itself also be fixed position. So propagate 'fixed' up only if this box is fixed position.
+    // If this box has a transform or contains paint, it acts as a fixed position container for fixed descendants,
+    // and may itself also be fixed position. So propagate 'fixed' up only if this box is fixed position.
+    if (style()->canContainFixedPositionObjects() && !isFixedPos)
         mode &= ~IsFixed;
-    } else if (isFixedPos) {
+    else if (isFixedPos)
         mode |= IsFixed;
-    }
 
     LayoutBoxModelObject::mapAncestorToLocal(ancestor, transformState, mode);
 }