зеркало из https://github.com/mozilla/pjs.git
Bug 478101. Suppres GetUsed* assertions during all display list processing, not just during display list construction. r+sr=roc
This commit is contained in:
Родитель
a910bdbafb
Коммит
68391d3e5a
|
@ -1071,16 +1071,15 @@ nsresult
|
|||
nsLayoutUtils::PaintFrame(nsIRenderingContext* aRenderingContext, nsIFrame* aFrame,
|
||||
const nsRegion& aDirtyRegion, nscolor aBackground)
|
||||
{
|
||||
nsAutoDisableGetUsedXAssertions disableAssert;
|
||||
|
||||
nsDisplayListBuilder builder(aFrame, PR_FALSE, PR_TRUE);
|
||||
nsDisplayList list;
|
||||
nsRect dirtyRect = aDirtyRegion.GetBounds();
|
||||
|
||||
builder.EnterPresShell(aFrame, dirtyRect);
|
||||
|
||||
nsresult rv;
|
||||
{
|
||||
nsAutoDisableGetUsedXAssertions disableAssert;
|
||||
rv =
|
||||
nsresult rv =
|
||||
aFrame->BuildDisplayListForStackingContext(&builder, dirtyRect, &list);
|
||||
|
||||
if (NS_SUCCEEDED(rv) && aFrame->GetType() == nsGkAtoms::pageContentFrame) {
|
||||
|
@ -1100,7 +1099,6 @@ nsLayoutUtils::PaintFrame(nsIRenderingContext* aRenderingContext, nsIFrame* aFra
|
|||
y += page->GetSize().height;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
builder.LeavePresShell(aFrame, dirtyRect);
|
||||
NS_ENSURE_SUCCESS(rv, rv);
|
||||
|
|
Загрузка…
Ссылка в новой задаче