Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed API for CreateContinuingFrame and GetReflowMetrics to take

Browse Source 
a reference to a nsIPresContext
This commit is contained in:
troy 1998-07-15 03:23:23 +00:00
parent cccdb4c7b1
commit d660868bc2
41 changed files with 82 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/base/public/nsIFrame.h
View File

@ -537,7 +537,7 @@ public:
* Flow member functions. CreateContinuingFrame() is responsible for
* appending the continuing frame to the flow.
*/
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame) = 0;

10
layout/base/src/nsContainerFrame.cpp
View File

@ -78,7 +78,7 @@ nsContainerFrame::SizeOfWithoutThis(nsISizeOfHandler* aHandler) const
}
void
nsContainerFrame::PrepareContinuingFrame(nsIPresContext* aPresContext,
nsContainerFrame::PrepareContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsContainerFrame* aContFrame)
@ -94,17 +94,17 @@ nsContainerFrame::PrepareContinuingFrame(nsIPresContext* aPresContext,
aContFrame->mLastContentOffset = nextOffset;
aContFrame->mLastContentIsComplete = PR_TRUE;
aContFrame->SetStyleContext(aPresContext, aStyleContext);
aContFrame->SetStyleContext(&aPresContext, aStyleContext);
}
NS_METHOD
nsContainerFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsContainerFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)
{
nsIContentDelegate* contentDelegate = mContent->GetDelegate(aPresContext);
nsresult rv = contentDelegate->CreateFrame(aPresContext, mContent, aParent,
nsIContentDelegate* contentDelegate = mContent->GetDelegate(&aPresContext);
nsresult rv = contentDelegate->CreateFrame(&aPresContext, mContent, aParent,
aStyleContext, aContinuingFrame);
NS_RELEASE(contentDelegate);
if (NS_OK == rv) {

4
layout/base/src/nsContainerFrame.h
View File

@ -113,7 +113,7 @@ public:
* set the content offsets, mLastContentOffset, and append the continuing
* frame to the flow.
*/
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);
@ -205,7 +205,7 @@ protected:
* and style context. Subclasses should invoke this method after
* construction of a continuing frame.
*/
void PrepareContinuingFrame(nsIPresContext* aPresContext,
void PrepareContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsContainerFrame* aContFrame);

2
layout/base/src/nsFrame.cpp
View File

@ -1141,7 +1141,7 @@ NS_METHOD nsFrame::IsSplittable(nsSplittableType& aIsSplittable) const
return NS_OK;
}
NS_METHOD nsFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
NS_METHOD nsFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/base/src/nsFrame.h
View File

@ -177,7 +177,7 @@ public:
NS_IMETHOD GetReflowMetrics(nsIPresContext& aPresContext,
nsReflowMetrics& aMetrics);
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

10
layout/base/src/nsSplittableFrame.cpp
View File

@ -70,14 +70,14 @@ nsSplittableFrame::IsSplittable(nsSplittableType& aIsSplittable) const
* @return the continuing frame or null if unsuccessful
*/
NS_METHOD
nsSplittableFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsSplittableFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)
{
nsIContentDelegate* contentDelegate = mContent->GetDelegate(aPresContext);
nsIContentDelegate* contentDelegate = mContent->GetDelegate(&aPresContext);
nsresult rv = contentDelegate->CreateFrame(aPresContext, mContent, aParent,
nsresult rv = contentDelegate->CreateFrame(&aPresContext, mContent, aParent,
aStyleContext, aContinuingFrame);
NS_RELEASE(contentDelegate);
if (NS_OK != rv) {
@ -91,8 +91,8 @@ nsSplittableFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
// Resolve style for the continuing frame and set its style context.
nsIStyleContext* styleContext =
aPresContext->ResolveStyleContextFor(mContent, aParent);
aContinuingFrame->SetStyleContext(aPresContext,styleContext);
aPresContext.ResolveStyleContextFor(mContent, aParent);
aContinuingFrame->SetStyleContext(&aPresContext,styleContext);
NS_RELEASE(styleContext);
return rv;

2
layout/base/src/nsSplittableFrame.h
View File

@ -28,7 +28,7 @@ public:
// CreateContinuingFrame() does the default behavior of using the
// content delegate to create a new frame
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

4
layout/css/layout/src/nsCSSBlockFrame.cpp
View File

@ -113,7 +113,7 @@ public:
NS_IMETHOD PrevChild(const nsIFrame* aChild, nsIFrame*& aPrevChild) const;
NS_IMETHOD LastChild(nsIFrame*& aLastChild) const;
NS_IMETHOD IsSplittable(nsSplittableType& aIsSplittable) const;
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);
@ -938,7 +938,7 @@ nsCSSBlockFrame::IsSplittable(nsSplittableType& aIsSplittable) const
}
NS_IMETHODIMP
nsCSSBlockFrame::CreateContinuingFrame(nsIPresContext* aCX,
nsCSSBlockFrame::CreateContinuingFrame(nsIPresContext& aCX,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/css/layout/src/nsCSSInlineFrame.cpp
View File

@ -143,7 +143,7 @@ nsCSSInlineFrame::GetSkipSides() const
}
NS_IMETHODIMP
nsCSSInlineFrame::CreateContinuingFrame(nsIPresContext* aCX,
nsCSSInlineFrame::CreateContinuingFrame(nsIPresContext& aCX,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/css/layout/src/nsCSSInlineFrame.h
View File

@ -62,7 +62,7 @@ public:
NS_IMETHOD QueryInterface(REFNSIID aIID, void** aInstancePtr);
// nsIFrame
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aCX,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aCX,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

2
layout/css/layout/src/nsCSSInlineLayout.cpp
View File

@ -430,7 +430,7 @@ nsCSSInlineLayout::MaybeCreateNextInFlow(nsIFrame* aFrame,
aFrame->GetNextSibling(nextFrame);
nsIStyleContext* kidSC;
aFrame->GetStyleContext(mLineLayout.mPresContext, kidSC);
aFrame->CreateContinuingFrame(mLineLayout.mPresContext, mContainerFrame,
aFrame->CreateContinuingFrame(*mLineLayout.mPresContext, mContainerFrame,
kidSC, nextInFlow);
NS_RELEASE(kidSC);
if (nsnull == nextInFlow) {

2
layout/generic/nsIFrame.h
View File

@ -537,7 +537,7 @@ public:
* Flow member functions. CreateContinuingFrame() is responsible for
* appending the continuing frame to the flow.
*/
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame) = 0;

4
layout/generic/nsPageFrame.cpp
View File

@ -122,7 +122,7 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext,
// Create a continuing child of the previous page's last child
nsIStyleContext* kidSC;
prevLastChild->GetStyleContext(&aPresContext, kidSC);
nsresult rv = prevLastChild->CreateContinuingFrame(&aPresContext, this,
nsresult rv = prevLastChild->CreateContinuingFrame(aPresContext, this,
kidSC, mFirstChild);
NS_RELEASE(kidSC);
@ -178,7 +178,7 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext,
}
NS_METHOD
nsPageFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsPageFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/generic/nsPageFrame.h
View File

@ -30,7 +30,7 @@ public:
const nsReflowState& aMaxSize,
nsReflowStatus& aStatus);
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aCX,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aCX,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

4
layout/html/base/src/nsBodyFrame.cpp
View File

@ -266,7 +266,7 @@ NS_METHOD nsBodyFrame::ContentDeleted(nsIPresShell* aShell,
}
NS_METHOD
nsBodyFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsBodyFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)
@ -301,7 +301,7 @@ void nsBodyFrame::CreateColumnFrame(nsIPresContext* aPresContext)
NS_ASSERTION(prevBody->ChildIsPseudoFrame(prevColumn),
"bad previous column");
prevColumn->CreateContinuingFrame(aPresContext, this, styleContext,
prevColumn->CreateContinuingFrame(*aPresContext, this, styleContext,
mFirstChild);
mChildCount = 1;
}

2
layout/html/base/src/nsBodyFrame.h
View File

@ -60,7 +60,7 @@ public:
nsIContent* aChild,
PRInt32 aIndexInParent);
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

2
layout/html/base/src/nsHTMLBase.cpp
View File

@ -187,7 +187,7 @@ nsHTMLBase::CreateFrame(nsIPresContext* aPresContext,
} else {
// Since kid has a prev-in-flow, use that to create the next
// frame.
rv = aKidPrevInFlow->CreateContinuingFrame(aPresContext, aParentFrame,
rv = aKidPrevInFlow->CreateContinuingFrame(*aPresContext, aParentFrame,
kidSC, kidFrame);
}

4
layout/html/base/src/nsPageFrame.cpp
View File

@ -122,7 +122,7 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext,
// Create a continuing child of the previous page's last child
nsIStyleContext* kidSC;
prevLastChild->GetStyleContext(&aPresContext, kidSC);
nsresult rv = prevLastChild->CreateContinuingFrame(&aPresContext, this,
nsresult rv = prevLastChild->CreateContinuingFrame(aPresContext, this,
kidSC, mFirstChild);
NS_RELEASE(kidSC);
@ -178,7 +178,7 @@ NS_METHOD nsPageFrame::Reflow(nsIPresContext& aPresContext,
}
NS_METHOD
nsPageFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsPageFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/html/base/src/nsPageFrame.h
View File

@ -30,7 +30,7 @@ public:
const nsReflowState& aMaxSize,
nsReflowStatus& aStatus);
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aCX,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aCX,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

2
layout/html/base/src/nsRootPart.cpp
View File

@ -399,7 +399,7 @@ NS_METHOD RootContentFrame::Reflow(nsIPresContext& aPresContext,
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(&aPresContext, kidSC);
nsIFrame* continuingPage;
nsresult rv = kidFrame->CreateContinuingFrame(&aPresContext, this,
nsresult rv = kidFrame->CreateContinuingFrame(aPresContext, this,
kidSC, continuingPage);
NS_RELEASE(kidSC);
reflowReason = eReflowReason_Initial;

2
layout/html/base/src/nsScrollFrame.cpp
View File

@ -195,7 +195,7 @@ nsScrollBodyFrame::Reflow(nsIPresContext& aPresContext,
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(&aPresContext, kidSC);
nsIFrame* continuingPage;
nsresult rv = kidFrame->CreateContinuingFrame(&aPresContext, this,
nsresult rv = kidFrame->CreateContinuingFrame(aPresContext, this,
kidSC, continuingPage);
NS_RELEASE(kidSC);

4
layout/html/table/src/nsTableCellFrame.cpp
View File

@ -181,7 +181,7 @@ void nsTableCellFrame::CreatePsuedoFrame(nsIPresContext* aPresContext)
// Create a continuing column
nsIStyleContext* kidSC;
prevPseudoFrame->GetStyleContext(aPresContext, kidSC);
prevPseudoFrame->CreateContinuingFrame(aPresContext, this, kidSC, mFirstChild);
prevPseudoFrame->CreateContinuingFrame(*aPresContext, this, kidSC, mFirstChild);
NS_RELEASE(kidSC);
mChildCount = 1;
}
@ -390,7 +390,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext& aPresContext,
}
NS_METHOD
nsTableCellFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableCellFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/html/table/src/nsTableCellFrame.h
View File

@ -62,7 +62,7 @@ public:
/**
* @see nsContainerFrame
*/
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

14
layout/html/table/src/nsTableFrame.cpp
View File

@ -1758,7 +1758,7 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext,
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(aPresContext, kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC, continuingFrame);
kidFrame->CreateContinuingFrame(*aPresContext, this, kidSC, continuingFrame);
NS_RELEASE(kidSC);
NS_ASSERTION(nsnull != continuingFrame, "frame creation failed");
@ -2005,7 +2005,7 @@ PRBool nsTableFrame::PullUpChildren(nsIPresContext* aPresContext,
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(aPresContext, kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC, continuingFrame);
kidFrame->CreateContinuingFrame(*aPresContext, this, kidSC, continuingFrame);
NS_RELEASE(kidSC);
NS_ASSERTION(nsnull != continuingFrame, "frame creation failed");
@ -2138,7 +2138,7 @@ nsTableFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext,
kidStyleContext, kidFrame);
NS_RELEASE(kidDel);
} else {
kidPrevInFlow->CreateContinuingFrame(aPresContext, this, kidStyleContext,
kidPrevInFlow->CreateContinuingFrame(*aPresContext, this, kidStyleContext,
kidFrame);
}
@ -2570,7 +2570,7 @@ PRBool nsTableFrame::IsFirstPassValid() const
}
NS_METHOD
nsTableFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)
@ -2606,11 +2606,11 @@ nsTableFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
printf("found a head or foot in continuing frame\n");
// Resolve style for the child
nsIStyleContext* kidStyleContext =
aPresContext->ResolveStyleContextFor(content, cf); // kidStyleContext: REFCNT++
aPresContext.ResolveStyleContextFor(content, cf); // kidStyleContext: REFCNT++
nsIContentDelegate* kidDel = nsnull;
kidDel = content->GetDelegate(aPresContext); // kidDel: REFCNT++
kidDel = content->GetDelegate(&aPresContext); // kidDel: REFCNT++
nsIFrame* duplicateFrame;
nsresult rv = kidDel->CreateFrame(aPresContext, content, cf,
nsresult rv = kidDel->CreateFrame(&aPresContext, content, cf,
kidStyleContext, duplicateFrame);
NS_RELEASE(kidDel); // kidDel: REFCNT--
NS_RELEASE(kidStyleContext); // kidStyleContenxt: REFCNT--

2
layout/html/table/src/nsTableFrame.h
View File

@ -110,7 +110,7 @@ public:
nsReflowStatus& aStatus);
/** @see nsContainerFrame::CreateContinuingFrame */
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

8
layout/html/table/src/nsTableOuterFrame.cpp
View File

@ -655,7 +655,7 @@ nsresult nsTableOuterFrame::CreateChildFrames(nsIPresContext* aPresContext)
}
NS_METHOD
nsTableOuterFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableOuterFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)
@ -672,7 +672,7 @@ nsTableOuterFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
}
void
nsTableOuterFrame::PrepareContinuingFrame(nsIPresContext* aPresContext,
nsTableOuterFrame::PrepareContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsTableOuterFrame* aContFrame)
@ -696,7 +696,7 @@ nsTableOuterFrame::PrepareContinuingFrame(nsIPresContext* aPresContext,
aContFrame->SetFirstContentOffset(nextOffset);
aContFrame->SetLastContentOffset(nextOffset);
aContFrame->SetLastContentIsComplete(PR_TRUE);
aContFrame->SetStyleContext(aPresContext, aStyleContext);
aContFrame->SetStyleContext(&aPresContext, aStyleContext);
}
NS_METHOD nsTableOuterFrame::VerifyTree() const
@ -837,7 +837,7 @@ nsresult nsTableOuterFrame::CreateInnerTableFrame(nsIPresContext* aPresContext,
nsIStyleContextPtr kidSC;
prevInnerTable->GetStyleContext(aPresContext, kidSC.AssignRef());
prevInnerTable->CreateContinuingFrame(aPresContext, this, kidSC,
prevInnerTable->CreateContinuingFrame(*aPresContext, this, kidSC,
(nsIFrame*&)aTableFrame);
if (nsnull == aTableFrame) {
return NS_ERROR_OUT_OF_MEMORY;

4
layout/html/table/src/nsTableOuterFrame.h
View File

@ -60,7 +60,7 @@ public:
nsReflowStatus& aStatus);
/** @see nsContainerFrame */
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);
@ -98,7 +98,7 @@ protected:
/** overridden here to handle special caption-table relationship
* @see nsContainerFrame::PrepareContinuingFrame
*/
void PrepareContinuingFrame(nsIPresContext* aPresContext,
void PrepareContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsTableOuterFrame* aContFrame);

2
layout/html/table/src/nsTableRowFrame.cpp
View File

@ -864,7 +864,7 @@ nsTableRowFrame::Reflow(nsIPresContext& aPresContext,
}
NS_METHOD
nsTableRowFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableRowFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/html/table/src/nsTableRowFrame.h
View File

@ -87,7 +87,7 @@ public:
nsDidReflowStatus aStatus);
/** @see nsContainerFrame::CreateContinuingFrame */
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

8
layout/html/table/src/nsTableRowGroupFrame.cpp
View File

@ -367,7 +367,7 @@ if (gsDebug) printf("\n\nREFLOWMAPPED FOR ROW GROUP FRAME\n");
nsIFrame* continuingFrame;
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(aPresContext, kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC,
kidFrame->CreateContinuingFrame(*aPresContext, this, kidSC,
continuingFrame);
NS_RELEASE(kidSC);
@ -607,7 +607,7 @@ PRBool nsTableRowGroupFrame::PullUpChildren(nsIPresContext* aPresContext,
nsIFrame* continuingFrame;
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(aPresContext, kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC,
kidFrame->CreateContinuingFrame(*aPresContext, this, kidSC,
continuingFrame);
NS_RELEASE(kidSC);
NS_ASSERTION(nsnull != continuingFrame, "frame creation failed");
@ -768,7 +768,7 @@ nsTableRowGroupFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext,
kidFrame);
NS_RELEASE(kidDel);
} else {
kidPrevInFlow->CreateContinuingFrame(aPresContext, this, kidSC,
kidPrevInFlow->CreateContinuingFrame(*aPresContext, this, kidSC,
kidFrame);
}
@ -1169,7 +1169,7 @@ nsTableRowGroupFrame::Reflow(nsIPresContext& aPresContext,
}
NS_METHOD
nsTableRowGroupFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableRowGroupFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/html/table/src/nsTableRowGroupFrame.h
View File

@ -77,7 +77,7 @@ public:
nsReflowStatus& aStatus);
/** @see nsContainerFrame::CreateContinuingFrame */
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

4
layout/tables/nsTableCellFrame.cpp
View File

@ -181,7 +181,7 @@ void nsTableCellFrame::CreatePsuedoFrame(nsIPresContext* aPresContext)
// Create a continuing column
nsIStyleContext* kidSC;
prevPseudoFrame->GetStyleContext(aPresContext, kidSC);
prevPseudoFrame->CreateContinuingFrame(aPresContext, this, kidSC, mFirstChild);
prevPseudoFrame->CreateContinuingFrame(*aPresContext, this, kidSC, mFirstChild);
NS_RELEASE(kidSC);
mChildCount = 1;
}
@ -390,7 +390,7 @@ NS_METHOD nsTableCellFrame::Reflow(nsIPresContext& aPresContext,
}
NS_METHOD
nsTableCellFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableCellFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/tables/nsTableCellFrame.h
View File

@ -62,7 +62,7 @@ public:
/**
* @see nsContainerFrame
*/
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

14
layout/tables/nsTableFrame.cpp
View File

@ -1758,7 +1758,7 @@ PRBool nsTableFrame::ReflowMappedChildren( nsIPresContext* aPresContext,
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(aPresContext, kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC, continuingFrame);
kidFrame->CreateContinuingFrame(*aPresContext, this, kidSC, continuingFrame);
NS_RELEASE(kidSC);
NS_ASSERTION(nsnull != continuingFrame, "frame creation failed");
@ -2005,7 +2005,7 @@ PRBool nsTableFrame::PullUpChildren(nsIPresContext* aPresContext,
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(aPresContext, kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC, continuingFrame);
kidFrame->CreateContinuingFrame(*aPresContext, this, kidSC, continuingFrame);
NS_RELEASE(kidSC);
NS_ASSERTION(nsnull != continuingFrame, "frame creation failed");
@ -2138,7 +2138,7 @@ nsTableFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext,
kidStyleContext, kidFrame);
NS_RELEASE(kidDel);
} else {
kidPrevInFlow->CreateContinuingFrame(aPresContext, this, kidStyleContext,
kidPrevInFlow->CreateContinuingFrame(*aPresContext, this, kidStyleContext,
kidFrame);
}
@ -2570,7 +2570,7 @@ PRBool nsTableFrame::IsFirstPassValid() const
}
NS_METHOD
nsTableFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)
@ -2606,11 +2606,11 @@ nsTableFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
printf("found a head or foot in continuing frame\n");
// Resolve style for the child
nsIStyleContext* kidStyleContext =
aPresContext->ResolveStyleContextFor(content, cf); // kidStyleContext: REFCNT++
aPresContext.ResolveStyleContextFor(content, cf); // kidStyleContext: REFCNT++
nsIContentDelegate* kidDel = nsnull;
kidDel = content->GetDelegate(aPresContext); // kidDel: REFCNT++
kidDel = content->GetDelegate(&aPresContext); // kidDel: REFCNT++
nsIFrame* duplicateFrame;
nsresult rv = kidDel->CreateFrame(aPresContext, content, cf,
nsresult rv = kidDel->CreateFrame(&aPresContext, content, cf,
kidStyleContext, duplicateFrame);
NS_RELEASE(kidDel); // kidDel: REFCNT--
NS_RELEASE(kidStyleContext); // kidStyleContenxt: REFCNT--

2
layout/tables/nsTableFrame.h
View File

@ -110,7 +110,7 @@ public:
nsReflowStatus& aStatus);
/** @see nsContainerFrame::CreateContinuingFrame */
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

8
layout/tables/nsTableOuterFrame.cpp
View File

@ -655,7 +655,7 @@ nsresult nsTableOuterFrame::CreateChildFrames(nsIPresContext* aPresContext)
}
NS_METHOD
nsTableOuterFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableOuterFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)
@ -672,7 +672,7 @@ nsTableOuterFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
}
void
nsTableOuterFrame::PrepareContinuingFrame(nsIPresContext* aPresContext,
nsTableOuterFrame::PrepareContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsTableOuterFrame* aContFrame)
@ -696,7 +696,7 @@ nsTableOuterFrame::PrepareContinuingFrame(nsIPresContext* aPresContext,
aContFrame->SetFirstContentOffset(nextOffset);
aContFrame->SetLastContentOffset(nextOffset);
aContFrame->SetLastContentIsComplete(PR_TRUE);
aContFrame->SetStyleContext(aPresContext, aStyleContext);
aContFrame->SetStyleContext(&aPresContext, aStyleContext);
}
NS_METHOD nsTableOuterFrame::VerifyTree() const
@ -837,7 +837,7 @@ nsresult nsTableOuterFrame::CreateInnerTableFrame(nsIPresContext* aPresContext,
nsIStyleContextPtr kidSC;
prevInnerTable->GetStyleContext(aPresContext, kidSC.AssignRef());
prevInnerTable->CreateContinuingFrame(aPresContext, this, kidSC,
prevInnerTable->CreateContinuingFrame(*aPresContext, this, kidSC,
(nsIFrame*&)aTableFrame);
if (nsnull == aTableFrame) {
return NS_ERROR_OUT_OF_MEMORY;

4
layout/tables/nsTableOuterFrame.h
View File

@ -60,7 +60,7 @@ public:
nsReflowStatus& aStatus);
/** @see nsContainerFrame */
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);
@ -98,7 +98,7 @@ protected:
/** overridden here to handle special caption-table relationship
* @see nsContainerFrame::PrepareContinuingFrame
*/
void PrepareContinuingFrame(nsIPresContext* aPresContext,
void PrepareContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsTableOuterFrame* aContFrame);

2
layout/tables/nsTableRowFrame.cpp
View File

@ -864,7 +864,7 @@ nsTableRowFrame::Reflow(nsIPresContext& aPresContext,
}
NS_METHOD
nsTableRowFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableRowFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/tables/nsTableRowFrame.h
View File

@ -87,7 +87,7 @@ public:
nsDidReflowStatus aStatus);
/** @see nsContainerFrame::CreateContinuingFrame */
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);

8
layout/tables/nsTableRowGroupFrame.cpp
View File

@ -367,7 +367,7 @@ if (gsDebug) printf("\n\nREFLOWMAPPED FOR ROW GROUP FRAME\n");
nsIFrame* continuingFrame;
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(aPresContext, kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC,
kidFrame->CreateContinuingFrame(*aPresContext, this, kidSC,
continuingFrame);
NS_RELEASE(kidSC);
@ -607,7 +607,7 @@ PRBool nsTableRowGroupFrame::PullUpChildren(nsIPresContext* aPresContext,
nsIFrame* continuingFrame;
nsIStyleContext* kidSC;
kidFrame->GetStyleContext(aPresContext, kidSC);
kidFrame->CreateContinuingFrame(aPresContext, this, kidSC,
kidFrame->CreateContinuingFrame(*aPresContext, this, kidSC,
continuingFrame);
NS_RELEASE(kidSC);
NS_ASSERTION(nsnull != continuingFrame, "frame creation failed");
@ -768,7 +768,7 @@ nsTableRowGroupFrame::ReflowUnmappedChildren(nsIPresContext* aPresContext,
kidFrame);
NS_RELEASE(kidDel);
} else {
kidPrevInFlow->CreateContinuingFrame(aPresContext, this, kidSC,
kidPrevInFlow->CreateContinuingFrame(*aPresContext, this, kidSC,
kidFrame);
}
@ -1169,7 +1169,7 @@ nsTableRowGroupFrame::Reflow(nsIPresContext& aPresContext,
}
NS_METHOD
nsTableRowGroupFrame::CreateContinuingFrame(nsIPresContext* aPresContext,
nsTableRowGroupFrame::CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame)

2
layout/tables/nsTableRowGroupFrame.h
View File

@ -77,7 +77,7 @@ public:
nsReflowStatus& aStatus);
/** @see nsContainerFrame::CreateContinuingFrame */
NS_IMETHOD CreateContinuingFrame(nsIPresContext* aPresContext,
NS_IMETHOD CreateContinuingFrame(nsIPresContext& aPresContext,
nsIFrame* aParent,
nsIStyleContext* aStyleContext,
nsIFrame*& aContinuingFrame);