Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 236476: Change GetHTMLAttribute to GetParsedAttr. Also fixes bug 232706 by removing final uses of nsHTMLValue.

Browse Source 
r=bz sr=jst


git-svn-id: svn://10.0.0.236/trunk@168269 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cvshook%sicking.cc
2005-01-25 00:02:58 +00:00
parent f0310c1ced
commit 12f074b44e
54 changed files with 407 additions and 1709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
mozilla/layout/forms/nsFormControlHelper.cpp
View File

@@ -132,18 +132,13 @@ nsresult nsFormControlHelper::GetFrameFontFM(nsIFrame* aFrame,
nsresult
nsFormControlHelper::GetWrapProperty(nsIContent * aContent, nsString &aOutValue)
{
aOutValue.SetLength(0);
nsresult result = NS_CONTENT_ATTR_NOT_THERE;
nsGenericHTMLElement *content = nsGenericHTMLElement::FromContent(aContent);
if (content) {
nsHTMLValue value;
result = content->GetHTMLAttribute(nsHTMLAtoms::wrap, value);
if (eHTMLUnit_String == value.GetUnit()) {
value.GetStringValue(aOutValue);
}
if (aContent->IsContentOfType(nsIContent::eHTML)) {
return aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::wrap, aOutValue);
}
return result;
aOutValue.Truncate();
return NS_CONTENT_ATTR_NOT_THERE;
}
@@ -340,17 +335,10 @@ nsresult
nsFormControlHelper::GetName(nsIContent* aContent, nsAString* aResult)
{
NS_PRECONDITION(aResult, "Null pointer bad!");
nsGenericHTMLElement *formControl =
nsGenericHTMLElement::FromContent(aContent);
if (!formControl)
if (!aContent->IsContentOfType(nsIContent::eHTML))
return NS_ERROR_FAILURE;
nsHTMLValue value;
nsresult rv = formControl->GetHTMLAttribute(nsHTMLAtoms::name, value);
if (NS_CONTENT_ATTR_HAS_VALUE == rv && eHTMLUnit_String == value.GetUnit()) {
value.GetStringValue(*aResult);
}
return rv;
return aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::name, *aResult);
}
PRInt32
@@ -369,17 +357,10 @@ nsresult
nsFormControlHelper::GetValueAttr(nsIContent* aContent, nsAString* aResult)
{
NS_PRECONDITION(aResult, "Null pointer bad!");
nsGenericHTMLElement *formControl =
nsGenericHTMLElement::FromContent(aContent);
if (!formControl)
if (!aContent->IsContentOfType(nsIContent::eHTML))
return NS_ERROR_FAILURE;
nsHTMLValue value;
nsresult rv = formControl->GetHTMLAttribute(nsHTMLAtoms::value, value);
if (NS_CONTENT_ATTR_HAS_VALUE == rv && eHTMLUnit_String == value.GetUnit()) {
value.GetStringValue(*aResult);
}
return rv;
return aContent->GetAttr(kNameSpaceID_None, nsHTMLAtoms::value, *aResult);
}
//----------------------------------------------------------------------------------