From f828451e5f9b4fe63545485dcb97f7e3e4a425b2 Mon Sep 17 00:00:00 2001 From: Moonchild Date: Mon, 1 Jun 2020 14:16:06 +0200 Subject: Issue #1525 - Kill marquee element * Remove marquee code * Regenerate HTML Elements/parser code for Removal of Marquee. Co-authored-by: Gaming4JC --- dom/html/HTMLDivElement.cpp | 34 ---------------------------------- 1 file changed, 34 deletions(-) (limited to 'dom/html/HTMLDivElement.cpp') diff --git a/dom/html/HTMLDivElement.cpp b/dom/html/HTMLDivElement.cpp index b56187e29..d5b587241 100644 --- a/dom/html/HTMLDivElement.cpp +++ b/dom/html/HTMLDivElement.cpp @@ -34,20 +34,6 @@ HTMLDivElement::ParseAttribute(int32_t aNamespaceID, nsAttrValue& aResult) { if (aNamespaceID == kNameSpaceID_None) { - if (mNodeInfo->Equals(nsGkAtoms::marquee)) { - if ((aAttribute == nsGkAtoms::width) || - (aAttribute == nsGkAtoms::height)) { - return aResult.ParseSpecialIntValue(aValue); - } - if (aAttribute == nsGkAtoms::bgcolor) { - return aResult.ParseColor(aValue); - } - if ((aAttribute == nsGkAtoms::hspace) || - (aAttribute == nsGkAtoms::vspace)) { - return aResult.ParseIntWithBounds(aValue, 0); - } - } - if (mNodeInfo->Equals(nsGkAtoms::div) && aAttribute == nsGkAtoms::align) { return ParseDivAlignValue(aValue, aResult); @@ -66,15 +52,6 @@ HTMLDivElement::MapAttributesIntoRule(const nsMappedAttributes* aAttributes, nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData); } -static void -MapMarqueeAttributesIntoRule(const nsMappedAttributes* aAttributes, nsRuleData* aData) -{ - nsGenericHTMLElement::MapImageMarginAttributeInto(aAttributes, aData); - nsGenericHTMLElement::MapImageSizeAttributesInto(aAttributes, aData); - nsGenericHTMLElement::MapCommonAttributesInto(aAttributes, aData); - nsGenericHTMLElement::MapBGColorInto(aAttributes, aData); -} - NS_IMETHODIMP_(bool) HTMLDivElement::IsAttributeMapped(const nsIAtom* aAttribute) const { @@ -85,14 +62,6 @@ HTMLDivElement::IsAttributeMapped(const nsIAtom* aAttribute) const }; return FindAttributeDependence(aAttribute, map); } - if (mNodeInfo->Equals(nsGkAtoms::marquee)) { - static const MappedAttributeEntry* const map[] = { - sImageMarginSizeAttributeMap, - sBackgroundColorAttributeMap, - sCommonAttributeMap - }; - return FindAttributeDependence(aAttribute, map); - } return nsGenericHTMLElement::IsAttributeMapped(aAttribute); } @@ -103,9 +72,6 @@ HTMLDivElement::GetAttributeMappingFunction() const if (mNodeInfo->Equals(nsGkAtoms::div)) { return &MapAttributesIntoRule; } - if (mNodeInfo->Equals(nsGkAtoms::marquee)) { - return &MapMarqueeAttributesIntoRule; - } return nsGenericHTMLElement::GetAttributeMappingFunction(); } -- cgit v1.2.3