Bug 611574 - Inset box-shadow paints outside of buttons and fieldsets if blur radius is 0. r=roc a=blocking2.0:final
authorMats Palmgren <matspal@gmail.com>
Sat, 27 Nov 2010 23:49:40 +0100
changeset 58305 cc2a24cd718a4a054e17d0e0cd81428c93b39daf
parent 58304 4ca0f5411f1370e20ed7607660bc9b11ece2f268
child 58306 2c41d108edb8b77664fbe935015e38fe9cfaaaa3
push id1
push usershaver@mozilla.com
push dateTue, 04 Jan 2011 17:58:04 +0000
reviewersroc, blocking2
bugs611574
milestone2.0b8pre
Bug 611574 - Inset box-shadow paints outside of buttons and fieldsets if blur radius is 0. r=roc a=blocking2.0:final
layout/base/nsCSSRendering.cpp
layout/reftests/box-shadow/611574-1-ref.html
layout/reftests/box-shadow/611574-1.html
layout/reftests/box-shadow/611574-2-ref.html
layout/reftests/box-shadow/611574-2.html
layout/reftests/box-shadow/reftest.list
--- a/layout/base/nsCSSRendering.cpp
+++ b/layout/base/nsCSSRendering.cpp
@@ -16,17 +16,17 @@
  * The Original Code is mozilla.org code.
  *
  * The Initial Developer of the Original Code is
  * Netscape Communications Corporation.
  * Portions created by the Initial Developer are Copyright (C) 1998
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
- *   Mats Palmgren <mats.palmgren@bredband.net>
+ *   Mats Palmgren <matspal@gmail.com>
  *   Takeshi Ichimaru <ayakawa.m@gmail.com>
  *   Masayuki Nakano <masayuki@d-toybox.com>
  *   L. David Baron <dbaron@dbaron.org>, Mozilla Corporation
  *   Michael Ventnor <m.ventnor@gmail.com>
  *   Rob Arnold <robarnold@mozilla.com>
  *   Jeff Walden <jwalden+code@mit.edu>
  *
  * Alternatively, the contents of this file may be used under the terms of
@@ -1284,19 +1284,21 @@ nsCSSRendering::PaintBoxShadowInner(nsPr
       !nsContentUtils::IsChromeDoc(aForFrame->GetContent()->GetCurrentDoc())) {
     // There's no way of getting hold of a shape corresponding to a
     // "padding-box" for native-themed widgets, so just don't draw
     // inner box-shadows for them. But we allow chrome to paint inner
     // box shadows since chrome can be aware of the platform theme.
     return;
   }
 
-  // Get any border radius, since box-shadow must also have rounded corners if the frame does
+  // Get any border radius, since box-shadow must also have rounded corners
+  // if the frame does.
   nscoord twipsRadii[8];
-  NS_ASSERTION(aFrameArea.Size() == aForFrame->GetSize(), "unexpected size");
+  NS_ASSERTION(aForFrame->GetType() == nsGkAtoms::fieldSetFrame ||
+               aFrameArea.Size() == aForFrame->GetSize(), "unexpected size");
   PRBool hasBorderRadius = aForFrame->GetBorderRadii(twipsRadii);
   nscoord twipsPerPixel = aPresContext->DevPixelsToAppUnits(1);
 
   nsRect paddingRect = aFrameArea;
   nsMargin border = aForFrame->GetUsedBorder();
   aForFrame->ApplySkipSides(border);
   paddingRect.Deflate(border);
 
@@ -1360,31 +1362,35 @@ nsCSSRendering::PaintBoxShadowInner(nsPr
         borderSizes[NS_SIDE_BOTTOM] = spreadDistance;
       }
 
       nsCSSBorderRenderer::ComputeInnerRadii(innerRadii, borderSizes,
                                              &clipRectRadii);
     }
 
     // Set the "skip rect" to the area within the frame that we don't paint in,
-    // including after blurring. We also use this for clipping later on.
+    // including after blurring.
     nsRect skipRect = shadowClipRect;
     skipRect.Deflate(blurMargin);
     gfxRect skipGfxRect = nsLayoutUtils::RectToGfxRect(skipRect, twipsPerPixel);
     if (hasBorderRadius) {
       skipGfxRect.Inset(PR_MAX(clipRectRadii[C_TL].height, clipRectRadii[C_TR].height), 0,
                         PR_MAX(clipRectRadii[C_BL].height, clipRectRadii[C_BR].height), 0);
     }
 
+    // When there's a blur radius, gfxAlphaBoxBlur leaves the skiprect area
+    // unchanged. And by construction the gfxSkipRect is not touched by the
+    // rendered shadow (even after blurring), so those pixels must be completely
+    // transparent in the shadow, so drawing them changes nothing.
     gfxContext* renderContext = aRenderingContext.ThebesContext();
     nsRefPtr<gfxContext> shadowContext;
     nsContextBoxBlur blurringArea;
-
-    shadowContext = blurringArea.Init(shadowPaintRect, 0, blurRadius, twipsPerPixel, renderContext,
-                                      aDirtyRect, &skipGfxRect);
+    shadowContext =
+      blurringArea.Init(shadowPaintRect, 0, blurRadius, twipsPerPixel,
+                        renderContext, aDirtyRect, &skipGfxRect);
     if (!shadowContext)
       continue;
 
     // Set the shadow color; if not specified, use the foreground color
     nscolor shadowColor;
     if (shadowItem->mHasColor)
       shadowColor = shadowItem->mColor;
     else
@@ -1399,22 +1405,20 @@ nsCSSRendering::PaintBoxShadowInner(nsPr
     gfxRect shadowGfxRect =
       nsLayoutUtils::RectToGfxRect(paddingRect, twipsPerPixel);
     shadowGfxRect.Round();
     renderContext->NewPath();
     if (hasBorderRadius)
       renderContext->RoundedRectangle(shadowGfxRect, innerRadii, PR_FALSE);
     else
       renderContext->Rectangle(shadowGfxRect);
-    renderContext->Rectangle(skipGfxRect);
-    renderContext->SetFillRule(gfxContext::FILL_RULE_EVEN_ODD);
     renderContext->Clip();
 
-    // Fill the temporary surface minus the area within the frame that we should
-    // not paint in, and blur and apply it
+    // Fill the surface minus the area within the frame that we should
+    // not paint in, and blur and apply it.
     gfxRect shadowPaintGfxRect =
       nsLayoutUtils::RectToGfxRect(shadowPaintRect, twipsPerPixel);
     shadowPaintGfxRect.RoundOut();
     gfxRect shadowClipGfxRect =
       nsLayoutUtils::RectToGfxRect(shadowClipRect, twipsPerPixel);
     shadowClipGfxRect.Round();
     shadowContext->NewPath();
     shadowContext->Rectangle(shadowPaintGfxRect);
new file mode 100644
--- /dev/null
+++ b/layout/reftests/box-shadow/611574-1-ref.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html><head><style>
+button,span,fieldset { background-color: #0F0; }
+</style></head>
+<body style="margin:30px">
+<div style="-moz-column-count:3">
+<p><button>No Blur Radius</button>
+<p><button>No Blur Radius</button>
+<p><button>No Blur Radius</button>
+<p><button>No Blur Radius</button>
+<p><button>No Blur Radius</button>
+
+<p><button>2px Blur Radius</button>
+<p><button>2px Blur Radius</button>
+<p><button>2px Blur Radius</button>
+<p><button>2px Blur Radius</button>
+<p><button>2px Blur Radius</button>
+
+<p><span>No Blur Radius</span>
+<p><span>No Blur Radius</span>
+<p><span style="-moz-box-sizing:border-box; ">No Blur Radius</span>
+<p><span>No Blur Radius</span>
+<p><span>No Blur Radius</span>
+
+<p><span>2px Blur Radius</span>
+<p><span>2px Blur Radius</span>
+<p><span style="-moz-box-sizing:border-box; ">2px Blur Radius</span>
+<p><span>2px Blur Radius</span>
+<p><span>2px Blur Radius</span>
+
+<p><fieldset>No Blur Radius</fieldset>
+<p><fieldset><legend>No</legend> Blur Radius</fieldset>
+<p><fieldset>No Blur Radius</fieldset>
+<p><fieldset style="-moz-box-sizing:border-box; ">No Blur Radius</fieldset>
+<p><fieldset>No Blur Radius</fieldset>
+<p><fieldset>No Blur Radius</fieldset>
+
+<p><fieldset>2px Blur Radius</fieldset>
+<p><fieldset><legend>2px</legend> Blur Radius</fieldset>
+<p><fieldset>2px Blur Radius</fieldset>
+<p><fieldset style="-moz-box-sizing:border-box; ">2px Blur Radius</fieldset>
+<p><fieldset>2px Blur Radius</fieldset>
+<p><fieldset>2px Blur Radius</fieldset>
+
+<p><fieldset style="display:inline;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;"><legend>No</legend> Blur Radius</fieldset>
+<p><fieldset style="display:inline;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline; -moz-box-sizing:border-box; ">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;">No Blur Radius</fieldset>
+
+<p><fieldset style="display:inline;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;"><legend>2px</legend> Blur Radius</fieldset>
+<p><fieldset style="display:inline;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline; -moz-box-sizing:border-box; ">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;">2px Blur Radius</fieldset>
+
+</div>
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/box-shadow/611574-1.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html><head><style>
+button,span,fieldset { background-color: #0F0; }
+</style></head>
+<body style="margin:30px">
+<div style="-moz-column-count:3;">
+<p><button style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</button>
+<p><button style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</button>
+<p><button style="box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</button>
+<p><button style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</button>
+<p><button style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</button>
+
+<p><button style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</button>
+<p><button style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</button>
+<p><button style="box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</button>
+<p><button style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</button>
+<p><button style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</button>
+
+<p><span style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</span>
+<p><span style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</span>
+<p><span style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</span>
+<p><span style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</span>
+<p><span style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</span>
+
+<p><span style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</span>
+<p><span style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</span>
+<p><span style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</span>
+<p><span style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</span>
+<p><span style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</span>
+
+<p><fieldset style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset -20px 10px 0 #0F0;"><legend>No</legend> Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</fieldset>
+
+<p><fieldset style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset -20px 10px 2px #0F0;"><legend>2px</legend> Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</fieldset>
+
+<p><fieldset style="display:inline; box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-shadow: inset -20px 10px 0 #0F0;"><legend>No</legend> Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;  -moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</fieldset>
+
+<p><fieldset style="display:inline; box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-shadow: inset -20px 10px 2px #0F0;"><legend>2px</legend> Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;  -moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline; box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</fieldset>
+
+</div>
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/box-shadow/611574-2-ref.html
@@ -0,0 +1,64 @@
+<!DOCTYPE HTML>
+<html>
+<head><style>
+button,span,fieldset { border-radius: 7px 3px;  background-color: #0F0; }
+</style></head>
+<body style="margin:30px">
+<div style="-moz-column-count:3">
+<p><button>No Blur Radius</button>
+<p><button>No Blur Radius</button>
+<p><button>No Blur Radius</button>
+<p><button>No Blur Radius</button>
+<p><button>No Blur Radius</button>
+
+<p><button>2px Blur Radius</button>
+<p><button>2px Blur Radius</button>
+<p><button>2px Blur Radius</button>
+<p><button>2px Blur Radius</button>
+<p><button>2px Blur Radius</button>
+
+<!--  XXX TODO: SPAN does not work due to differences in anti-aliasing with the test
+<p><span>No Blur Radius</span>
+<p><span>No Blur Radius</span>
+<p><span style="-moz-box-sizing:border-box; ">No Blur Radius</span>
+<p><span>No Blur Radius</span>
+<p><span>No Blur Radius</span>
+
+<p><span>2px Blur Radius</span>
+<p><span>2px Blur Radius</span>
+<p><span style="-moz-box-sizing:border-box; ">2px Blur Radius</span>
+<p><span>2px Blur Radius</span>
+<p><span>2px Blur Radius</span>
+-->
+
+<p><fieldset>No Blur Radius</fieldset>
+<p><fieldset><legend>No</legend> Blur Radius</fieldset>
+<p><fieldset>No Blur Radius</fieldset>
+<p><fieldset style="-moz-box-sizing:border-box; ">No Blur Radius</fieldset>
+<p><fieldset>No Blur Radius</fieldset>
+<p><fieldset>No Blur Radius</fieldset>
+
+<p><fieldset>2px Blur Radius</fieldset>
+<p><fieldset><legend>2px</legend> Blur Radius</fieldset>
+<p><fieldset>2px Blur Radius</fieldset>
+<p><fieldset style="-moz-box-sizing:border-box; ">2px Blur Radius</fieldset>
+<p><fieldset>2px Blur Radius</fieldset>
+<p><fieldset>2px Blur Radius</fieldset>
+
+<p><fieldset style="display:inline;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;"><legend>No</legend> Blur Radius</fieldset>
+<p><fieldset style="display:inline;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline; -moz-box-sizing:border-box; ">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;">No Blur Radius</fieldset>
+
+<p><fieldset style="display:inline;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;"><legend>2px</legend> Blur Radius</fieldset>
+<p><fieldset style="display:inline;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline; -moz-box-sizing:border-box; ">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;">2px Blur Radius</fieldset>
+
+</div>
+</body>
+</html>
new file mode 100644
--- /dev/null
+++ b/layout/reftests/box-shadow/611574-2.html
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<html>
+<head><style>
+button,span,fieldset { border-radius: 7px 3px;  background-color: #0F0; }
+</style></head>
+<body style="margin:30px">
+<div style="-moz-column-count:3">
+<p><button style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</button>
+<p><button style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</button>
+<p><button style="box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</button>
+<p><button style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</button>
+<p><button style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</button>
+
+<p><button style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</button>
+<p><button style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</button>
+<p><button style="box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</button>
+<p><button style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</button>
+<p><button style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</button>
+
+<!--  XXX TODO: SPAN does not work due to differences in anti-aliasing with the reference
+<p><span style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</span>
+<p><span style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</span>
+<p><span style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</span>
+<p><span style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</span>
+<p><span style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</span>
+
+<p><span style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</span>
+<p><span style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</span>
+<p><span style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</span>
+<p><span style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</span>
+<p><span style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</span>
+-->
+
+<p><fieldset style="box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset -20px 10px 0 #0F0;"><legend>No</legend> Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</fieldset>
+
+<p><fieldset style="box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset -20px 10px 2px #0F0;"><legend>2px</legend> Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</fieldset>
+
+<p><fieldset style="display:inline;box-shadow: inset -20px 10px 0 #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-shadow: inset -20px 10px 0 #0F0;"><legend>No</legend> Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-shadow: inset  20px 10px 0 #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;-moz-box-sizing:border-box; box-shadow: inset -20px 10px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-shadow: inset 200px 100px 0 4px #0F0;">No Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-shadow: inset 200px -100px 0 4px #0F0;">No Blur Radius</fieldset>
+
+<p><fieldset style="display:inline;box-shadow: inset -20px 10px 2px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-shadow: inset -20px 10px 2px #0F0;"><legend>2px</legend> Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-shadow: inset  20px 10px 2px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;-moz-box-sizing:border-box; box-shadow: inset -20px 10px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-shadow: inset 200px 100px 2px 4px #0F0;">2px Blur Radius</fieldset>
+<p><fieldset style="display:inline;box-shadow: inset 200px -100px 2px 4px #0F0;">2px Blur Radius</fieldset>
+
+</div>
+
+
+</body>
+</html>
--- a/layout/reftests/box-shadow/reftest.list
+++ b/layout/reftests/box-shadow/reftest.list
@@ -16,8 +16,10 @@ random-if(layersGPUAccelerated) == boxsh
 random-if(d2d) == boxshadow-rounded-spread.html boxshadow-rounded-spread-ref.html
 HTTP(..) == boxshadow-dynamic.xul boxshadow-dynamic-ref.xul
 random-if(d2d) == boxshadow-onecorner.html boxshadow-onecorner-ref.html
 == boxshadow-skiprect.html boxshadow-skiprect-ref.html
 
 == overflow-not-scrollable-1.html overflow-not-scrollable-1-ref.html
 == overflow-not-scrollable-1.html overflow-not-scrollable-1-ref2.html
 == overflow-not-scrollable-2.html overflow-not-scrollable-2-ref.html
+== 611574-1.html 611574-1-ref.html
+== 611574-2.html 611574-2-ref.html