corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop using nsAreaFrame for anything other than xul:label, which is the only thing for which it does anything different from nsBlockFrame, and rename it accordingly. (Bug 471356) r+sr=roc

Browse Source
This commit is contained in:
L. David Baron
2008-12-29 10:07:38 -05:00
parent bb58a167e3
commit ad036e3dae
25 changed files with 145 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
layout/forms/nsFileControlFrame.cpp
View File

@@ -88,7 +88,7 @@ NS_NewFileControlFrame(nsIPresShell* aPresShell, nsStyleContext* aContext)
}
nsFileControlFrame::nsFileControlFrame(nsStyleContext* aContext):
nsAreaFrame(aContext),
nsBlockFrame(aContext),
mTextFrame(nsnull),
mCachedState(nsnull)
{
@@ -107,7 +107,7 @@ nsFileControlFrame::Init(nsIContent* aContent,
nsIFrame* aParent,
nsIFrame* aPrevInFlow)
{
nsresult rv = nsAreaFrame::Init(aContent, aParent, aPrevInFlow);
nsresult rv = nsBlockFrame::Init(aContent, aParent, aPrevInFlow);
NS_ENSURE_SUCCESS(rv, rv);
mMouseListener = new MouseListener(this);
@@ -143,7 +143,7 @@ nsFileControlFrame::Destroy()
}
mMouseListener->ForgetFrame();
nsAreaFrame::Destroy();
nsBlockFrame::Destroy();
}
nsresult
@@ -243,7 +243,7 @@ nsFileControlFrame::QueryInterface(const nsIID& aIID, void** aInstancePtr)
return NS_OK;
}
return nsAreaFrame::QueryInterface(aIID, aInstancePtr);
return nsBlockFrame::QueryInterface(aIID, aInstancePtr);
}
void
@@ -421,7 +421,7 @@ NS_IMETHODIMP nsFileControlFrame::Reflow(nsPresContext* aPresContext,
}
// The Areaframe takes care of all our reflow
return nsAreaFrame::Reflow(aPresContext, aDesiredSize, aReflowState,
return nsBlockFrame::Reflow(aPresContext, aDesiredSize, aReflowState,
aStatus);
}
@@ -430,7 +430,7 @@ NS_IMETHODIMP
nsFileControlFrame::SetInitialChildList(nsIAtom* aListName,
nsIFrame* aChildList)
{
nsAreaFrame::SetInitialChildList(aListName, aChildList);
nsBlockFrame::SetInitialChildList(aListName, aChildList);
// given that the CSS frame constructor created all our frames. We need to find the text field
// so we can get info from it.
@@ -514,7 +514,7 @@ nsFileControlFrame::AttributeChanged(PRInt32 aNameSpaceID,
}
}
return nsAreaFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType);
return nsBlockFrame::AttributeChanged(aNameSpaceID, aAttribute, aModType);
}
PRBool
@@ -578,7 +578,7 @@ nsFileControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
// styles in forms.css) -- doing it just makes us look ugly in some cases and
// has no effect in others.
nsDisplayListCollection tempList;
nsresult rv = nsAreaFrame::BuildDisplayList(aBuilder, aDirtyRect, tempList);
nsresult rv = nsBlockFrame::BuildDisplayList(aBuilder, aDirtyRect, tempList);
if (NS_FAILED(rv))
return rv;