corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 840902. Part 1: Stop checking the results of various display list methods. r=mattwoodrow

Browse Source
This commit is contained in:
Robert O'Callahan
2013-02-15 00:08:08 +13:00
parent 831705d590
commit 3ac2cf9858
60 changed files with 375 additions and 516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
layout/forms/nsFieldSetFrame.cpp
View File

@@ -187,19 +187,16 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
// we need to paint the outline
if (IsVisibleForPainting(aBuilder)) {
if (GetStyleBorder()->mBoxShadow) {
nsresult rv = aLists.BorderBackground()->AppendNewToTop(new (aBuilder)
nsDisplayBoxShadowOuter(aBuilder, this));
NS_ENSURE_SUCCESS(rv, rv);
aLists.BorderBackground()->AppendNewToTop(new (aBuilder)
nsDisplayBoxShadowOuter(aBuilder, this));
}
// don't bother checking to see if we really have a border or background.
// we usually will have a border.
nsresult rv = aLists.BorderBackground()->AppendNewToTop(new (aBuilder)
nsDisplayFieldSetBorderBackground(aBuilder, this));
NS_ENSURE_SUCCESS(rv, rv);
aLists.BorderBackground()->AppendNewToTop(new (aBuilder)
nsDisplayFieldSetBorderBackground(aBuilder, this));
rv = DisplayOutlineUnconditional(aBuilder, aLists);
NS_ENSURE_SUCCESS(rv, rv);
DisplayOutlineUnconditional(aBuilder, aLists);
DO_GLOBAL_REFLOW_COUNT_DSP("nsFieldSetFrame");
}
@@ -212,16 +209,14 @@ nsFieldSetFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
// mLegendFrame. However, we want mContentFrame's display items to be
// after mLegendFrame's display items in z-order, so we need to save them
// and append them later.
nsresult rv = BuildDisplayListForChild(aBuilder, mContentFrame, aDirtyRect,
contentDisplayItems);
NS_ENSURE_SUCCESS(rv, rv);
BuildDisplayListForChild(aBuilder, mContentFrame, aDirtyRect,
contentDisplayItems);
}
if (mLegendFrame) {
// The legend's background goes on our BlockBorderBackgrounds list because
// it's a block child.
nsDisplayListSet set(aLists, aLists.BlockBorderBackgrounds());
nsresult rv = BuildDisplayListForChild(aBuilder, mLegendFrame, aDirtyRect, set);
NS_ENSURE_SUCCESS(rv, rv);
BuildDisplayListForChild(aBuilder, mLegendFrame, aDirtyRect, set);
}
// Put mContentFrame's display items on the master list. Note that
// this moves mContentFrame's border/background display items to our