Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 07:15:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unneeded null checks in attribute mapping functions. r+sr=bzbarsky b=127269

Browse Source
This commit is contained in:
dbaron%dbaron.org 2003-09-11 01:34:29 +00:00
parent 75158550b3
commit 2e673b5344
31 changed files with 132 additions and 286 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
content/html/content/src/nsGenericHTMLElement.cpp
View File

@ -3257,13 +3257,13 @@ nsGenericHTMLElement::MapImageAlignAttributeInto(const nsIHTMLMappedAttributes*
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated) {
PRUint8 align = (PRUint8)(value.GetIntValue());
if (aRuleData->mDisplayData && aRuleData->mDisplayData->mFloat.GetUnit() == eCSSUnit_Null) {
if (aRuleData->mSID == eStyleStruct_Display && aRuleData->mDisplayData->mFloat.GetUnit() == eCSSUnit_Null) {
if (align == NS_STYLE_TEXT_ALIGN_LEFT)
aRuleData->mDisplayData->mFloat.SetIntValue(NS_STYLE_FLOAT_LEFT, eCSSUnit_Enumerated);
else if (align == NS_STYLE_TEXT_ALIGN_RIGHT)
aRuleData->mDisplayData->mFloat.SetIntValue(NS_STYLE_FLOAT_RIGHT, eCSSUnit_Enumerated);
}
else if (aRuleData->mTextData && aRuleData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
else if (aRuleData->mSID == eStyleStruct_TextReset && aRuleData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
switch (align) {
case NS_STYLE_TEXT_ALIGN_LEFT:
case NS_STYLE_TEXT_ALIGN_RIGHT:
@ -3281,7 +3281,7 @@ void
nsGenericHTMLElement::MapDivAlignAttributeInto(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aRuleData)
{
if (aRuleData->mSID == eStyleStruct_Text && aRuleData->mTextData) {
if (aRuleData->mSID == eStyleStruct_Text) {
if (aRuleData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
@ -3297,7 +3297,7 @@ void
nsGenericHTMLElement::MapImageMarginAttributeInto(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (aData->mSID != eStyleStruct_Margin || !aData->mMarginData)
if (aData->mSID != eStyleStruct_Margin)
return;
nsHTMLValue value;
@ -3339,7 +3339,7 @@ void
nsGenericHTMLElement::MapImageSizeAttributesInto(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aAttributes || aData->mSID != eStyleStruct_Position || !aData->mPositionData)
if (aData->mSID != eStyleStruct_Position)
return;
nsHTMLValue value;
@ -3367,7 +3367,7 @@ void
nsGenericHTMLElement::MapImageBorderAttributeInto(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (aData->mSID != eStyleStruct_Border || !aData->mMarginData)
if (aData->mSID != eStyleStruct_Border)
return;
nsHTMLValue value;
@ -3417,7 +3417,7 @@ void
nsGenericHTMLElement::MapBackgroundAttributesInto(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData || !aData->mColorData || aData->mSID != eStyleStruct_Background)
if (aData->mSID != eStyleStruct_Background)
return;
if (aData->mColorData->mBackImage.GetUnit() == eCSSUnit_Null) {

3
content/html/content/src/nsHTMLAppletElement.cpp
View File

@ -216,9 +216,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData)
return;
nsGenericHTMLElement::MapImageBorderAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageMarginAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageSizeAttributesInto(aAttributes, aData);

3
content/html/content/src/nsHTMLBRElement.cpp
View File

@ -195,9 +195,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
if (aData->mSID == eStyleStruct_Display) {
if (aData->mDisplayData->mClear.GetUnit() == eCSSUnit_Null) {
nsHTMLValue value;

7
content/html/content/src/nsHTMLBodyElement.cpp
View File

@ -522,10 +522,7 @@ nsHTMLBodyElement::SetDocument(nsIDocument* aDocument, PRBool aDeep,
static
void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
if (aData->mDisplayData && aData->mSID == eStyleStruct_Display) {
if (aData->mSID == eStyleStruct_Display) {
// When display if first asked for, go ahead and get our colors set up.
nsHTMLValue value;
@ -564,7 +561,7 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat
}
}
if (aData->mColorData && aData->mSID == eStyleStruct_Color) {
if (aData->mSID == eStyleStruct_Color) {
if (aData->mColorData->mColor.GetUnit() == eCSSUnit_Null) {
// color: color
nsHTMLValue value;

50
content/html/content/src/nsHTMLDListElement.cpp
View File

@ -67,12 +67,6 @@ public:
// nsIDOMHTMLDListElement
NS_IMETHOD GetCompact(PRBool* aCompact);
NS_IMETHOD SetCompact(PRBool aCompact);
NS_IMETHOD StringToAttribute(nsIAtom* aAttribute,
const nsAString& aValue,
nsHTMLValue& aResult);
NS_IMETHOD_(PRBool) HasAttributeDependentStyle(const nsIAtom* aAttribute) const;
NS_IMETHOD GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const;
};
nsresult
@ -153,47 +147,3 @@ nsHTMLDListElement::CloneNode(PRBool aDeep, nsIDOMNode** aReturn)
NS_IMPL_BOOL_ATTR(nsHTMLDListElement, Compact, compact)
NS_IMETHODIMP
nsHTMLDListElement::StringToAttribute(nsIAtom* aAttribute,
const nsAString& aValue,
nsHTMLValue& aResult)
{
if (aAttribute == nsHTMLAtoms::compact) {
aResult.SetEmptyValue();
return NS_CONTENT_ATTR_NO_VALUE;
}
return NS_CONTENT_ATTR_NOT_THERE;
}
static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
}
NS_IMETHODIMP_(PRBool)
nsHTMLDListElement::HasAttributeDependentStyle(const nsIAtom* aAttribute) const
{
#if 0
static const AttributeDependenceEntry attributes[] = {
// { &nsHTMLAtoms::compact }, // handled by ua.css?
{ nsnull, NS_STYLE_HINT_NONE },
};
#endif
static const AttributeDependenceEntry* const map[] = {
// attributes,
sCommonAttributeMap
};
return FindAttributeDependence(aAttribute, map, NS_ARRAY_LENGTH(map));
}
NS_IMETHODIMP
nsHTMLDListElement::GetAttributeMappingFunction(nsMapRuleToAttributesFunc& aMapRuleFunc) const
{
aMapRuleFunc = &MapAttributesIntoRule;
return NS_OK;
}

5
content/html/content/src/nsHTMLDirectoryElement.cpp
View File

@ -199,10 +199,7 @@ nsHTMLDirectoryElement::AttributeToString(nsIAtom* aAttribute,
static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
if (aData->mListData) {
if (aData->mSID == eStyleStruct_List) {
if (aData->mListData->mType.GetUnit() == eCSSUnit_Null) {
nsHTMLValue value;
// type: enum

3
content/html/content/src/nsHTMLDivElement.cpp
View File

@ -208,9 +208,6 @@ nsHTMLDivElement::AttributeToString(nsIAtom* aAttribute,
static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
nsGenericHTMLElement::MapDivAlignAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
}

9
content/html/content/src/nsHTMLFontElement.cpp
View File

@ -227,10 +227,7 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData)
return;
if (aData->mFontData) {
if (aData->mSID == eStyleStruct_Font) {
nsRuleDataFont& font = *(aData->mFontData);
nsHTMLValue value;
@ -279,7 +276,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
font.mWeight.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}
else if (aData->mColorData && aData->mSID == eStyleStruct_Color) {
else if (aData->mSID == eStyleStruct_Color) {
if (aData->mColorData->mColor.GetUnit() == eCSSUnit_Null) {
// color: color
nsHTMLValue value;
@ -291,7 +288,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
}
}
}
else if (aData->mTextData && aData->mSID == eStyleStruct_TextReset) {
else if (aData->mSID == eStyleStruct_TextReset) {
// Make <a><font color="red">text</font></a> give the text a red underline
// in quirks mode. The NS_STYLE_TEXT_DECORATION_OVERRIDE_ALL flag only
// affects quirks mode rendering.

3
content/html/content/src/nsHTMLHRElement.cpp
View File

@ -227,9 +227,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
nsHTMLValue value;
PRBool noshade = PR_FALSE;

3
content/html/content/src/nsHTMLHeadingElement.cpp
View File

@ -190,9 +190,6 @@ nsHTMLHeadingElement::AttributeToString(nsIAtom* aAttribute,
static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
nsGenericHTMLElement::MapDivAlignAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
}

5
content/html/content/src/nsHTMLIFrameElement.cpp
View File

@ -438,10 +438,7 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
if (aData->mSID == eStyleStruct_Border && aData->mMarginData) {
if (aData->mSID == eStyleStruct_Border) {
// frameborder: 0 | 1 (| NO | YES in quirks mode)
// If frameborder is 0 or No, set border to 0
// else leave it as the value set in html.css

2
content/html/content/src/nsHTMLImageElement.cpp
View File

@ -547,8 +547,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
nsGenericHTMLElement::MapImageAlignAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageBorderAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageMarginAttributeInto(aAttributes, aData);

3
content/html/content/src/nsHTMLInputElement.cpp
View File

@ -1983,9 +1983,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData)
return;
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::type, value);
if (value.GetUnit() == eHTMLUnit_Enumerated &&

5
content/html/content/src/nsHTMLLIElement.cpp
View File

@ -218,10 +218,7 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
if (aData->mListData) {
if (aData->mSID == eStyleStruct_List) {
if (aData->mListData->mType.GetUnit() == eCSSUnit_Null) {
nsHTMLValue value;

5
content/html/content/src/nsHTMLMenuElement.cpp
View File

@ -199,10 +199,7 @@ nsHTMLMenuElement::AttributeToString(nsIAtom* aAttribute,
static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
if (aData->mListData) {
if (aData->mSID == eStyleStruct_List) {
if (aData->mListData->mType.GetUnit() == eCSSUnit_Null) {
nsHTMLValue value;
// type: enum

5
content/html/content/src/nsHTMLOListElement.cpp
View File

@ -235,10 +235,7 @@ nsHTMLOListElement::AttributeToString(nsIAtom* aAttribute,
static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
if (aData->mListData) {
if (aData->mSID == eStyleStruct_List) {
if (aData->mListData->mType.GetUnit() == eCSSUnit_Null) {
nsHTMLValue value;
// type: enum

3
content/html/content/src/nsHTMLObjectElement.cpp
View File

@ -284,9 +284,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData)
return;
nsGenericHTMLElement::MapImageAlignAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageBorderAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageMarginAttributeInto(aAttributes, aData);

3
content/html/content/src/nsHTMLParagraphElement.cpp
View File

@ -192,9 +192,6 @@ nsHTMLParagraphElement::AttributeToString(nsIAtom* aAttribute,
static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
nsGenericHTMLElement::MapDivAlignAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
}

24
content/html/content/src/nsHTMLPreElement.cpp
View File

@ -197,22 +197,16 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData)
return;
if (aData->mSID == eStyleStruct_Font) {
nsHTMLValue value;
if (aData->mFontData) {
nsRuleDataFont& font = *(aData->mFontData);
if (nsnull != aAttributes) {
nsHTMLValue value;
// variable: empty
aAttributes->GetAttribute(nsHTMLAtoms::variable, value);
if (value.GetUnit() == eHTMLUnit_Empty)
font.mFamily.SetStringValue(NS_LITERAL_STRING("serif"), eCSSUnit_String);
}
// variable: empty
aAttributes->GetAttribute(nsHTMLAtoms::variable, value);
if (value.GetUnit() == eHTMLUnit_Empty)
aData->mFontData->mFamily.SetStringValue(NS_LITERAL_STRING("serif"),
eCSSUnit_String);
}
else if (aData->mPositionData) {
else if (aData->mSID == eStyleStruct_Position) {
// cols: int (nav4 attribute)
nsHTMLValue value;
if (aData->mPositionData->mWidth.GetUnit() == eCSSUnit_Null) {
@ -226,7 +220,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
aData->mPositionData->mWidth.SetFloatValue((float)value.GetIntValue(), eCSSUnit_Char);
}
}
else if (aData->mTextData && aData->mSID == eStyleStruct_Text) {
else if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mWhiteSpace.GetUnit() == eCSSUnit_Null) {
nsHTMLValue value;
// wrap: empty

3
content/html/content/src/nsHTMLSelectElement.cpp
View File

@ -1865,9 +1865,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
nsGenericHTMLElement::MapImageAlignAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
}

10
content/html/content/src/nsHTMLSharedElement.cpp
View File

@ -296,13 +296,10 @@ static void
SpacerMapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
nsGenericHTMLElement::MapImageMarginAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageSizeAttributesInto(aAttributes, aData);
if (aData->mPositionData) {
if (aData->mSID == eStyleStruct_Position) {
nsHTMLValue value;
const nsStyleDisplay* display = aData->mStyleContext->GetStyleDisplay();
@ -344,13 +341,12 @@ SpacerMapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
eCSSUnit_Pixel);
}
}
} else if (aData->mDisplayData) {
} else if (aData->mSID == eStyleStruct_Display) {
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated) {
PRUint8 align = (PRUint8)(value.GetIntValue());
if (aData->mDisplayData &&
aData->mDisplayData->mFloat.GetUnit() == eCSSUnit_Null) {
if (aData->mDisplayData->mFloat.GetUnit() == eCSSUnit_Null) {
if (align == NS_STYLE_TEXT_ALIGN_LEFT)
aData->mDisplayData->mFloat.SetIntValue(NS_STYLE_FLOAT_LEFT,
eCSSUnit_Enumerated);

10
content/html/content/src/nsHTMLSharedLeafElement.cpp
View File

@ -296,13 +296,10 @@ static void
SpacerMapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
nsGenericHTMLElement::MapImageMarginAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageSizeAttributesInto(aAttributes, aData);
if (aData->mPositionData) {
if (aData->mSID == eStyleStruct_Position) {
nsHTMLValue value;
const nsStyleDisplay* display = aData->mStyleContext->GetStyleDisplay();
@ -344,13 +341,12 @@ SpacerMapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
eCSSUnit_Pixel);
}
}
} else if (aData->mDisplayData) {
} else if (aData->mSID == eStyleStruct_Display) {
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated) {
PRUint8 align = (PRUint8)(value.GetIntValue());
if (aData->mDisplayData &&
aData->mDisplayData->mFloat.GetUnit() == eCSSUnit_Null) {
if (aData->mDisplayData->mFloat.GetUnit() == eCSSUnit_Null) {
if (align == NS_STYLE_TEXT_ALIGN_LEFT)
aData->mDisplayData->mFloat.SetIntValue(NS_STYLE_FLOAT_LEFT,
eCSSUnit_Enumerated);

3
content/html/content/src/nsHTMLSharedObjectElement.cpp
View File

@ -284,9 +284,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aData)
return;
nsGenericHTMLElement::MapImageAlignAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageBorderAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapImageMarginAttributeInto(aAttributes, aData);

5
content/html/content/src/nsHTMLTableCaptionElement.cpp
View File

@ -197,10 +197,7 @@ nsHTMLTableCaptionElement::AttributeToString(nsIAtom* aAttribute,
static
void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
if (aData->mSID == eStyleStruct_TableBorder && aData->mTableData) {
if (aData->mSID == eStyleStruct_TableBorder) {
if (aData->mTableData->mCaptionSide.GetUnit() == eCSSUnit_Null) {
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);

84
content/html/content/src/nsHTMLTableCellElement.cpp
View File

@ -90,7 +90,7 @@ protected:
// This does not return a nsresult since all we care about is if we
// found the row element that this cell is in or not.
void GetRow(nsIDOMHTMLTableRowElement** aRow);
void GetTable(nsIContent** aTable);
nsIContent * GetTable();
PRInt32 mColIndex;
};
@ -202,10 +202,10 @@ nsHTMLTableCellElement::GetRow(nsIDOMHTMLTableRowElement** aRow)
}
// protected method
void
nsHTMLTableCellElement::GetTable(nsIContent** aTable)
nsIContent*
nsHTMLTableCellElement::GetTable()
{
*aTable = nsnull;
nsIContent *result = nsnull;
if (mParent) { // mParent should be a row
nsIContent* section = mParent->GetParent();
@ -214,13 +214,14 @@ nsHTMLTableCellElement::GetTable(nsIContent** aTable)
section->GetTag(getter_AddRefs(tag));
if (tag == nsHTMLAtoms::table) {
// XHTML, without a row group
NS_ADDREF(*aTable = section);
result = section;
} else {
// we have a row group.
NS_IF_ADDREF(*aTable = section->GetParent());
result = section->GetParent();
}
}
}
return result;
}
NS_IMETHODIMP
@ -267,6 +268,10 @@ nsHTMLTableCellElement::GetCellIndex(PRInt32* aCellIndex)
NS_IMETHODIMP
nsHTMLTableCellElement::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
{
nsresult rv =
nsGenericHTMLContainerElement::WalkContentStyleRules(aRuleWalker);
NS_ENSURE_SUCCESS(rv, rv);
// Add style information from the mapped attributes of the table
// element. This depends on the strange behavior of the
// |MapAttributesIntoRule| in nsHTMLTableElement.cpp, which is
@ -274,14 +279,12 @@ nsHTMLTableCellElement::WalkContentStyleRules(nsRuleWalker* aRuleWalker)
// contract. However, things are OK (except for the incorrect
// dependence on display type rather than tag) since tables and cells
// match different, less specific, rules.
nsCOMPtr<nsIContent> table;
GetTable(getter_AddRefs(table));
nsCOMPtr<nsIStyledContent> styledTable(do_QueryInterface(table));
nsCOMPtr<nsIStyledContent> styledTable = do_QueryInterface(GetTable());
if (styledTable) {
styledTable->WalkContentStyleRules(aRuleWalker);
rv = styledTable->WalkContentStyleRules(aRuleWalker);
}
return nsGenericHTMLContainerElement::WalkContentStyleRules(aRuleWalker);
return rv;
}
@ -444,10 +447,7 @@ static
void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
if (aData->mPositionData) {
if (aData->mSID == eStyleStruct_Position) {
// width: value
nsHTMLValue value;
if (aData->mPositionData->mWidth.GetUnit() == eCSSUnit_Null) {
@ -479,37 +479,35 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
}
}
}
else if (aData->mTextData) {
if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mTextAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
else if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mTextAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
if (aData->mTextData->mWhiteSpace.GetUnit() == eCSSUnit_Null) {
// nowrap: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::nowrap, value);
if (value.GetUnit() != eHTMLUnit_Null) {
// See if our width is not a pixel width.
nsHTMLValue widthValue;
aAttributes->GetAttribute(nsHTMLAtoms::width, widthValue);
if (widthValue.GetUnit() != eHTMLUnit_Pixel)
aData->mTextData->mWhiteSpace.SetIntValue(NS_STYLE_WHITESPACE_NOWRAP, eCSSUnit_Enumerated);
}
if (aData->mTextData->mWhiteSpace.GetUnit() == eCSSUnit_Null) {
// nowrap: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::nowrap, value);
if (value.GetUnit() != eHTMLUnit_Null) {
// See if our width is not a pixel width.
nsHTMLValue widthValue;
aAttributes->GetAttribute(nsHTMLAtoms::width, widthValue);
if (widthValue.GetUnit() != eHTMLUnit_Pixel)
aData->mTextData->mWhiteSpace.SetIntValue(NS_STYLE_WHITESPACE_NOWRAP, eCSSUnit_Enumerated);
}
}
else {
if (aData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
// valign: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::valign, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mVerticalAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}
else if (aData->mSID == eStyleStruct_TextReset) {
if (aData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
// valign: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::valign, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mVerticalAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}

42
content/html/content/src/nsHTMLTableColElement.cpp
View File

@ -247,10 +247,8 @@ nsHTMLTableColElement::AttributeToString(nsIAtom* aAttribute,
static
void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
if (aData->mPositionData && aData->mPositionData->mWidth.GetUnit() == eCSSUnit_Null) {
if (aData->mSID == eStyleStruct_Position &&
aData->mPositionData->mWidth.GetUnit() == eCSSUnit_Null) {
// width
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::width, value);
@ -273,24 +271,22 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat
}
}
}
else if (aData->mTextData) {
if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mTextAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
else if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mTextAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
else {
if (aData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
// valign: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::valign, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mVerticalAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}
else if (aData->mSID == eStyleStruct_TextReset) {
if (aData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
// valign: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::valign, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mVerticalAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}
@ -301,11 +297,7 @@ static
void ColMapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
if (aData->mSID == eStyleStruct_Table &&
aData->mTableData &&
aData->mTableData->mSpan.GetUnit() == eCSSUnit_Null) {
// span: int
nsHTMLValue value;

22
content/html/content/src/nsHTMLTableElement.cpp
View File

@ -1237,16 +1237,10 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
// which *element* it's matching (style rules should not stop matching
// when the display type is changed).
if (!aData)
return;
if (!aAttributes)
return;
nsCompatibility mode;
aData->mPresContext->GetCompatibilityMode(&mode);
if (aData->mSID == eStyleStruct_TableBorder && aData->mTableData) {
if (aData->mSID == eStyleStruct_TableBorder) {
const nsStyleDisplay* readDisplay = aData->mStyleContext->GetStyleDisplay();
if (readDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL) {
// cellspacing
@ -1267,8 +1261,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
}
}
}
if (aData->mSID == eStyleStruct_Table && aData->mTableData) {
else if (aData->mSID == eStyleStruct_Table) {
const nsStyleDisplay* readDisplay = aData->mStyleContext->GetStyleDisplay();
if (readDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL) {
MapTableBorderInto(aAttributes, aData, 0);
@ -1296,7 +1289,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
aData->mTableData->mRules.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}
else if (aData->mSID == eStyleStruct_Margin && aData->mMarginData) {
else if (aData->mSID == eStyleStruct_Margin) {
const nsStyleDisplay* readDisplay = aData->mStyleContext->GetStyleDisplay();
if (readDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL) {
@ -1342,7 +1335,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
}
}
}
else if (aData->mSID == eStyleStruct_Padding && aData->mMarginData) {
else if (aData->mSID == eStyleStruct_Padding) {
const nsStyleDisplay* readDisplay = aData->mStyleContext->GetStyleDisplay();
if (readDisplay->mDisplay == NS_STYLE_DISPLAY_TABLE_CELL) {
@ -1376,7 +1369,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
}
}
}
else if (aData->mPositionData) {
else if (aData->mSID == eStyleStruct_Position) {
const nsStyleDisplay* readDisplay = aData->mStyleContext->GetStyleDisplay();
if (readDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL) {
@ -1406,7 +1399,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
if (readDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL)
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
}
else if (aData->mSID == eStyleStruct_Border && aData->mMarginData) {
else if (aData->mSID == eStyleStruct_Border) {
if (!aData->mStyleContext) return;
const nsStyleTableBorder* tableStyle = aData->mStyleContext->GetStyleTableBorder();
const nsStyleDisplay* readDisplay = aData->mStyleContext->GetStyleDisplay();
@ -1489,8 +1482,7 @@ MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
MapTableBorderInto(aAttributes, aData, borderStyle);
}
}
if (aData->mSID == eStyleStruct_Background) {
else if (aData->mSID == eStyleStruct_Background) {
const nsStyleDisplay* readDisplay = aData->mStyleContext->GetStyleDisplay();
if (readDisplay->mDisplay != NS_STYLE_DISPLAY_TABLE_CELL)

37
content/html/content/src/nsHTMLTableRowElement.cpp
View File

@ -598,10 +598,7 @@ nsHTMLTableRowElement::AttributeToString(nsIAtom* aAttribute,
static
void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
if (aData->mPositionData) {
if (aData->mSID == eStyleStruct_Position) {
// height: value
nsHTMLValue value;
if (aData->mPositionData->mHeight.GetUnit() == eCSSUnit_Null) {
@ -612,24 +609,22 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat
aData->mPositionData->mHeight.SetPercentValue(value.GetPercentValue());
}
}
else if (aData->mTextData) {
if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mTextAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
else if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mTextAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
else {
if (aData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
// valign: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::valign, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mVerticalAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}
else if (aData->mSID == eStyleStruct_TextReset) {
if (aData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
// valign: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::valign, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mVerticalAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}

37
content/html/content/src/nsHTMLTableSectionElement.cpp
View File

@ -354,10 +354,7 @@ nsHTMLTableSectionElement::AttributeToString(nsIAtom* aAttribute,
static
void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
if (aData->mPositionData) {
if (aData->mSID == eStyleStruct_Position) {
// height: value
nsHTMLValue value;
if (aData->mPositionData->mHeight.GetUnit() == eCSSUnit_Null) {
@ -366,24 +363,22 @@ void MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleDat
aData->mPositionData->mHeight.SetFloatValue((float)value.GetPixelValue(), eCSSUnit_Pixel);
}
}
else if (aData->mTextData) {
if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mTextAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
else if (aData->mSID == eStyleStruct_Text) {
if (aData->mTextData->mTextAlign.GetUnit() == eCSSUnit_Null) {
// align: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::align, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mTextAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
else {
if (aData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
// valign: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::valign, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mVerticalAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}
else if (aData->mSID == eStyleStruct_TextReset) {
if (aData->mTextData->mVerticalAlign.GetUnit() == eCSSUnit_Null) {
// valign: enum
nsHTMLValue value;
aAttributes->GetAttribute(nsHTMLAtoms::valign, value);
if (value.GetUnit() == eHTMLUnit_Enumerated)
aData->mTextData->mVerticalAlign.SetIntValue(value.GetIntValue(), eCSSUnit_Enumerated);
}
}

3
content/html/content/src/nsHTMLTextAreaElement.cpp
View File

@ -622,9 +622,6 @@ static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes,
nsRuleData* aData)
{
if (!aAttributes || !aData)
return;
nsGenericHTMLElement::MapDivAlignAttributeInto(aAttributes, aData);
nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData);
}

5
content/html/content/src/nsHTMLUListElement.cpp
View File

@ -216,10 +216,7 @@ nsHTMLUListElement::AttributeToString(nsIAtom* aAttribute,
static void
MapAttributesIntoRule(const nsIHTMLMappedAttributes* aAttributes, nsRuleData* aData)
{
if (!aData || !aAttributes)
return;
if (aData->mListData) {
if (aData->mSID == eStyleStruct_List) {
if (aData->mListData->mType.GetUnit() == eCSSUnit_Null) {
nsHTMLValue value;
// type: enum