From 8c6088955d862b94346aa9c256c8b40e002a995f Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 7 Feb 2013 09:08:57 +0100 Subject: [PATCH] Bug 835439 - Remove support for the table[layout] attribute; r=dbaron --- content/html/content/src/HTMLTableElement.cpp | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/content/html/content/src/HTMLTableElement.cpp b/content/html/content/src/HTMLTableElement.cpp index 72351fef510..dd99f736f84 100644 --- a/content/html/content/src/HTMLTableElement.cpp +++ b/content/html/content/src/HTMLTableElement.cpp @@ -901,12 +901,6 @@ static const nsAttrValue::EnumTable kRulesTable[] = { { 0 } }; -static const nsAttrValue::EnumTable kLayoutTable[] = { - { "auto", NS_STYLE_TABLE_LAYOUT_AUTO }, - { "fixed", NS_STYLE_TABLE_LAYOUT_FIXED }, - { 0 } -}; - bool HTMLTableElement::ParseAttribute(int32_t aNamespaceID, @@ -946,9 +940,6 @@ HTMLTableElement::ParseAttribute(int32_t aNamespaceID, if (aAttribute == nsGkAtoms::frame) { return aResult.ParseEnumValue(aValue, kFrameTable, false); } - if (aAttribute == nsGkAtoms::layout) { - return aResult.ParseEnumValue(aValue, kLayoutTable, false); - } if (aAttribute == nsGkAtoms::rules) { return aResult.ParseEnumValue(aValue, kRulesTable, false); } @@ -994,16 +985,6 @@ MapAttributesIntoRule(const nsMappedAttributes* aAttributes, SetFloatValue(float(value->GetIntegerValue()), eCSSUnit_Pixel); } } - if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Table)) { - const nsAttrValue* value; - // layout - nsCSSValue* tableLayout = aData->ValueForTableLayout(); - if (tableLayout->GetUnit() == eCSSUnit_Null) { - value = aAttributes->GetAttr(nsGkAtoms::layout); - if (value && value->Type() == nsAttrValue::eEnum) - tableLayout->SetIntValue(value->GetEnumValue(), eCSSUnit_Enumerated); - } - } if (aData->mSIDs & NS_STYLE_INHERIT_BIT(Margin)) { // align; Check for enumerated type (it may be another type if // illegal) @@ -1121,7 +1102,6 @@ NS_IMETHODIMP_(bool) HTMLTableElement::IsAttributeMapped(const nsIAtom* aAttribute) const { static const MappedAttributeEntry attributes[] = { - { &nsGkAtoms::layout }, { &nsGkAtoms::cellpadding }, { &nsGkAtoms::cellspacing }, { &nsGkAtoms::border },