Remove unneeded nsDisplayClip::mClippingFrame. (Bug 459144, patch 11) r=roc a2.0=blocking2.0:beta6

This commit is contained in:
L. David Baron
2010-09-09 08:21:46 -07:00
parent c3e72af005
commit 9e80caafad
5 changed files with 16 additions and 24 deletions

View File

@@ -1259,13 +1259,13 @@ public:
// We are not a stacking context root. There is no valid underlying
// frame for the whole list. These items are all in-flow descendants so
// we can safely just clip them.
return new (aBuilder) nsDisplayClip(aBuilder, nsnull, mContainer, aList, mRect);
return new (aBuilder) nsDisplayClip(aBuilder, nsnull, aList, mRect);
}
virtual nsDisplayItem* WrapItem(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem) {
nsIFrame* f = aItem->GetUnderlyingFrame();
if (mClipAll || nsLayoutUtils::IsProperAncestorFrame(mContainer, f, nsnull))
return new (aBuilder) nsDisplayClip(aBuilder, f, mContainer, aItem, mRect);
return new (aBuilder) nsDisplayClip(aBuilder, f, aItem, mRect);
return aItem;
}
protected:
@@ -1284,12 +1284,12 @@ public:
nsIFrame* aFrame, nsDisplayList* aList) {
// We are not a stacking context root. There is no valid underlying
// frame for the whole list.
return new (aBuilder) nsDisplayClip(aBuilder, nsnull, mContainer, aList, mRect);
return new (aBuilder) nsDisplayClip(aBuilder, nsnull, aList, mRect);
}
virtual nsDisplayItem* WrapItem(nsDisplayListBuilder* aBuilder,
nsDisplayItem* aItem) {
return new (aBuilder) nsDisplayClip(aBuilder, aItem->GetUnderlyingFrame(),
mContainer, aItem, mRect);
aItem, mRect);
}
protected:
nsIFrame* mContainer;