Backout 7aceff7124d9 (bug 815591) for Mac test failures
authorRobert O'Callahan <robert@ocallahan.org>
Thu, 29 Nov 2012 20:39:36 +1300
changeset 114470 66eaee2d8885e0832872687c54a44948cbdd48f7
parent 114469 280c4fb7794d23687dcce03eaeabb0b93100ed11
child 114471 9498df71b94c191670bbc8ea10edc8b4ab3637c7
push id23917
push useremorley@mozilla.com
push dateThu, 29 Nov 2012 14:20:29 +0000
treeherdermozilla-central@c72d38e7a212 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs815591
milestone20.0a1
backs out7aceff7124d9fed368c636dcdf7f4a99a5160611
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backout 7aceff7124d9 (bug 815591) for Mac test failures
layout/base/nsDisplayList.cpp
--- a/layout/base/nsDisplayList.cpp
+++ b/layout/base/nsDisplayList.cpp
@@ -1560,23 +1560,21 @@ nsDisplayBackgroundImage::AppendBackgrou
   nscolor color;
   if (!nsCSSRendering::IsCanvasFrame(aFrame) && bg) {
     bool drawBackgroundImage;
     color =
       nsCSSRendering::DetermineBackgroundColor(presContext, bgSC, aFrame,
                                                drawBackgroundImage, drawBackgroundColor);
   }
 
-  // Even if we don't actually have a background color to paint, we may still need
-  // to create an item for hit testing.
-  if (color != NS_RGBA(0,0,0,0) || aBuilder->IsForEventDelivery()) {
-    aList->AppendNewToTop(
-        new (aBuilder) nsDisplayBackgroundColor(aBuilder, aFrame, bg,
-                                                drawBackgroundColor ? color : NS_RGBA(0, 0, 0, 0)));
-  }
+  // Even if we don't actually have a background color to paint, we still need
+  // to create the item because it's used for hit testing.
+  aList->AppendNewToTop(
+      new (aBuilder) nsDisplayBackgroundColor(aBuilder, aFrame, bg,
+                                              drawBackgroundColor ? color : NS_RGBA(0, 0, 0, 0)));
  
   // Passing bg == nullptr in this macro will result in one iteration with
   // i = 0.
   bool backgroundSet = !aBackground;
   NS_FOR_VISIBLE_BACKGROUND_LAYERS_BACK_TO_FRONT(i, bg) {
     nsDisplayBackgroundImage* bgItem =
       new (aBuilder) nsDisplayBackgroundImage(aBuilder, aFrame, i, isThemed, bg);
     nsresult rv = aList->AppendNewToTop(bgItem);