Force bleed avoidance for some background image rendering

third_party/WebKit/Source/core/paint/BoxDecorationData.cpp

Index: third_party/WebKit/Source/core/paint/BoxDecorationData.cpp
diff --git a/third_party/WebKit/Source/core/paint/BoxDecorationData.cpp b/third_party/WebKit/Source/core/paint/BoxDecorationData.cpp
index ef35fb1fffab783a39ddaa21d7c09b690541270b..822c00c4e36587792236dfdb3046ae8bac918419 100644
--- a/third_party/WebKit/Source/core/paint/BoxDecorationData.cpp
+++ b/third_party/WebKit/Source/core/paint/BoxDecorationData.cpp
@@ -47,13 +47,19 @@ BackgroundBleedAvoidance BoxDecorationData::determineBackgroundBleedAvoidance(co
     if (!hasBackground)
         return BackgroundBleedNone;
 
-    if (!hasBorderDecoration || !layoutBox.style()->hasBorderRadius() || layoutBox.canRenderBorderImage()) {
+    const ComputedStyle& boxStyle = *layoutBox.style();

[jbroman, 2016/02/09 22:06:21]

nit: *layoutBox.style() equivalent to layoutBox.styleRef(), which seems to be
very slightly preferred elsewhere?

+    const bool hasBorderRadius = boxStyle.hasBorderRadius();
+    if (!hasBorderDecoration || !hasBorderRadius || layoutBox.canRenderBorderImage()) {
         if (layoutBox.backgroundShouldAlwaysBeClipped())
             return BackgroundBleedClipOnly;
+        if (backgroundColor.alpha() && boxStyle.hasBackgroundImage() && hasBorderRadius) {

[f(malita), 2016/02/09 22:07:39]

I think one can stack background layers arbitrarily, even multiple images - so
only testing the background color may not be enough.  E.g., will this work for
two stacked non-opaque images when the background color is unspecified?

Also, the background painter stops painting when it encounters the first opaque
layer
(https://code.google.com/p/chromium/codesearch#chromium/src/third_party/WebKit...).
 So if the top image is known to be opaque, we shouldn't need this extra layer
(which is not cheap).

So maybe a better precondition would be something along these lines:

  if (has_border_radius && bg_has_multiple_layers && !top_layer_is_opaque) ...

+            // Prevent bleeding of background color behind the background image when we clip for the border radius
+            return BackgroundBleedClipLayer;
+        }
         return BackgroundBleedNone;
     }
 
-    if (borderObscuresBackgroundEdge(*layoutBox.style()))
+    if (borderObscuresBackgroundEdge(boxStyle))
         return BackgroundBleedShrinkBackground;
 
     return BackgroundBleedClipLayer;