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

Implement StringToAttribute/AttributeToString/MapAttributesInto; fix up name of embedded object

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@9261 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
kipp%netscape.com
1998-09-03 22:21:32 +00:00
parent 8be3e5f2e2
commit 18a14d6bf5
119 changed files with 2862 additions and 1261 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/layout/html/content/src/nsHTMLHRElement.cpp
View File

@@ -73,7 +73,7 @@ public:
NS_IMPL_IHTMLCONTENT_USING_GENERIC(mInner)
protected:
nsHTMLGenericLeafContent mInner;
nsGenericHTMLLeafElement mInner;
};
nsresult
@@ -133,7 +133,7 @@ NS_IMPL_BOOL_ATTR(nsHTMLHRElement, NoShade, noshade, eSetAttrNotify_Render)
NS_IMPL_STRING_ATTR(nsHTMLHRElement, Size, size, eSetAttrNotify_Reflow)
NS_IMPL_STRING_ATTR(nsHTMLHRElement, Width, width, eSetAttrNotify_Reflow)
static nsHTMLGenericContent::EnumTable kAlignTable[] = {
static nsGenericHTMLElement::EnumTable kAlignTable[] = {
{ "left", NS_STYLE_TEXT_ALIGN_LEFT },
{ "right", NS_STYLE_TEXT_ALIGN_RIGHT },
{ "center", NS_STYLE_TEXT_ALIGN_CENTER },
@@ -146,12 +146,12 @@ nsHTMLHRElement::StringToAttribute(nsIAtom* aAttribute,
nsHTMLValue& aResult)
{
if (aAttribute == nsHTMLAtoms::width) {
nsHTMLGenericContent::ParseValueOrPercent(aValue, aResult,
nsGenericHTMLElement::ParseValueOrPercent(aValue, aResult,
eHTMLUnit_Pixel);
return NS_CONTENT_ATTR_HAS_VALUE;
}
else if (aAttribute == nsHTMLAtoms::size) {
nsHTMLGenericContent::ParseValue(aValue, 1, 100, aResult, eHTMLUnit_Pixel);
nsGenericHTMLElement::ParseValue(aValue, 1, 100, aResult, eHTMLUnit_Pixel);
return NS_CONTENT_ATTR_HAS_VALUE;
}
else if (aAttribute == nsHTMLAtoms::noshade) {
@@ -159,7 +159,7 @@ nsHTMLHRElement::StringToAttribute(nsIAtom* aAttribute,
return NS_CONTENT_ATTR_HAS_VALUE;
}
else if (aAttribute == nsHTMLAtoms::align) {
if (nsHTMLGenericContent::ParseEnumValue(aValue, kAlignTable, aResult)) {
if (nsGenericHTMLElement::ParseEnumValue(aValue, kAlignTable, aResult)) {
return NS_CONTENT_ATTR_HAS_VALUE;
}
}
@@ -173,7 +173,7 @@ nsHTMLHRElement::AttributeToString(nsIAtom* aAttribute,
{
if (aAttribute == nsHTMLAtoms::align) {
if (eHTMLUnit_Enumerated == aValue.GetUnit()) {
nsHTMLGenericContent::EnumValueToString(aValue, kAlignTable, aResult);
nsGenericHTMLElement::EnumValueToString(aValue, kAlignTable, aResult);
return NS_CONTENT_ATTR_HAS_VALUE;
}
}
@@ -207,7 +207,7 @@ nsHTMLHRElement::MapAttributesInto(nsIStyleContext* aContext,
pos->mWidth.SetPercentValue(value.GetPercentValue());
}
}
return NS_OK;
return mInner.MapAttributesInto(aContext, aPresContext);
}
NS_IMETHODIMP