Bug 190735. DeCOMtaminate nsIFrame::GetFrameType. r+sr=bzbarsky

git-svn-id: svn://10.0.0.236/trunk@148665 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
uid502
2003-10-31 20:19:18 +00:00
parent ada82f9637
commit e56ed2443c
188 changed files with 1115 additions and 2182 deletions

View File

@@ -1314,19 +1314,16 @@ nsTextControlFrame::RemovedAsPrimaryFrame(nsIPresContext* aPresContext)
else NS_ASSERTION(PR_FALSE, "RemovedAsPrimaryFrame called after PreDestroy");
}
NS_IMETHODIMP
nsTextControlFrame::GetFrameType(nsIAtom** aType) const
nsIAtom*
nsTextControlFrame::GetType() const
{
NS_PRECONDITION(nsnull != aType, "null OUT parameter pointer");
*aType = nsLayoutAtoms::textInputFrame;
NS_ADDREF(*aType);
return NS_OK;
return nsLayoutAtoms::textInputFrame;
}
// XXX: wouldn't it be nice to get this from the style context!
PRBool nsTextControlFrame::IsSingleLineTextControl() const
{
PRInt32 type = GetType();
PRInt32 type = GetFormControlType();
return (type == NS_FORM_INPUT_TEXT) || (type == NS_FORM_INPUT_PASSWORD);
}
@@ -1353,7 +1350,7 @@ PRBool nsTextControlFrame::IsPlainTextControl() const
PRBool nsTextControlFrame::IsPasswordTextControl() const
{
return GetType() == NS_FORM_INPUT_PASSWORD;
return GetFormControlType() == NS_FORM_INPUT_PASSWORD;
}
@@ -2098,7 +2095,7 @@ nsTextControlFrame::GetName(nsAString* aResult)
}
NS_IMETHODIMP_(PRInt32)
nsTextControlFrame::GetType() const
nsTextControlFrame::GetFormControlType() const
{
return nsFormControlHelper::GetType(mContent);
}