зеркало из https://github.com/mozilla/gecko-dev.git
Fix some missed renames from bug 471356. r+sr=bzbarsky
This commit is contained in:
Родитель
cb0f0635d9
Коммит
4872871d0b
|
@ -10510,10 +10510,10 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext,
|
|||
nsHTMLContainerFrame::CreateViewForFrame(newFrame, nsnull, PR_FALSE);
|
||||
|
||||
// Create a continuing area frame
|
||||
nsIFrame* continuingAreaFrame;
|
||||
nsIFrame* continuingBlockFrame;
|
||||
nsIFrame* blockFrame = aFrame->GetFirstChild(nsnull);
|
||||
rv = CreateContinuingFrame(aPresContext, blockFrame, newFrame,
|
||||
&continuingAreaFrame);
|
||||
&continuingBlockFrame);
|
||||
if (NS_FAILED(rv)) {
|
||||
newFrame->Destroy();
|
||||
*aContinuingFrame = nsnull;
|
||||
|
@ -10521,7 +10521,7 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext,
|
|||
}
|
||||
|
||||
// Set the table cell's initial child list
|
||||
newFrame->SetInitialChildList(nsnull, continuingAreaFrame);
|
||||
newFrame->SetInitialChildList(nsnull, continuingBlockFrame);
|
||||
}
|
||||
|
||||
} else if (nsGkAtoms::lineFrame == frameType) {
|
||||
|
@ -10582,17 +10582,17 @@ nsCSSFrameConstructor::CreateContinuingFrame(nsPresContext* aPresContext,
|
|||
|
||||
// Create a continuing area frame
|
||||
// XXXbz we really shouldn't have to do this by hand!
|
||||
nsIFrame* continuingAreaFrame;
|
||||
nsIFrame* continuingBlockFrame;
|
||||
nsIFrame* blockFrame = GetFieldSetBlockFrame(aFrame);
|
||||
rv = CreateContinuingFrame(aPresContext, blockFrame, newFrame,
|
||||
&continuingAreaFrame);
|
||||
&continuingBlockFrame);
|
||||
if (NS_FAILED(rv)) {
|
||||
newFrame->Destroy();
|
||||
*aContinuingFrame = nsnull;
|
||||
return rv;
|
||||
}
|
||||
// Set the fieldset's initial child list
|
||||
newFrame->SetInitialChildList(nsnull, continuingAreaFrame);
|
||||
newFrame->SetInitialChildList(nsnull, continuingBlockFrame);
|
||||
}
|
||||
} else {
|
||||
NS_NOTREACHED("unexpected frame type");
|
||||
|
|
|
@ -420,7 +420,7 @@ NS_IMETHODIMP nsFileControlFrame::Reflow(nsPresContext* aPresContext,
|
|||
}
|
||||
}
|
||||
|
||||
// The Areaframe takes care of all our reflow
|
||||
// nsBlockFrame takes care of all our reflow
|
||||
return nsBlockFrame::Reflow(aPresContext, aDesiredSize, aReflowState,
|
||||
aStatus);
|
||||
}
|
||||
|
|
|
@ -6389,7 +6389,7 @@ nsBlockFrame::Init(nsIContent* aContent,
|
|||
nsIFrame* aPrevInFlow)
|
||||
{
|
||||
if (aPrevInFlow) {
|
||||
// Copy over the block/area frame type flags
|
||||
// Copy over the block frame type flags
|
||||
nsBlockFrame* blockFrame = (nsBlockFrame*)aPrevInFlow;
|
||||
|
||||
SetFlags(blockFrame->mState &
|
||||
|
|
|
@ -100,7 +100,6 @@ NS_NewAttributeContent(nsNodeInfoManager *aNodeInfoManager,
|
|||
nsIFrame*
|
||||
NS_NewSelectsAreaFrame(nsIPresShell* aPresShell, nsStyleContext* aContext, PRUint32 aFlags);
|
||||
|
||||
// These AreaFrame's shrink wrap around their contents
|
||||
inline nsIFrame*
|
||||
NS_NewTableCellInnerFrame(nsIPresShell* aPresShell, nsStyleContext* aContext) {
|
||||
return NS_NewBlockFrame(aPresShell, aContext);
|
||||
|
|
|
@ -1415,7 +1415,7 @@ GetVerticalMarginBorderPadding(const nsHTMLReflowState* aReflowState)
|
|||
* until it finds the canvas frame, or it encounters a frame that is not a block,
|
||||
* area, or scroll frame. This handles compatibility with IE (see bug 85016 and bug 219693)
|
||||
*
|
||||
* When we encounter scrolledContent area frames, we skip over them, since they are guaranteed to not be useful for computing the containing block.
|
||||
* When we encounter scrolledContent block frames, we skip over them, since they are guaranteed to not be useful for computing the containing block.
|
||||
*
|
||||
* See also IsQuirkContainingBlockHeight.
|
||||
*/
|
||||
|
@ -1434,7 +1434,7 @@ CalcQuirkContainingBlockHeight(const nsHTMLReflowState* aCBReflowState)
|
|||
for (; rs; rs = (nsHTMLReflowState *)(rs->parentReflowState)) {
|
||||
nsIAtom* frameType = rs->frame->GetType();
|
||||
// if the ancestor is auto height then skip it and continue up if it
|
||||
// is the first block/area frame and possibly the body/html
|
||||
// is the first block frame and possibly the body/html
|
||||
if (nsGkAtoms::blockFrame == frameType ||
|
||||
#ifdef MOZ_XUL
|
||||
nsGkAtoms::XULLabelFrame == frameType ||
|
||||
|
|
|
@ -95,7 +95,7 @@ public:
|
|||
/** @see nsIFrame::DidSetStyleContext */
|
||||
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext);
|
||||
|
||||
// table cells contain an area frame which does most of the work, and
|
||||
// table cells contain a block frame which does most of the work, and
|
||||
// so these functions should never be called. They assert and return
|
||||
// NS_ERROR_NOT_IMPLEMENTED
|
||||
NS_IMETHOD AppendFrames(nsIAtom* aListName,
|
||||
|
|
Загрузка…
Ссылка в новой задаче