diff --git a/mozilla/layout/generic/nsBlockFrame.cpp b/mozilla/layout/generic/nsBlockFrame.cpp index f38edb3270e..59d7407ec5b 100644 --- a/mozilla/layout/generic/nsBlockFrame.cpp +++ b/mozilla/layout/generic/nsBlockFrame.cpp @@ -1359,10 +1359,10 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, // Check whether it wants to floated or absolutely positioned if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (kidDisplay->mFloats != NS_STYLE_FLOAT_NONE) { PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (nsnull == kidPrevInFlow) { // Create initial frame for the child nsIContentDelegate* kidDel; @@ -1397,7 +1397,7 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); break; } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else { // Since kid has a prev-in-flow, use that to create the next // frame. @@ -2099,7 +2099,7 @@ NS_METHOD nsBlockFrame::ContentAppended(nsIPresShell* aShell, break; } } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); // Link child frame into the list of children if (nsnull != prevKidFrame) { diff --git a/mozilla/layout/generic/nsBlockReflowState.cpp b/mozilla/layout/generic/nsBlockReflowState.cpp index f38edb3270e..59d7407ec5b 100644 --- a/mozilla/layout/generic/nsBlockReflowState.cpp +++ b/mozilla/layout/generic/nsBlockReflowState.cpp @@ -1359,10 +1359,10 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, // Check whether it wants to floated or absolutely positioned if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (kidDisplay->mFloats != NS_STYLE_FLOAT_NONE) { PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (nsnull == kidPrevInFlow) { // Create initial frame for the child nsIContentDelegate* kidDel; @@ -1397,7 +1397,7 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); break; } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else { // Since kid has a prev-in-flow, use that to create the next // frame. @@ -2099,7 +2099,7 @@ NS_METHOD nsBlockFrame::ContentAppended(nsIPresShell* aShell, break; } } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); // Link child frame into the list of children if (nsnull != prevKidFrame) { diff --git a/mozilla/layout/generic/nsBlockReflowState.h b/mozilla/layout/generic/nsBlockReflowState.h index f38edb3270e..59d7407ec5b 100644 --- a/mozilla/layout/generic/nsBlockReflowState.h +++ b/mozilla/layout/generic/nsBlockReflowState.h @@ -1359,10 +1359,10 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, // Check whether it wants to floated or absolutely positioned if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (kidDisplay->mFloats != NS_STYLE_FLOAT_NONE) { PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (nsnull == kidPrevInFlow) { // Create initial frame for the child nsIContentDelegate* kidDel; @@ -1397,7 +1397,7 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); break; } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else { // Since kid has a prev-in-flow, use that to create the next // frame. @@ -2099,7 +2099,7 @@ NS_METHOD nsBlockFrame::ContentAppended(nsIPresShell* aShell, break; } } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); // Link child frame into the list of children if (nsnull != prevKidFrame) { diff --git a/mozilla/layout/generic/nsInlineFrame.cpp b/mozilla/layout/generic/nsInlineFrame.cpp index 27734eb6e3f..4864674f048 100644 --- a/mozilla/layout/generic/nsInlineFrame.cpp +++ b/mozilla/layout/generic/nsInlineFrame.cpp @@ -573,10 +573,10 @@ nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, // Check whether it wants to floated or absolutely positioned if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); } else if (kidDisplay->mFloats != NS_STYLE_FLOAT_NONE) { PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); } else if (nsnull == kidPrevInFlow) { nsIContentDelegate* kidDel; switch (kidDisplay->mDisplay) { @@ -638,7 +638,7 @@ nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); break; } - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); } else { kidPrevInFlow->CreateContinuingFrame(aPresContext, this, kidFrame); } diff --git a/mozilla/layout/generic/nsPageFrame.cpp b/mozilla/layout/generic/nsPageFrame.cpp index 7da6ddc801b..39803bddc09 100644 --- a/mozilla/layout/generic/nsPageFrame.cpp +++ b/mozilla/layout/generic/nsPageFrame.cpp @@ -46,7 +46,7 @@ void PageFrame::CreateFirstChild(nsIPresContext* aPresContext) // Resolve style and set the style context nsIStyleContext* kidStyleContext = aPresContext->ResolveStyleContextFor(child, this); - mFirstChild->SetStyleContext(kidStyleContext); + mFirstChild->SetStyleContext(aPresContext,kidStyleContext); NS_RELEASE(kidStyleContext); } NS_RELEASE(cd); diff --git a/mozilla/layout/generic/nsPlaceholderFrame.cpp b/mozilla/layout/generic/nsPlaceholderFrame.cpp index 902c2f2603f..bd545e2068a 100644 --- a/mozilla/layout/generic/nsPlaceholderFrame.cpp +++ b/mozilla/layout/generic/nsPlaceholderFrame.cpp @@ -78,7 +78,7 @@ NS_METHOD PlaceholderFrame::ResizeReflow(nsIPresContext* aPresContext, NS_RELEASE(delegate); // Set the style context for the frame - mAnchoredItem->SetStyleContext(mStyleContext); + mAnchoredItem->SetStyleContext(aPresContext,mStyleContext); // Resize reflow the anchored item into the available space // XXX Check for complete? diff --git a/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp b/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp index e4b2ff7c809..b9db91ad097 100644 --- a/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp +++ b/mozilla/layout/html/base/src/nsAbsoluteFrame.cpp @@ -242,7 +242,7 @@ NS_METHOD AbsoluteFrame::ResizeReflow(nsIPresContext* aPresContext, // Resolve style for the pseudo-frame. We can't use our style context nsIStyleContextPtr styleContext = aPresContext->ResolveStyleContextFor(mContent, this); - mFrame->SetStyleContext(styleContext); + mFrame->SetStyleContext(aPresContext,styleContext); } else { // Create the absolutely positioned item as a pseudo-frame child. We'll @@ -253,7 +253,7 @@ NS_METHOD AbsoluteFrame::ResizeReflow(nsIPresContext* aPresContext, NS_RELEASE(delegate); // Set the style context for the frame - mFrame->SetStyleContext(mStyleContext); + mFrame->SetStyleContext(aPresContext,mStyleContext); } // Get the containing block, and its associated view diff --git a/mozilla/layout/html/base/src/nsBlockFrame.cpp b/mozilla/layout/html/base/src/nsBlockFrame.cpp index f38edb3270e..59d7407ec5b 100644 --- a/mozilla/layout/html/base/src/nsBlockFrame.cpp +++ b/mozilla/layout/html/base/src/nsBlockFrame.cpp @@ -1359,10 +1359,10 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, // Check whether it wants to floated or absolutely positioned if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (kidDisplay->mFloats != NS_STYLE_FLOAT_NONE) { PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (nsnull == kidPrevInFlow) { // Create initial frame for the child nsIContentDelegate* kidDel; @@ -1397,7 +1397,7 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); break; } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else { // Since kid has a prev-in-flow, use that to create the next // frame. @@ -2099,7 +2099,7 @@ NS_METHOD nsBlockFrame::ContentAppended(nsIPresShell* aShell, break; } } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); // Link child frame into the list of children if (nsnull != prevKidFrame) { diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.cpp b/mozilla/layout/html/base/src/nsBlockReflowState.cpp index f38edb3270e..59d7407ec5b 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.cpp +++ b/mozilla/layout/html/base/src/nsBlockReflowState.cpp @@ -1359,10 +1359,10 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, // Check whether it wants to floated or absolutely positioned if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (kidDisplay->mFloats != NS_STYLE_FLOAT_NONE) { PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (nsnull == kidPrevInFlow) { // Create initial frame for the child nsIContentDelegate* kidDel; @@ -1397,7 +1397,7 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); break; } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else { // Since kid has a prev-in-flow, use that to create the next // frame. @@ -2099,7 +2099,7 @@ NS_METHOD nsBlockFrame::ContentAppended(nsIPresShell* aShell, break; } } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); // Link child frame into the list of children if (nsnull != prevKidFrame) { diff --git a/mozilla/layout/html/base/src/nsBlockReflowState.h b/mozilla/layout/html/base/src/nsBlockReflowState.h index f38edb3270e..59d7407ec5b 100644 --- a/mozilla/layout/html/base/src/nsBlockReflowState.h +++ b/mozilla/layout/html/base/src/nsBlockReflowState.h @@ -1359,10 +1359,10 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, // Check whether it wants to floated or absolutely positioned if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (kidDisplay->mFloats != NS_STYLE_FLOAT_NONE) { PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else if (nsnull == kidPrevInFlow) { // Create initial frame for the child nsIContentDelegate* kidDel; @@ -1397,7 +1397,7 @@ nsBlockFrame::ReflowAppendedChildren(nsIPresContext* aCX, nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); break; } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); } else { // Since kid has a prev-in-flow, use that to create the next // frame. @@ -2099,7 +2099,7 @@ NS_METHOD nsBlockFrame::ContentAppended(nsIPresShell* aShell, break; } } - kidFrame->SetStyleContext(kidSC); + kidFrame->SetStyleContext(aCX,kidSC); // Link child frame into the list of children if (nsnull != prevKidFrame) { diff --git a/mozilla/layout/html/base/src/nsBodyFrame.cpp b/mozilla/layout/html/base/src/nsBodyFrame.cpp index 6160c1fde90..0bd53ecc307 100644 --- a/mozilla/layout/html/base/src/nsBodyFrame.cpp +++ b/mozilla/layout/html/base/src/nsBodyFrame.cpp @@ -90,7 +90,7 @@ void nsBodyFrame::CreateColumnFrame(nsIPresContext* aPresContext) // Resolve style and set the style context nsIStyleContext* styleContext = aPresContext->ResolveStyleContextFor(mContent, this); - mFirstChild->SetStyleContext(styleContext); + mFirstChild->SetStyleContext(aPresContext,styleContext); NS_RELEASE(styleContext); } else { nsBodyFrame* prevBody = (nsBodyFrame*)mPrevInFlow; diff --git a/mozilla/layout/html/base/src/nsColumnFrame.cpp b/mozilla/layout/html/base/src/nsColumnFrame.cpp index 72f70cd81a3..7f481a4bc73 100644 --- a/mozilla/layout/html/base/src/nsColumnFrame.cpp +++ b/mozilla/layout/html/base/src/nsColumnFrame.cpp @@ -688,7 +688,7 @@ ColumnFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, // Create a child frame if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); } else if (nsnull == kidPrevInFlow) { // Figure out how to treat the content nsIContentDelegate* kidDel = nsnull; @@ -718,7 +718,7 @@ ColumnFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, pseudoFrame->SetFirstContentOffset(kidIndex); break; } - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); } else { kidPrevInFlow->CreateContinuingFrame(aPresContext, this, kidFrame); if (ChildIsPseudoFrame(kidFrame)) { @@ -1232,7 +1232,7 @@ NS_METHOD ColumnFrame::ContentAppended(nsIPresShell* aShell, case NS_STYLE_DISPLAY_NONE: // Create place holder frame nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); // Append it to the child list if (nsnull == prevKidFrame) { @@ -1255,7 +1255,7 @@ NS_METHOD ColumnFrame::ContentAppended(nsIPresShell* aShell, del = kid->GetDelegate(aPresContext); kidFrame = del->CreateFrame(aPresContext, kid, kidIndex, this); NS_RELEASE(del); - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); // Append it to the child list if (nsnull == prevKidFrame) { @@ -1279,7 +1279,7 @@ NS_METHOD ColumnFrame::ContentAppended(nsIPresShell* aShell, // Resolve style for the pseudo-frame (kid's style won't do) kidStyleContext = aPresContext->ResolveStyleContextFor(mContent, this); - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); // Append the pseudo frame to the child list pseudoFrame = (nsBlockFrame*) kidFrame; diff --git a/mozilla/layout/html/base/src/nsHTMLContainer.cpp b/mozilla/layout/html/base/src/nsHTMLContainer.cpp index e2c30044c42..8f506ba65a5 100644 --- a/mozilla/layout/html/base/src/nsHTMLContainer.cpp +++ b/mozilla/layout/html/base/src/nsHTMLContainer.cpp @@ -214,7 +214,7 @@ nsIFrame* nsHTMLContainer::CreateFrame(nsIPresContext* aPresContext, break; } - rv->SetStyleContext(styleContext); + rv->SetStyleContext(aPresContext,styleContext); NS_RELEASE(styleContext); return rv; } diff --git a/mozilla/layout/html/base/src/nsInlineFrame.cpp b/mozilla/layout/html/base/src/nsInlineFrame.cpp index 27734eb6e3f..4864674f048 100644 --- a/mozilla/layout/html/base/src/nsInlineFrame.cpp +++ b/mozilla/layout/html/base/src/nsInlineFrame.cpp @@ -573,10 +573,10 @@ nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, // Check whether it wants to floated or absolutely positioned if (NS_STYLE_POSITION_ABSOLUTE == kidPosition->mPosition) { AbsoluteFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); } else if (kidDisplay->mFloats != NS_STYLE_FLOAT_NONE) { PlaceholderFrame::NewFrame(&kidFrame, kid, kidIndex, this); - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); } else if (nsnull == kidPrevInFlow) { nsIContentDelegate* kidDel; switch (kidDisplay->mDisplay) { @@ -638,7 +638,7 @@ nsInlineFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext, nsFrame::NewFrame(&kidFrame, kid, kidIndex, this); break; } - kidFrame->SetStyleContext(kidStyleContext); + kidFrame->SetStyleContext(aPresContext,kidStyleContext); } else { kidPrevInFlow->CreateContinuingFrame(aPresContext, this, kidFrame); } diff --git a/mozilla/layout/html/base/src/nsListItemFrame.cpp b/mozilla/layout/html/base/src/nsListItemFrame.cpp index bdb4163c52d..78e8b5e6336 100644 --- a/mozilla/layout/html/base/src/nsListItemFrame.cpp +++ b/mozilla/layout/html/base/src/nsListItemFrame.cpp @@ -437,12 +437,12 @@ nsListItemFrame::~nsListItemFrame() { } -nsIFrame* nsListItemFrame::CreateBullet() +nsIFrame* nsListItemFrame::CreateBullet(nsIPresContext *aCX) { // Create bullet. The bullet shares the same style context as // ourselves. nsIFrame* bullet = new BulletFrame(mContent, mIndexInParent, this); - bullet->SetStyleContext(mStyleContext); + bullet->SetStyleContext(aCX,mStyleContext); return bullet; } @@ -578,7 +578,7 @@ NS_METHOD nsListItemFrame::ResizeReflow(nsIPresContext* aCX, if (nsnull == mFirstChild) { // Inside bullets get placed on the list immediately so that // the regular reflow logic can place them. - bullet = CreateBullet(); + bullet = CreateBullet(aCX); mFirstChild = bullet; mChildCount++; } else { @@ -588,7 +588,7 @@ NS_METHOD nsListItemFrame::ResizeReflow(nsIPresContext* aCX, } else { if (nsnull == mFirstChild) { // Create outside bullet the first time through - bullet = CreateBullet(); + bullet = CreateBullet(aCX); } else { // Pull bullet off list (we'll put it back later) bullet = mFirstChild; diff --git a/mozilla/layout/html/base/src/nsListItemFrame.h b/mozilla/layout/html/base/src/nsListItemFrame.h index c0369ecda63..0a0c2c26573 100644 --- a/mozilla/layout/html/base/src/nsListItemFrame.h +++ b/mozilla/layout/html/base/src/nsListItemFrame.h @@ -60,7 +60,7 @@ protected: virtual ~nsListItemFrame(); - nsIFrame* CreateBullet(); + nsIFrame* CreateBullet(nsIPresContext* aCX); virtual void PaintChildren(nsIPresContext& aCX, nsIRenderingContext& aRenderingContext, diff --git a/mozilla/layout/html/base/src/nsPageFrame.cpp b/mozilla/layout/html/base/src/nsPageFrame.cpp index 7da6ddc801b..39803bddc09 100644 --- a/mozilla/layout/html/base/src/nsPageFrame.cpp +++ b/mozilla/layout/html/base/src/nsPageFrame.cpp @@ -46,7 +46,7 @@ void PageFrame::CreateFirstChild(nsIPresContext* aPresContext) // Resolve style and set the style context nsIStyleContext* kidStyleContext = aPresContext->ResolveStyleContextFor(child, this); - mFirstChild->SetStyleContext(kidStyleContext); + mFirstChild->SetStyleContext(aPresContext,kidStyleContext); NS_RELEASE(kidStyleContext); } NS_RELEASE(cd); diff --git a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp index 902c2f2603f..bd545e2068a 100644 --- a/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp +++ b/mozilla/layout/html/base/src/nsPlaceholderFrame.cpp @@ -78,7 +78,7 @@ NS_METHOD PlaceholderFrame::ResizeReflow(nsIPresContext* aPresContext, NS_RELEASE(delegate); // Set the style context for the frame - mAnchoredItem->SetStyleContext(mStyleContext); + mAnchoredItem->SetStyleContext(aPresContext,mStyleContext); // Resize reflow the anchored item into the available space // XXX Check for complete? diff --git a/mozilla/layout/html/base/src/nsRootPart.cpp b/mozilla/layout/html/base/src/nsRootPart.cpp index ddba5511b86..43796531d65 100644 --- a/mozilla/layout/html/base/src/nsRootPart.cpp +++ b/mozilla/layout/html/base/src/nsRootPart.cpp @@ -105,7 +105,7 @@ NS_METHOD RootFrame::ResizeReflow(nsIPresContext* aPresContext, mFirstChild = new RootContentFrame(mContent, mIndexInParent, this); mChildCount = 1; nsIStyleContext* style = aPresContext->ResolveStyleContextFor(mContent, this); - mFirstChild->SetStyleContext(style); + mFirstChild->SetStyleContext(aPresContext,style); NS_RELEASE(style); } @@ -277,7 +277,7 @@ void RootContentFrame::CreateFirstChild(nsIPresContext* aPresContext) // Resolve style and set the style context nsIStyleContext* kidStyleContext = aPresContext->ResolveStyleContextFor(child, this); - mFirstChild->SetStyleContext(kidStyleContext); + mFirstChild->SetStyleContext(aPresContext,kidStyleContext); NS_RELEASE(kidStyleContext); } NS_RELEASE(cd);