From eb28b723923a332bd0889a683de8264fe2d1a49f Mon Sep 17 00:00:00 2001 From: Ryan VanderMeulen Date: Thu, 29 Nov 2012 17:55:50 -0500 Subject: [PATCH] Backed out changeset 9430676f5442 (bug 808767) for Android R3 failures. --- layout/generic/nsFlexContainerFrame.cpp | 6 +- .../flexbox-paint-ordering-1-ref.xhtml | 74 ---------------- .../flexbox/flexbox-paint-ordering-1.xhtml | 86 ------------------- layout/reftests/flexbox/reftest.list | 3 - 4 files changed, 1 insertion(+), 168 deletions(-) delete mode 100644 layout/reftests/flexbox/flexbox-paint-ordering-1-ref.xhtml delete mode 100644 layout/reftests/flexbox/flexbox-paint-ordering-1.xhtml diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp index c5086a2eedd6..0a9b036bc4f1 100644 --- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -8,7 +8,6 @@ /* rendering object for CSS "display: flex" */ #include "nsFlexContainerFrame.h" -#include "nsDisplayList.h" #include "nsLayoutUtils.h" #include "nsPresContext.h" #include "nsStyleContext.h" @@ -981,11 +980,8 @@ nsFlexContainerFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, nsresult rv = DisplayBorderBackgroundOutline(aBuilder, aLists); NS_ENSURE_SUCCESS(rv, rv); - // Our children are all block-level, so their borders/backgrounds all go on - // the BlockBorderBackgrounds list. - nsDisplayListSet childLists(aLists, aLists.BlockBorderBackgrounds()); for (nsFrameList::Enumerator e(mFrames); !e.AtEnd(); e.Next()) { - rv = BuildDisplayListForChild(aBuilder, e.get(), aDirtyRect, childLists, + rv = BuildDisplayListForChild(aBuilder, e.get(), aDirtyRect, aLists, GetDisplayFlagsForFlexItem(e.get())); NS_ENSURE_SUCCESS(rv, rv); } diff --git a/layout/reftests/flexbox/flexbox-paint-ordering-1-ref.xhtml b/layout/reftests/flexbox/flexbox-paint-ordering-1-ref.xhtml deleted file mode 100644 index 3dbb19356ff8..000000000000 --- a/layout/reftests/flexbox/flexbox-paint-ordering-1-ref.xhtml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- -
-
-
-
- - - diff --git a/layout/reftests/flexbox/flexbox-paint-ordering-1.xhtml b/layout/reftests/flexbox/flexbox-paint-ordering-1.xhtml deleted file mode 100644 index dc78884c7c92..000000000000 --- a/layout/reftests/flexbox/flexbox-paint-ordering-1.xhtml +++ /dev/null @@ -1,86 +0,0 @@ - - - - - - - - - -
-
-
-
- - -
-
-
-
- - -
-
-
-
- -
- - -
-
-
-
- - -
-
-
-
- -
- - -
-
-
-
- - - diff --git a/layout/reftests/flexbox/reftest.list b/layout/reftests/flexbox/reftest.list index d3ba78f9e1c3..6600ddbe15c6 100644 --- a/layout/reftests/flexbox/reftest.list +++ b/layout/reftests/flexbox/reftest.list @@ -100,9 +100,6 @@ test-pref(layout.css.flexbox.enabled,true) == flexbox-items-as-stacking-contexts test-pref(layout.css.flexbox.enabled,true) == flexbox-minSize-horiz-1.xhtml flexbox-minSize-horiz-1-ref.xhtml test-pref(layout.css.flexbox.enabled,true) == flexbox-minSize-vert-1.xhtml flexbox-minSize-vert-1-ref.xhtml -# Tests for the order in which we paint flex items -test-pref(layout.css.flexbox.enabled,true) == flexbox-paint-ordering-1.xhtml flexbox-paint-ordering-1-ref.xhtml - # Tests for handling of absolutely/fixed/relatively-positioned flex items. test-pref(layout.css.flexbox.enabled,true) == flexbox-position-absolute-1.xhtml flexbox-position-absolute-1-ref.xhtml test-pref(layout.css.flexbox.enabled,true) == flexbox-position-absolute-2.xhtml flexbox-position-absolute-2-ref.xhtml