Bug 664130 - Rename isComposited to isVisuallyAtomic. r=roc.

This commit is contained in:
Jonathan Watt 2011-09-08 12:15:00 +01:00
parent 45d5658c7f
commit 9a2fd9b810

View File

@ -1823,11 +1823,12 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
// Child is composited if it's transformed, partially transparent, or has
// SVG effects.
PRBool isComposited = disp->mOpacity != 1.0f || aChild->IsTransformed()
PRBool isVisuallyAtomic = disp->mOpacity != 1.0f
|| aChild->IsTransformed()
|| nsSVGIntegrationUtils::UsingEffectsForFrame(aChild);
PRBool isPositioned = disp->IsPositioned();
if (isComposited || isPositioned || disp->IsFloating() ||
if (isVisuallyAtomic || isPositioned || disp->IsFloating() ||
(aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT)) {
// If you change this, also change IsPseudoStackingContextFromStyle()
pseudoStackingContext = PR_TRUE;
@ -1872,7 +1873,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
nsDisplayList extraPositionedDescendants;
const nsStylePosition* pos = aChild->GetStylePosition();
if ((isPositioned && pos->mZIndex.GetUnit() == eStyleUnit_Integer) ||
isComposited || (aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT)) {
isVisuallyAtomic || (aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT)) {
// True stacking context
rv = aChild->BuildDisplayListForStackingContext(aBuilder, dirty, &list);
if (NS_SUCCEEDED(rv)) {
@ -1924,7 +1925,7 @@ nsIFrame::BuildDisplayListForChild(nsDisplayListBuilder* aBuilder,
}
NS_ENSURE_SUCCESS(rv, rv);
if (isPositioned || isComposited ||
if (isPositioned || isVisuallyAtomic ||
(aFlags & DISPLAY_CHILD_FORCE_STACKING_CONTEXT)) {
// Genuine stacking contexts, and positioned pseudo-stacking-contexts,
// go in this level.