summaryrefslogtreecommitdiffstats
path: root/dom/html
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-06-01 14:16:06 +0200
committerGitHub <noreply@github.com>2020-06-01 14:16:06 +0200
commitf828451e5f9b4fe63545485dcb97f7e3e4a425b2 (patch)
tree58385636b3b78fd021bf6a121a734e0b3cf84ee7 /dom/html
parent52c4750ab24a8d0a55b79fae3face1967aee35f6 (diff)
downloadUXP-f828451e5f9b4fe63545485dcb97f7e3e4a425b2.tar
UXP-f828451e5f9b4fe63545485dcb97f7e3e4a425b2.tar.gz
UXP-f828451e5f9b4fe63545485dcb97f7e3e4a425b2.tar.lz
UXP-f828451e5f9b4fe63545485dcb97f7e3e4a425b2.tar.xz
UXP-f828451e5f9b4fe63545485dcb97f7e3e4a425b2.zip
Issue #1525 - Kill marquee element
* Remove marquee code * Regenerate HTML Elements/parser code for Removal of Marquee. Co-authored-by: Gaming4JC <g4jc@hyperbola.info>
Diffstat (limited to 'dom/html')
-rw-r--r--dom/html/HTMLDivElement.cpp34
-rw-r--r--dom/html/test/test_bug389797.html1
-rw-r--r--dom/html/test/test_documentAll.html2
3 files changed, 1 insertions, 36 deletions
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();
}
diff --git a/dom/html/test/test_bug389797.html b/dom/html/test/test_bug389797.html
index 884348b12..373528c71 100644
--- a/dom/html/test/test_bug389797.html
+++ b/dom/html/test/test_bug389797.html
@@ -168,7 +168,6 @@ HTML_TAG("listing", "Pre");
HTML_TAG("main", "");
HTML_TAG("map", "Map");
HTML_TAG("mark", "");
-HTML_TAG("marquee", "Div");
HTML_TAG("menu", "Menu");
HTML_TAG("meta", "Meta");
HTML_TAG("meter", "Meter");
diff --git a/dom/html/test/test_documentAll.html b/dom/html/test/test_documentAll.html
index ec877acec..9db77d2fe 100644
--- a/dom/html/test/test_documentAll.html
+++ b/dom/html/test/test_documentAll.html
@@ -117,7 +117,7 @@ var elementNames =
'input','ins','isindex','kbd','keygen','label','li','legend','link','menu',
'multicol','noscript','noframes','object','spacer','table','td','td','th',
'thead','tfoot','tr','textarea','select','option','spacer','param',
- 'marquee','hr','title','hx','tt','u','ul','var','wbr','sub','sup','cite',
+ 'hr','title','hx','tt','u','ul','var','wbr','sub','sup','cite',
'code','q','nobr','ol','p','pre','s','samp','small','body','html','map',
'bdo','legend','listing','style','script','tbody','caption','meta',
'optgroup','button','span','strike','strong','td'].sort();