Bug 1066483 - Drop SVG camelCase mappings filterRes, contentStyleType, contentScriptType and externalResourcesRequired. r=wchen.

content/base/src/nsGkAtomList.h

@@ -1343,9 +1343,6 @@ GK_ATOM(fill, "fill")
 GK_ATOM(fill_opacity, "fill-opacity")
 GK_ATOM(fill_rule, "fill-rule")
 GK_ATOM(filter, "filter")
-// Parsing for filterRes may be removed in the future.
-// https://bugzilla.mozilla.org/show_bug.cgi?id=979472
-GK_ATOM(filterRes, "filterRes")
 GK_ATOM(filterUnits, "filterUnits")
 GK_ATOM(_float, "float")
 GK_ATOM(flood_color, "flood-color")

content/base/src/nsTreeSanitizer.cpp

@@ -393,8 +393,6 @@ nsIAtom** const kAttributesSVG[] = {
   &nsGkAtoms::color, // color
   &nsGkAtoms::colorInterpolation, // color-interpolation
   &nsGkAtoms::colorInterpolationFilters, // color-interpolation-filters
-  // contentScriptType
-  // contentStyleType
   &nsGkAtoms::cursor, // cursor
   &nsGkAtoms::cx, // cx
   &nsGkAtoms::cy, // cy
@@ -416,7 +414,6 @@ nsIAtom** const kAttributesSVG[] = {
   &nsGkAtoms::fill_opacity, // fill-opacity
   &nsGkAtoms::fill_rule, // fill-rule
   &nsGkAtoms::filter, // filter
-  &nsGkAtoms::filterRes, // filterRes
   &nsGkAtoms::filterUnits, // filterUnits
   &nsGkAtoms::flood_color, // flood-color
   &nsGkAtoms::flood_opacity, // flood-opacity

parser/html/javasrc/AttributeName.java

@@ -1010,7 +1010,6 @@ public final class AttributeName
     public static final AttributeName ELEVATION = new AttributeName(ALL_NO_NS, SAME_LOCAL("elevation"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName DIRECTION = new AttributeName(ALL_NO_NS, SAME_LOCAL("direction"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName DRAGGABLE = new AttributeName(ALL_NO_NS, SAME_LOCAL("draggable"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
-    public static final AttributeName FILTERRES = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("filterres", "filterRes"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName FILL_RULE = new AttributeName(ALL_NO_NS, SAME_LOCAL("fill-rule"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName FONTSTYLE = new AttributeName(ALL_NO_NS, SAME_LOCAL("fontstyle"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName FONT_SIZE = new AttributeName(ALL_NO_NS, SAME_LOCAL("font-size"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
@@ -1251,7 +1250,6 @@ public final class AttributeName
     public static final AttributeName STROKE_LINEJOIN = new AttributeName(ALL_NO_NS, SAME_LOCAL("stroke-linejoin"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName REPEAT_TEMPLATE = new AttributeName(ALL_NO_NS, SAME_LOCAL("repeat-template"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ARIA_DESCRIBEDBY = new AttributeName(ALL_NO_NS, SAME_LOCAL("aria-describedby"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
-    public static final AttributeName CONTENTSTYLETYPE = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("contentstyletype", "contentStyleType"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName FONT_SIZE_ADJUST = new AttributeName(ALL_NO_NS, SAME_LOCAL("font-size-adjust"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName KERNELUNITLENGTH = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("kernelunitlength", "kernelUnitLength"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ONBEFOREACTIVATE = new AttributeName(ALL_NO_NS, SAME_LOCAL("onbeforeactivate"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
@@ -1268,7 +1266,6 @@ public final class AttributeName
     public static final AttributeName XCHANNELSELECTOR = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("xchannelselector", "xChannelSelector"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName YCHANNELSELECTOR = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("ychannelselector", "yChannelSelector"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ARIA_AUTOCOMPLETE = new AttributeName(ALL_NO_NS, SAME_LOCAL("aria-autocomplete"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
-    public static final AttributeName CONTENTSCRIPTTYPE = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("contentscripttype", "contentScriptType"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ENABLE_BACKGROUND = new AttributeName(ALL_NO_NS, SAME_LOCAL("enable-background"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName DOMINANT_BASELINE = new AttributeName(ALL_NO_NS, SAME_LOCAL("dominant-baseline"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName GRADIENTTRANSFORM = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("gradienttransform", "gradientTransform"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
@@ -1297,7 +1294,6 @@ public final class AttributeName
     public static final AttributeName VERYVERYTHICKMATHSPACE = new AttributeName(ALL_NO_NS, SAME_LOCAL("veryverythickmathspace"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName STRIKETHROUGH_POSITION = new AttributeName(ALL_NO_NS, SAME_LOCAL("strikethrough-position"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName STRIKETHROUGH_THICKNESS = new AttributeName(ALL_NO_NS, SAME_LOCAL("strikethrough-thickness"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
-    public static final AttributeName EXTERNALRESOURCESREQUIRED = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("externalresourcesrequired", "externalResourcesRequired"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName GLYPH_ORIENTATION_VERTICAL = new AttributeName(ALL_NO_NS, SAME_LOCAL("glyph-orientation-vertical"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName COLOR_INTERPOLATION_FILTERS = new AttributeName(ALL_NO_NS, SAME_LOCAL("color-interpolation-filters"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName GLYPH_ORIENTATION_HORIZONTAL = new AttributeName(ALL_NO_NS, SAME_LOCAL("glyph-orientation-horizontal"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
@@ -1595,7 +1591,6 @@ public final class AttributeName
     ELEVATION,
     DIRECTION,
     DRAGGABLE,
-    FILTERRES,
     FILL_RULE,
     FONTSTYLE,
     FONT_SIZE,
@@ -1836,7 +1831,6 @@ public final class AttributeName
     STROKE_LINEJOIN,
     REPEAT_TEMPLATE,
     ARIA_DESCRIBEDBY,
-    CONTENTSTYLETYPE,
     FONT_SIZE_ADJUST,
     KERNELUNITLENGTH,
     ONBEFOREACTIVATE,
@@ -1853,7 +1847,6 @@ public final class AttributeName
     XCHANNELSELECTOR,
     YCHANNELSELECTOR,
     ARIA_AUTOCOMPLETE,
-    CONTENTSCRIPTTYPE,
     ENABLE_BACKGROUND,
     DOMINANT_BASELINE,
     GRADIENTTRANSFORM,
@@ -1882,7 +1875,6 @@ public final class AttributeName
     VERYVERYTHICKMATHSPACE,
     STRIKETHROUGH_POSITION,
     STRIKETHROUGH_THICKNESS,
-    EXTERNALRESOURCESREQUIRED,
     GLYPH_ORIENTATION_VERTICAL,
     COLOR_INTERPOLATION_FILTERS,
     GLYPH_ORIENTATION_HORIZONTAL,
@@ -2181,7 +2173,6 @@ public final class AttributeName
     307227811,
     307468786,
     307724489,
-    309671175,
     310252031,
     310358241,
     310373094,
@@ -2422,7 +2413,6 @@ public final class AttributeName
     526807354,
     527348842,
     538294791,
-    539214049,
     544689535,
     545535009,
     548544752,
@@ -2439,7 +2429,6 @@ public final class AttributeName
     569212097,
     569474241,
     572252718,
-    572768481,
     575326764,
     576174758,
     576190819,
@@ -2468,7 +2457,6 @@ public final class AttributeName
     759097578,
     761686526,
     795383908,
-    843809551,
     878105336,
     908643300,
     945213471,

parser/html/javasrc/TreeBuilder.java

@@ -5643,6 +5643,15 @@ public abstract class TreeBuilder<T> implements TokenHandler,
      */
     public final void setFragmentContext(@Local String context,
             @NsUri String ns, T node, boolean quirks) {
+        // [NOCPP[
+        if (!((context == null && ns == null)
+                || "http://www.w3.org/1999/xhtml" == ns
+                || "http://www.w3.org/2000/svg" == ns || "http://www.w3.org/1998/Math/MathML" == ns)) {
+            throw new IllegalArgumentException(
+                    "The namespace must be the HTML, SVG or MathML namespace (or null when the local name is null). Got: "
+                            + ns);
+        }
+        // ]NOCPP]
         this.contextName = context;
         this.contextNamespace = ns;
         this.contextNode = node;

parser/html/nsHtml5AtomList.h

@@ -361,8 +361,6 @@ HTML5_ATOM(equalrows, "equalrows")
 HTML5_ATOM(elevation, "elevation")
 HTML5_ATOM(direction, "direction")
 HTML5_ATOM(draggable, "draggable")
-HTML5_ATOM(filterres, "filterres")
-HTML5_ATOM(filterRes, "filterRes")
 HTML5_ATOM(fill_rule, "fill-rule")
 HTML5_ATOM(fontstyle, "fontstyle")
 HTML5_ATOM(font_size, "font-size")
@@ -644,8 +642,6 @@ HTML5_ATOM(shape_rendering, "shape-rendering")
 HTML5_ATOM(stroke_linejoin, "stroke-linejoin")
 HTML5_ATOM(repeat_template, "repeat-template")
 HTML5_ATOM(aria_describedby, "aria-describedby")
-HTML5_ATOM(contentstyletype, "contentstyletype")
-HTML5_ATOM(contentStyleType, "contentStyleType")
 HTML5_ATOM(font_size_adjust, "font-size-adjust")
 HTML5_ATOM(kernelunitlength, "kernelunitlength")
 HTML5_ATOM(kernelUnitLength, "kernelUnitLength")
@@ -670,8 +666,6 @@ HTML5_ATOM(xChannelSelector, "xChannelSelector")
 HTML5_ATOM(ychannelselector, "ychannelselector")
 HTML5_ATOM(yChannelSelector, "yChannelSelector")
 HTML5_ATOM(aria_autocomplete, "aria-autocomplete")
-HTML5_ATOM(contentscripttype, "contentscripttype")
-HTML5_ATOM(contentScriptType, "contentScriptType")
 HTML5_ATOM(enable_background, "enable-background")
 HTML5_ATOM(dominant_baseline, "dominant-baseline")
 HTML5_ATOM(gradienttransform, "gradienttransform")
@@ -705,8 +699,6 @@ HTML5_ATOM(veryverythinmathspace, "veryverythinmathspace")
 HTML5_ATOM(veryverythickmathspace, "veryverythickmathspace")
 HTML5_ATOM(strikethrough_position, "strikethrough-position")
 HTML5_ATOM(strikethrough_thickness, "strikethrough-thickness")
-HTML5_ATOM(externalresourcesrequired, "externalresourcesrequired")
-HTML5_ATOM(externalResourcesRequired, "externalResourcesRequired")
 HTML5_ATOM(glyph_orientation_vertical, "glyph-orientation-vertical")
 HTML5_ATOM(color_interpolation_filters, "color-interpolation-filters")
 HTML5_ATOM(glyph_orientation_horizontal, "glyph-orientation-horizontal")

parser/html/nsHtml5AttributeName.h

@@ -385,7 +385,6 @@ class nsHtml5AttributeName
     static nsHtml5AttributeName* ATTR_ELEVATION;
     static nsHtml5AttributeName* ATTR_DIRECTION;
     static nsHtml5AttributeName* ATTR_DRAGGABLE;
-    static nsHtml5AttributeName* ATTR_FILTERRES;
     static nsHtml5AttributeName* ATTR_FILL_RULE;
     static nsHtml5AttributeName* ATTR_FONTSTYLE;
     static nsHtml5AttributeName* ATTR_FONT_SIZE;
@@ -626,7 +625,6 @@ class nsHtml5AttributeName
     static nsHtml5AttributeName* ATTR_STROKE_LINEJOIN;
     static nsHtml5AttributeName* ATTR_REPEAT_TEMPLATE;
     static nsHtml5AttributeName* ATTR_ARIA_DESCRIBEDBY;
-    static nsHtml5AttributeName* ATTR_CONTENTSTYLETYPE;
     static nsHtml5AttributeName* ATTR_FONT_SIZE_ADJUST;
     static nsHtml5AttributeName* ATTR_KERNELUNITLENGTH;
     static nsHtml5AttributeName* ATTR_ONBEFOREACTIVATE;
@@ -643,7 +641,6 @@ class nsHtml5AttributeName
     static nsHtml5AttributeName* ATTR_XCHANNELSELECTOR;
     static nsHtml5AttributeName* ATTR_YCHANNELSELECTOR;
     static nsHtml5AttributeName* ATTR_ARIA_AUTOCOMPLETE;
-    static nsHtml5AttributeName* ATTR_CONTENTSCRIPTTYPE;
     static nsHtml5AttributeName* ATTR_ENABLE_BACKGROUND;
     static nsHtml5AttributeName* ATTR_DOMINANT_BASELINE;
     static nsHtml5AttributeName* ATTR_GRADIENTTRANSFORM;
@@ -672,7 +669,6 @@ class nsHtml5AttributeName
     static nsHtml5AttributeName* ATTR_VERYVERYTHICKMATHSPACE;
     static nsHtml5AttributeName* ATTR_STRIKETHROUGH_POSITION;
     static nsHtml5AttributeName* ATTR_STRIKETHROUGH_THICKNESS;
-    static nsHtml5AttributeName* ATTR_EXTERNALRESOURCESREQUIRED;
     static nsHtml5AttributeName* ATTR_GLYPH_ORIENTATION_VERTICAL;
     static nsHtml5AttributeName* ATTR_COLOR_INTERPOLATION_FILTERS;
     static nsHtml5AttributeName* ATTR_GLYPH_ORIENTATION_HORIZONTAL;

parser/htmlparser/tests/mochitest/html5lib_tree_construction/tests11.dat

@@ -13,13 +13,13 @@
 |       baseProfile=""
 |       calcMode=""
 |       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
+|       contentscripttype=""
+|       contentstyletype=""
 |       diffuseConstant=""
 |       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
+|       externalresourcesrequired=""
 |       filterUnits=""
+|       filterres=""
 |       glyphRef=""
 |       gradientTransform=""
 |       gradientUnits=""
@@ -85,13 +85,13 @@
 |       baseProfile=""
 |       calcMode=""
 |       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
+|       contentscripttype=""
+|       contentstyletype=""
 |       diffuseConstant=""
 |       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
+|       externalresourcesrequired=""
 |       filterUnits=""
+|       filterres=""
 |       glyphRef=""
 |       gradientTransform=""
 |       gradientUnits=""
@@ -157,13 +157,13 @@
 |       baseProfile=""
 |       calcMode=""
 |       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
+|       contentscripttype=""
+|       contentstyletype=""
 |       diffuseConstant=""
 |       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
+|       externalresourcesrequired=""
 |       filterUnits=""
+|       filterres=""
 |       glyphRef=""
 |       gradientTransform=""
 |       gradientUnits=""