Bug 1066483 - Drop SVG camelCase mappings filterRes, contentStyleType, contentScriptType and externalResourcesRequired. r=wchen.
authorHenri Sivonen <hsivonen@hsivonen.fi>
Fri, 19 Sep 2014 18:20:26 +0300
changeset 210724 9ec96af338983dcfc96f11c5b3538674c1788f1b
parent 210705 3874e8dcb61d7628c08f9c97553ffa23a655ab5d
child 210725 d435760a28dc938459135457cb9d5e3d5dffb957
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewerswchen
bugs1066483
milestone36.0a1
Bug 1066483 - Drop SVG camelCase mappings filterRes, contentStyleType, contentScriptType and externalResourcesRequired. r=wchen.
content/base/src/nsGkAtomList.h
content/base/src/nsTreeSanitizer.cpp
parser/html/javasrc/AttributeName.java
parser/html/javasrc/TreeBuilder.java
parser/html/nsHtml5AtomList.h
parser/html/nsHtml5AttributeName.cpp
parser/html/nsHtml5AttributeName.h
parser/htmlparser/tests/mochitest/html5lib_tree_construction/tests11.dat
--- a/content/base/src/nsGkAtomList.h
+++ b/content/base/src/nsGkAtomList.h
@@ -1338,19 +1338,16 @@ GK_ATOM(fePointLight, "fePointLight")
 GK_ATOM(feSpecularLighting, "feSpecularLighting")
 GK_ATOM(feSpotLight, "feSpotLight")
 GK_ATOM(feTile, "feTile")
 GK_ATOM(feTurbulence, "feTurbulence")
 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")
 GK_ATOM(flood_opacity, "flood-opacity")
 GK_ATOM(font_face, "font-face")
 GK_ATOM(font_face_format, "font-face-format")
 GK_ATOM(font_face_name, "font-face-name")
 GK_ATOM(font_face_src, "font-face-src")
--- a/content/base/src/nsTreeSanitizer.cpp
+++ b/content/base/src/nsTreeSanitizer.cpp
@@ -388,18 +388,16 @@ nsIAtom** const kAttributesSVG[] = {
   // cap-height
   &nsGkAtoms::_class, // class
   &nsGkAtoms::clip_path, // clip-path
   &nsGkAtoms::clip_rule, // clip-rule
   &nsGkAtoms::clipPathUnits, // clipPathUnits
   &nsGkAtoms::color, // color
   &nsGkAtoms::colorInterpolation, // color-interpolation
   &nsGkAtoms::colorInterpolationFilters, // color-interpolation-filters
-  // contentScriptType
-  // contentStyleType
   &nsGkAtoms::cursor, // cursor
   &nsGkAtoms::cx, // cx
   &nsGkAtoms::cy, // cy
   &nsGkAtoms::d, // d
   // descent
   &nsGkAtoms::diffuseConstant, // diffuseConstant
   &nsGkAtoms::direction, // direction
   &nsGkAtoms::display, // display
@@ -411,17 +409,16 @@ nsIAtom** const kAttributesSVG[] = {
   &nsGkAtoms::edgeMode, // edgeMode
   &nsGkAtoms::elevation, // elevation
   // enable-background
   &nsGkAtoms::end, // end
   &nsGkAtoms::fill, // fill
   &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
   // XXX focusable
   &nsGkAtoms::font, // font
   &nsGkAtoms::font_family, // font-family
   &nsGkAtoms::font_size, // font-size
   &nsGkAtoms::font_size_adjust, // font-size-adjust
--- a/parser/html/javasrc/AttributeName.java
+++ b/parser/html/javasrc/AttributeName.java
@@ -1005,17 +1005,16 @@ public final class AttributeName
     public static final AttributeName AMPLITUDE = new AttributeName(ALL_NO_NS, SAME_LOCAL("amplitude"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ARIA_LIVE = new AttributeName(ALL_NO_NS, SAME_LOCAL("aria-live"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName CLIP_RULE = new AttributeName(ALL_NO_NS, SAME_LOCAL("clip-rule"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName CLIP_PATH = new AttributeName(ALL_NO_NS, SAME_LOCAL("clip-path"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName EQUALROWS = new AttributeName(ALL_NO_NS, SAME_LOCAL("equalrows"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     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);
     public static final AttributeName KEYSYSTEM = new AttributeName(ALL_NO_NS, SAME_LOCAL("keysystem"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName KEYPOINTS = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("keypoints", "keyPoints"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName HIDEFOCUS = new AttributeName(ALL_NO_NS, SAME_LOCAL("hidefocus"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ONMESSAGE = new AttributeName(ALL_NO_NS, SAME_LOCAL("onmessage"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName INTERCEPT = new AttributeName(ALL_NO_NS, SAME_LOCAL("intercept"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
@@ -1246,34 +1245,32 @@ public final class AttributeName
     public static final AttributeName ONCONTROLSELECT = new AttributeName(ALL_NO_NS, SAME_LOCAL("oncontrolselect"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName IMAGE_RENDERING = new AttributeName(ALL_NO_NS, SAME_LOCAL("image-rendering"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName MEDIUMMATHSPACE = new AttributeName(ALL_NO_NS, SAME_LOCAL("mediummathspace"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName TEXT_DECORATION = new AttributeName(ALL_NO_NS, SAME_LOCAL("text-decoration"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName SHAPE_RENDERING = new AttributeName(ALL_NO_NS, SAME_LOCAL("shape-rendering"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     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);
     public static final AttributeName ONPROPERTYCHANGE = new AttributeName(ALL_NO_NS, SAME_LOCAL("onpropertychange"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ONDATASETCHANGED = new AttributeName(ALL_NO_NS, SAME_LOCAL("ondatasetchanged"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName MASKCONTENTUNITS = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("maskcontentunits", "maskContentUnits"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName PATTERNTRANSFORM = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("patterntransform", "patternTransform"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName REQUIREDFEATURES = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("requiredfeatures", "requiredFeatures"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName RENDERING_INTENT = new AttributeName(ALL_NO_NS, SAME_LOCAL("rendering-intent"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName SPECULAREXPONENT = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("specularexponent", "specularExponent"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName SPECULARCONSTANT = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("specularconstant", "specularConstant"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName SUPERSCRIPTSHIFT = new AttributeName(ALL_NO_NS, SAME_LOCAL("superscriptshift"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName STROKE_DASHARRAY = new AttributeName(ALL_NO_NS, SAME_LOCAL("stroke-dasharray"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     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);
     public static final AttributeName ONBEFORDEACTIVATE = new AttributeName(ALL_NO_NS, SAME_LOCAL("onbefordeactivate"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ONDATASETCOMPLETE = new AttributeName(ALL_NO_NS, SAME_LOCAL("ondatasetcomplete"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName OVERLINE_POSITION = new AttributeName(ALL_NO_NS, SAME_LOCAL("overline-position"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ONBEFOREEDITFOCUS = new AttributeName(ALL_NO_NS, SAME_LOCAL("onbeforeeditfocus"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName LIMITINGCONEANGLE = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("limitingconeangle", "limitingConeAngle"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
@@ -1292,17 +1289,16 @@ public final class AttributeName
     public static final AttributeName PATTERNCONTENTUNITS = new AttributeName(ALL_NO_NS, SVG_DIFFERENT("patterncontentunits", "patternContentUnits"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ARIA_MULTISELECTABLE = new AttributeName(ALL_NO_NS, SAME_LOCAL("aria-multiselectable"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName SCRIPTSIZEMULTIPLIER = new AttributeName(ALL_NO_NS, SAME_LOCAL("scriptsizemultiplier"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName ARIA_ACTIVEDESCENDANT = new AttributeName(ALL_NO_NS, SAME_LOCAL("aria-activedescendant"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     public static final AttributeName VERYVERYTHINMATHSPACE = new AttributeName(ALL_NO_NS, SAME_LOCAL("veryverythinmathspace"), ALL_NO_PREFIX, NCNAME_HTML | NCNAME_FOREIGN | NCNAME_LANG);
     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);
     private final static @NoLength AttributeName[] ATTRIBUTE_NAMES = {
     D,
     K,
     R,
     X,
@@ -1590,17 +1586,16 @@ public final class AttributeName
     AMPLITUDE,
     ARIA_LIVE,
     CLIP_RULE,
     CLIP_PATH,
     EQUALROWS,
     ELEVATION,
     DIRECTION,
     DRAGGABLE,
-    FILTERRES,
     FILL_RULE,
     FONTSTYLE,
     FONT_SIZE,
     KEYSYSTEM,
     KEYPOINTS,
     HIDEFOCUS,
     ONMESSAGE,
     INTERCEPT,
@@ -1831,34 +1826,32 @@ public final class AttributeName
     ONCONTROLSELECT,
     IMAGE_RENDERING,
     MEDIUMMATHSPACE,
     TEXT_DECORATION,
     SHAPE_RENDERING,
     STROKE_LINEJOIN,
     REPEAT_TEMPLATE,
     ARIA_DESCRIBEDBY,
-    CONTENTSTYLETYPE,
     FONT_SIZE_ADJUST,
     KERNELUNITLENGTH,
     ONBEFOREACTIVATE,
     ONPROPERTYCHANGE,
     ONDATASETCHANGED,
     MASKCONTENTUNITS,
     PATTERNTRANSFORM,
     REQUIREDFEATURES,
     RENDERING_INTENT,
     SPECULAREXPONENT,
     SPECULARCONSTANT,
     SUPERSCRIPTSHIFT,
     STROKE_DASHARRAY,
     XCHANNELSELECTOR,
     YCHANNELSELECTOR,
     ARIA_AUTOCOMPLETE,
-    CONTENTSCRIPTTYPE,
     ENABLE_BACKGROUND,
     DOMINANT_BASELINE,
     GRADIENTTRANSFORM,
     ONBEFORDEACTIVATE,
     ONDATASETCOMPLETE,
     OVERLINE_POSITION,
     ONBEFOREEDITFOCUS,
     LIMITINGCONEANGLE,
@@ -1877,17 +1870,16 @@ public final class AttributeName
     PATTERNCONTENTUNITS,
     ARIA_MULTISELECTABLE,
     SCRIPTSIZEMULTIPLIER,
     ARIA_ACTIVEDESCENDANT,
     VERYVERYTHINMATHSPACE,
     VERYVERYTHICKMATHSPACE,
     STRIKETHROUGH_POSITION,
     STRIKETHROUGH_THICKNESS,
-    EXTERNALRESOURCESREQUIRED,
     GLYPH_ORIENTATION_VERTICAL,
     COLOR_INTERPOLATION_FILTERS,
     GLYPH_ORIENTATION_HORIZONTAL,
     };
     private final static int[] ATTRIBUTE_HASHES = {
     1153,
     1383,
     1601,
@@ -2176,17 +2168,16 @@ public final class AttributeName
     303724281,
     303819694,
     304242723,
     304382625,
     306247792,
     307227811,
     307468786,
     307724489,
-    309671175,
     310252031,
     310358241,
     310373094,
     310833159,
     311015256,
     313357609,
     313683893,
     313701861,
@@ -2417,34 +2408,32 @@ public final class AttributeName
     515571132,
     515594682,
     518712698,
     521362273,
     526592419,
     526807354,
     527348842,
     538294791,
-    539214049,
     544689535,
     545535009,
     548544752,
     548563346,
     548595116,
     551679010,
     558034099,
     560329411,
     560356209,
     560671018,
     560671152,
     560692590,
     560845442,
     569212097,
     569474241,
     572252718,
-    572768481,
     575326764,
     576174758,
     576190819,
     582099184,
     582099438,
     582372519,
     582558889,
     586552164,
@@ -2463,15 +2452,14 @@ public final class AttributeName
     659420283,
     672891587,
     694768102,
     705890982,
     725543146,
     759097578,
     761686526,
     795383908,
-    843809551,
     878105336,
     908643300,
     945213471,
     };
 
 }
--- a/parser/html/javasrc/TreeBuilder.java
+++ b/parser/html/javasrc/TreeBuilder.java
@@ -5638,16 +5638,25 @@ public abstract class TreeBuilder<T> imp
 
     /**
      * The argument MUST be an interned string or <code>null</code>.
      *
      * @param context
      */
     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;
         this.fragment = (contextName != null);
         this.quirks = quirks;
     }
 
     protected final T currentNode() {
--- a/parser/html/nsHtml5AtomList.h
+++ b/parser/html/nsHtml5AtomList.h
@@ -356,18 +356,16 @@ HTML5_ATOM(aria_grab, "aria-grab")
 HTML5_ATOM(amplitude, "amplitude")
 HTML5_ATOM(aria_live, "aria-live")
 HTML5_ATOM(clip_rule, "clip-rule")
 HTML5_ATOM(clip_path, "clip-path")
 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")
 HTML5_ATOM(keysystem, "keysystem")
 HTML5_ATOM(keypoints, "keypoints")
 HTML5_ATOM(keyPoints, "keyPoints")
 HTML5_ATOM(hidefocus, "hidefocus")
 HTML5_ATOM(onmessage, "onmessage")
@@ -639,18 +637,16 @@ HTML5_ATOM(ondataavailable, "ondataavail
 HTML5_ATOM(oncontrolselect, "oncontrolselect")
 HTML5_ATOM(image_rendering, "image-rendering")
 HTML5_ATOM(mediummathspace, "mediummathspace")
 HTML5_ATOM(text_decoration, "text-decoration")
 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")
 HTML5_ATOM(onbeforeactivate, "onbeforeactivate")
 HTML5_ATOM(onpropertychange, "onpropertychange")
 HTML5_ATOM(ondatasetchanged, "ondatasetchanged")
 HTML5_ATOM(maskcontentunits, "maskcontentunits")
 HTML5_ATOM(maskContentUnits, "maskContentUnits")
@@ -665,18 +661,16 @@ HTML5_ATOM(specularconstant, "specularco
 HTML5_ATOM(specularConstant, "specularConstant")
 HTML5_ATOM(superscriptshift, "superscriptshift")
 HTML5_ATOM(stroke_dasharray, "stroke-dasharray")
 HTML5_ATOM(xchannelselector, "xchannelselector")
 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")
 HTML5_ATOM(gradientTransform, "gradientTransform")
 HTML5_ATOM(onbefordeactivate, "onbefordeactivate")
 HTML5_ATOM(ondatasetcomplete, "ondatasetcomplete")
 HTML5_ATOM(overline_position, "overline-position")
 HTML5_ATOM(onbeforeeditfocus, "onbeforeeditfocus")
@@ -700,18 +694,16 @@ HTML5_ATOM(patterncontentunits, "pattern
 HTML5_ATOM(patternContentUnits, "patternContentUnits")
 HTML5_ATOM(aria_multiselectable, "aria-multiselectable")
 HTML5_ATOM(scriptsizemultiplier, "scriptsizemultiplier")
 HTML5_ATOM(aria_activedescendant, "aria-activedescendant")
 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")
 HTML5_ATOM(b, "b")
 HTML5_ATOM(g, "g")
 HTML5_ATOM(i, "i")
 HTML5_ATOM(q, "q")
 HTML5_ATOM(s, "s")
--- a/parser/html/nsHtml5AttributeName.cpp
+++ b/parser/html/nsHtml5AttributeName.cpp
@@ -483,17 +483,16 @@ nsHtml5AttributeName* nsHtml5AttributeNa
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_AMPLITUDE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ARIA_LIVE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_CLIP_RULE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_CLIP_PATH = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_EQUALROWS = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ELEVATION = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_DIRECTION = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_DRAGGABLE = nullptr;
-nsHtml5AttributeName* nsHtml5AttributeName::ATTR_FILTERRES = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_FILL_RULE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_FONTSTYLE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_FONT_SIZE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_KEYSYSTEM = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_KEYPOINTS = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_HIDEFOCUS = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONMESSAGE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_INTERCEPT = nullptr;
@@ -724,34 +723,32 @@ nsHtml5AttributeName* nsHtml5AttributeNa
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONCONTROLSELECT = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_IMAGE_RENDERING = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_MEDIUMMATHSPACE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_TEXT_DECORATION = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_SHAPE_RENDERING = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_STROKE_LINEJOIN = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_REPEAT_TEMPLATE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ARIA_DESCRIBEDBY = nullptr;
-nsHtml5AttributeName* nsHtml5AttributeName::ATTR_CONTENTSTYLETYPE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_FONT_SIZE_ADJUST = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_KERNELUNITLENGTH = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONBEFOREACTIVATE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONPROPERTYCHANGE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONDATASETCHANGED = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_MASKCONTENTUNITS = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_PATTERNTRANSFORM = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_REQUIREDFEATURES = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_RENDERING_INTENT = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_SPECULAREXPONENT = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_SPECULARCONSTANT = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_SUPERSCRIPTSHIFT = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_STROKE_DASHARRAY = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_XCHANNELSELECTOR = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_YCHANNELSELECTOR = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ARIA_AUTOCOMPLETE = nullptr;
-nsHtml5AttributeName* nsHtml5AttributeName::ATTR_CONTENTSCRIPTTYPE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ENABLE_BACKGROUND = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_DOMINANT_BASELINE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_GRADIENTTRANSFORM = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONBEFORDEACTIVATE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONDATASETCOMPLETE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_OVERLINE_POSITION = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ONBEFOREEDITFOCUS = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_LIMITINGCONEANGLE = nullptr;
@@ -770,22 +767,21 @@ nsHtml5AttributeName* nsHtml5AttributeNa
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_PATTERNCONTENTUNITS = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ARIA_MULTISELECTABLE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_SCRIPTSIZEMULTIPLIER = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_ARIA_ACTIVEDESCENDANT = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_VERYVERYTHINMATHSPACE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_VERYVERYTHICKMATHSPACE = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_STRIKETHROUGH_POSITION = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_STRIKETHROUGH_THICKNESS = nullptr;
-nsHtml5AttributeName* nsHtml5AttributeName::ATTR_EXTERNALRESOURCESREQUIRED = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_GLYPH_ORIENTATION_VERTICAL = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_COLOR_INTERPOLATION_FILTERS = nullptr;
 nsHtml5AttributeName* nsHtml5AttributeName::ATTR_GLYPH_ORIENTATION_HORIZONTAL = nullptr;
 nsHtml5AttributeName** nsHtml5AttributeName::ATTRIBUTE_NAMES = 0;
-static int32_t const ATTRIBUTE_HASHES_DATA[] = { 1153, 1383, 1601, 1793, 1827, 1857, 68600, 69146, 69177, 70237, 70270, 71572, 71669, 72415, 72444, 74846, 74904, 74943, 75001, 75276, 75590, 84742, 84839, 85575, 85963, 85992, 87204, 88074, 88171, 89130, 89163, 3207892, 3283895, 3284791, 3338752, 3358197, 3369562, 3539124, 3562402, 3574260, 3670335, 3696933, 3721879, 135280021, 135346322, 136317019, 136475749, 136548517, 136652214, 136884919, 136902418, 136942992, 137292068, 139120259, 139785574, 142250603, 142314056, 142331176, 142519584, 144752417, 145106895, 146147200, 146765926, 148805544, 149655723, 149809441, 150018784, 150445028, 150813181, 150923321, 152528754, 152536216, 152647366, 152962785, 155219321, 155654904, 157317483, 157350248, 157437941, 157447478, 157604838, 157685404, 157894402, 158315188, 166078431, 169409980, 169700259, 169856932, 170007032, 170409695, 170466488, 170513710, 170608367, 173028944, 173896963, 176090625, 176129212, 179390001, 179489057, 179627464, 179840468, 179849042, 180004216, 181779081, 183027151, 183645319, 183698797, 185922012, 185997252, 188312483, 188675799, 190977533, 190992569, 191006194, 191033518, 191038774, 191096249, 191166163, 191194426, 191443343, 191522106, 191568039, 200104642, 202506661, 202537381, 202602917, 203070590, 203120766, 203389054, 203690071, 203971238, 203986524, 209040857, 209125756, 212055489, 212322418, 212746849, 213002877, 213055164, 213088023, 213259873, 213273386, 213435118, 213437318, 213438231, 213493071, 213532268, 213542834, 213584431, 213659891, 215285828, 215880731, 216112976, 216684637, 217369699, 217565298, 217576549, 218186795, 219743185, 220082234, 221623802, 221986406, 222283890, 223089542, 223138630, 223311265, 224431494, 224547358, 224587256, 224589550, 224655650, 224785518, 224810917, 224813302, 225126263, 225429618, 225432950, 225440869, 236107233, 236709921, 236838947, 237117095, 237143271, 237172455, 237209953, 237354143, 237372743, 237668065, 237703073, 237714273, 239743521, 240512803, 240522627, 240560417, 240656513, 241015715, 241062755, 241065383, 243523041, 245865199, 246261793, 246556195, 246774817, 246923491, 246928419, 246981667, 247014847, 247058369, 247112833, 247118177, 247119137, 247128739, 247316903, 249533729, 250235623, 250269543, 251402351, 252339047, 253260911, 253293679, 254844367, 255547879, 256077281, 256345377, 258124199, 258354465, 258605063, 258744193, 258845603, 258856961, 258926689, 269869248, 270174334, 270709417, 270778994, 270781796, 271102503, 271478858, 271490090, 272870654, 273335275, 273369140, 273924313, 274108530, 274116736, 276818662, 277476156, 279156579, 279349675, 280108533, 280128712, 280132869, 280162403, 280280292, 280413430, 280506130, 280677397, 280678580, 280686710, 280689066, 282736758, 283110901, 283275116, 283823226, 283890012, 284479340, 284606461, 286700477, 286798916, 291557706, 291665349, 291804100, 292138018, 292166446, 292418738, 292451039, 300298041, 300374839, 300597935, 303073389, 303083839, 303266673, 303354997, 303430688, 303576261, 303724281, 303819694, 304242723, 304382625, 306247792, 307227811, 307468786, 307724489, 309671175, 310252031, 310358241, 310373094, 310833159, 311015256, 313357609, 313683893, 313701861, 313706996, 313707317, 313710350, 314027746, 314038181, 314091299, 314205627, 314233813, 316741830, 316797986, 317486755, 317794164, 320076137, 322657125, 322887778, 323506876, 323572412, 323605180, 325060058, 325320188, 325398738, 325541490, 325671619, 333868843, 336806130, 337212108, 337282686, 337285434, 337585223, 338036037, 338298087, 338566051, 340943551, 341190970, 342995704, 343352124, 343912673, 344585053, 346977248, 347218098, 347262163, 347278576, 347438191, 347655959, 347684788, 347726430, 347727772, 347776035, 347776629, 349500753, 350880161, 350887073, 353384123, 355496998, 355906922, 355979793, 356545959, 358637867, 358905016, 359164318, 359247286, 359350571, 359579447, 365560330, 367399355, 367420285, 367510727, 368013212, 370234760, 370353345, 370710317, 371074566, 371122285, 371194213, 371448425, 371448430, 371545055, 371593469, 371596922, 371758751, 371964792, 372151328, 376550136, 376710172, 376795771, 376826271, 376906556, 380514830, 380774774, 380775037, 381030322, 381136500, 381281631, 381282269, 381285504, 381330595, 381331422, 381335911, 381336484, 383907298, 383917408, 384595009, 384595013, 387799894, 387823201, 392581647, 392584937, 392742684, 392906485, 393003349, 400644707, 400973830, 404428547, 404432113, 404432865, 404469244, 404478897, 404694860, 406887479, 408294949, 408789955, 410022510, 410467324, 410586448, 410945965, 411845275, 414327152, 414327932, 414329781, 414346257, 414346439, 414639928, 414835998, 414894517, 414986533, 417465377, 417465381, 417492216, 418259232, 419310946, 420103495, 420242342, 420380455, 420658662, 420717432, 423183880, 424539259, 425929170, 425972964, 426050649, 426126450, 426142833, 426607922, 437289840, 437347469, 437412335, 437423943, 437455540, 437462252, 437597991, 437617485, 437986305, 437986507, 437986828, 437987072, 438015591, 438034813, 438038966, 438179623, 438347971, 438483573, 438547062, 438895551, 441592676, 442032555, 443548979, 447881379, 447881655, 447881895, 447887844, 448416189, 448445746, 448449012, 450942191, 452816744, 453668677, 454434495, 456610076, 456642844, 456738709, 457544600, 459451897, 459680944, 468058810, 468083581, 470964084, 471470955, 471567278, 472267822, 481177859, 481210627, 481435874, 481455115, 481485378, 481490218, 485105638, 486005878, 486383494, 487988916, 488103783, 490661867, 491574090, 491578272, 493041952, 493441205, 493582844, 493716979, 504577572, 504740359, 505091638, 505592418, 505656212, 509516275, 514998531, 515571132, 515594682, 518712698, 521362273, 526592419, 526807354, 527348842, 538294791, 539214049, 544689535, 545535009, 548544752, 548563346, 548595116, 551679010, 558034099, 560329411, 560356209, 560671018, 560671152, 560692590, 560845442, 569212097, 569474241, 572252718, 572768481, 575326764, 576174758, 576190819, 582099184, 582099438, 582372519, 582558889, 586552164, 591325418, 594231990, 594243961, 605711268, 615672071, 616086845, 621792370, 624879850, 627432831, 640040548, 654392808, 658675477, 659420283, 672891587, 694768102, 705890982, 725543146, 759097578, 761686526, 795383908, 843809551, 878105336, 908643300, 945213471 };
+static int32_t const ATTRIBUTE_HASHES_DATA[] = { 1153, 1383, 1601, 1793, 1827, 1857, 68600, 69146, 69177, 70237, 70270, 71572, 71669, 72415, 72444, 74846, 74904, 74943, 75001, 75276, 75590, 84742, 84839, 85575, 85963, 85992, 87204, 88074, 88171, 89130, 89163, 3207892, 3283895, 3284791, 3338752, 3358197, 3369562, 3539124, 3562402, 3574260, 3670335, 3696933, 3721879, 135280021, 135346322, 136317019, 136475749, 136548517, 136652214, 136884919, 136902418, 136942992, 137292068, 139120259, 139785574, 142250603, 142314056, 142331176, 142519584, 144752417, 145106895, 146147200, 146765926, 148805544, 149655723, 149809441, 150018784, 150445028, 150813181, 150923321, 152528754, 152536216, 152647366, 152962785, 155219321, 155654904, 157317483, 157350248, 157437941, 157447478, 157604838, 157685404, 157894402, 158315188, 166078431, 169409980, 169700259, 169856932, 170007032, 170409695, 170466488, 170513710, 170608367, 173028944, 173896963, 176090625, 176129212, 179390001, 179489057, 179627464, 179840468, 179849042, 180004216, 181779081, 183027151, 183645319, 183698797, 185922012, 185997252, 188312483, 188675799, 190977533, 190992569, 191006194, 191033518, 191038774, 191096249, 191166163, 191194426, 191443343, 191522106, 191568039, 200104642, 202506661, 202537381, 202602917, 203070590, 203120766, 203389054, 203690071, 203971238, 203986524, 209040857, 209125756, 212055489, 212322418, 212746849, 213002877, 213055164, 213088023, 213259873, 213273386, 213435118, 213437318, 213438231, 213493071, 213532268, 213542834, 213584431, 213659891, 215285828, 215880731, 216112976, 216684637, 217369699, 217565298, 217576549, 218186795, 219743185, 220082234, 221623802, 221986406, 222283890, 223089542, 223138630, 223311265, 224431494, 224547358, 224587256, 224589550, 224655650, 224785518, 224810917, 224813302, 225126263, 225429618, 225432950, 225440869, 236107233, 236709921, 236838947, 237117095, 237143271, 237172455, 237209953, 237354143, 237372743, 237668065, 237703073, 237714273, 239743521, 240512803, 240522627, 240560417, 240656513, 241015715, 241062755, 241065383, 243523041, 245865199, 246261793, 246556195, 246774817, 246923491, 246928419, 246981667, 247014847, 247058369, 247112833, 247118177, 247119137, 247128739, 247316903, 249533729, 250235623, 250269543, 251402351, 252339047, 253260911, 253293679, 254844367, 255547879, 256077281, 256345377, 258124199, 258354465, 258605063, 258744193, 258845603, 258856961, 258926689, 269869248, 270174334, 270709417, 270778994, 270781796, 271102503, 271478858, 271490090, 272870654, 273335275, 273369140, 273924313, 274108530, 274116736, 276818662, 277476156, 279156579, 279349675, 280108533, 280128712, 280132869, 280162403, 280280292, 280413430, 280506130, 280677397, 280678580, 280686710, 280689066, 282736758, 283110901, 283275116, 283823226, 283890012, 284479340, 284606461, 286700477, 286798916, 291557706, 291665349, 291804100, 292138018, 292166446, 292418738, 292451039, 300298041, 300374839, 300597935, 303073389, 303083839, 303266673, 303354997, 303430688, 303576261, 303724281, 303819694, 304242723, 304382625, 306247792, 307227811, 307468786, 307724489, 310252031, 310358241, 310373094, 310833159, 311015256, 313357609, 313683893, 313701861, 313706996, 313707317, 313710350, 314027746, 314038181, 314091299, 314205627, 314233813, 316741830, 316797986, 317486755, 317794164, 320076137, 322657125, 322887778, 323506876, 323572412, 323605180, 325060058, 325320188, 325398738, 325541490, 325671619, 333868843, 336806130, 337212108, 337282686, 337285434, 337585223, 338036037, 338298087, 338566051, 340943551, 341190970, 342995704, 343352124, 343912673, 344585053, 346977248, 347218098, 347262163, 347278576, 347438191, 347655959, 347684788, 347726430, 347727772, 347776035, 347776629, 349500753, 350880161, 350887073, 353384123, 355496998, 355906922, 355979793, 356545959, 358637867, 358905016, 359164318, 359247286, 359350571, 359579447, 365560330, 367399355, 367420285, 367510727, 368013212, 370234760, 370353345, 370710317, 371074566, 371122285, 371194213, 371448425, 371448430, 371545055, 371593469, 371596922, 371758751, 371964792, 372151328, 376550136, 376710172, 376795771, 376826271, 376906556, 380514830, 380774774, 380775037, 381030322, 381136500, 381281631, 381282269, 381285504, 381330595, 381331422, 381335911, 381336484, 383907298, 383917408, 384595009, 384595013, 387799894, 387823201, 392581647, 392584937, 392742684, 392906485, 393003349, 400644707, 400973830, 404428547, 404432113, 404432865, 404469244, 404478897, 404694860, 406887479, 408294949, 408789955, 410022510, 410467324, 410586448, 410945965, 411845275, 414327152, 414327932, 414329781, 414346257, 414346439, 414639928, 414835998, 414894517, 414986533, 417465377, 417465381, 417492216, 418259232, 419310946, 420103495, 420242342, 420380455, 420658662, 420717432, 423183880, 424539259, 425929170, 425972964, 426050649, 426126450, 426142833, 426607922, 437289840, 437347469, 437412335, 437423943, 437455540, 437462252, 437597991, 437617485, 437986305, 437986507, 437986828, 437987072, 438015591, 438034813, 438038966, 438179623, 438347971, 438483573, 438547062, 438895551, 441592676, 442032555, 443548979, 447881379, 447881655, 447881895, 447887844, 448416189, 448445746, 448449012, 450942191, 452816744, 453668677, 454434495, 456610076, 456642844, 456738709, 457544600, 459451897, 459680944, 468058810, 468083581, 470964084, 471470955, 471567278, 472267822, 481177859, 481210627, 481435874, 481455115, 481485378, 481490218, 485105638, 486005878, 486383494, 487988916, 488103783, 490661867, 491574090, 491578272, 493041952, 493441205, 493582844, 493716979, 504577572, 504740359, 505091638, 505592418, 505656212, 509516275, 514998531, 515571132, 515594682, 518712698, 521362273, 526592419, 526807354, 527348842, 538294791, 544689535, 545535009, 548544752, 548563346, 548595116, 551679010, 558034099, 560329411, 560356209, 560671018, 560671152, 560692590, 560845442, 569212097, 569474241, 572252718, 575326764, 576174758, 576190819, 582099184, 582099438, 582372519, 582558889, 586552164, 591325418, 594231990, 594243961, 605711268, 615672071, 616086845, 621792370, 624879850, 627432831, 640040548, 654392808, 658675477, 659420283, 672891587, 694768102, 705890982, 725543146, 759097578, 761686526, 795383908, 878105336, 908643300, 945213471 };
 staticJArray<int32_t,int32_t> nsHtml5AttributeName::ATTRIBUTE_HASHES = { ATTRIBUTE_HASHES_DATA, MOZ_ARRAY_LENGTH(ATTRIBUTE_HASHES_DATA) };
 void
 nsHtml5AttributeName::initializeStatics()
 {
   ALL_NO_NS = new int32_t[3];
   ALL_NO_NS[0] = kNameSpaceID_None;
   ALL_NO_NS[1] = kNameSpaceID_None;
   ALL_NO_NS[2] = kNameSpaceID_None;
@@ -1105,17 +1101,16 @@ nsHtml5AttributeName::initializeStatics(
   ATTR_AMPLITUDE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::amplitude), ALL_NO_PREFIX);
   ATTR_ARIA_LIVE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_live), ALL_NO_PREFIX);
   ATTR_CLIP_RULE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::clip_rule), ALL_NO_PREFIX);
   ATTR_CLIP_PATH = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::clip_path), ALL_NO_PREFIX);
   ATTR_EQUALROWS = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::equalrows), ALL_NO_PREFIX);
   ATTR_ELEVATION = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::elevation), ALL_NO_PREFIX);
   ATTR_DIRECTION = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::direction), ALL_NO_PREFIX);
   ATTR_DRAGGABLE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::draggable), ALL_NO_PREFIX);
-  ATTR_FILTERRES = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::filterres, nsHtml5Atoms::filterRes), ALL_NO_PREFIX);
   ATTR_FILL_RULE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fill_rule), ALL_NO_PREFIX);
   ATTR_FONTSTYLE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fontstyle), ALL_NO_PREFIX);
   ATTR_FONT_SIZE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_size), ALL_NO_PREFIX);
   ATTR_KEYSYSTEM = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::keysystem), ALL_NO_PREFIX);
   ATTR_KEYPOINTS = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::keypoints, nsHtml5Atoms::keyPoints), ALL_NO_PREFIX);
   ATTR_HIDEFOCUS = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::hidefocus), ALL_NO_PREFIX);
   ATTR_ONMESSAGE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmessage), ALL_NO_PREFIX);
   ATTR_INTERCEPT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::intercept), ALL_NO_PREFIX);
@@ -1346,34 +1341,32 @@ nsHtml5AttributeName::initializeStatics(
   ATTR_ONCONTROLSELECT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::oncontrolselect), ALL_NO_PREFIX);
   ATTR_IMAGE_RENDERING = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::image_rendering), ALL_NO_PREFIX);
   ATTR_MEDIUMMATHSPACE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mediummathspace), ALL_NO_PREFIX);
   ATTR_TEXT_DECORATION = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::text_decoration), ALL_NO_PREFIX);
   ATTR_SHAPE_RENDERING = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::shape_rendering), ALL_NO_PREFIX);
   ATTR_STROKE_LINEJOIN = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_linejoin), ALL_NO_PREFIX);
   ATTR_REPEAT_TEMPLATE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::repeat_template), ALL_NO_PREFIX);
   ATTR_ARIA_DESCRIBEDBY = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_describedby), ALL_NO_PREFIX);
-  ATTR_CONTENTSTYLETYPE = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::contentstyletype, nsHtml5Atoms::contentStyleType), ALL_NO_PREFIX);
   ATTR_FONT_SIZE_ADJUST = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_size_adjust), ALL_NO_PREFIX);
   ATTR_KERNELUNITLENGTH = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::kernelunitlength, nsHtml5Atoms::kernelUnitLength), ALL_NO_PREFIX);
   ATTR_ONBEFOREACTIVATE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforeactivate), ALL_NO_PREFIX);
   ATTR_ONPROPERTYCHANGE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onpropertychange), ALL_NO_PREFIX);
   ATTR_ONDATASETCHANGED = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondatasetchanged), ALL_NO_PREFIX);
   ATTR_MASKCONTENTUNITS = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::maskcontentunits, nsHtml5Atoms::maskContentUnits), ALL_NO_PREFIX);
   ATTR_PATTERNTRANSFORM = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::patterntransform, nsHtml5Atoms::patternTransform), ALL_NO_PREFIX);
   ATTR_REQUIREDFEATURES = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::requiredfeatures, nsHtml5Atoms::requiredFeatures), ALL_NO_PREFIX);
   ATTR_RENDERING_INTENT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rendering_intent), ALL_NO_PREFIX);
   ATTR_SPECULAREXPONENT = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::specularexponent, nsHtml5Atoms::specularExponent), ALL_NO_PREFIX);
   ATTR_SPECULARCONSTANT = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::specularconstant, nsHtml5Atoms::specularConstant), ALL_NO_PREFIX);
   ATTR_SUPERSCRIPTSHIFT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::superscriptshift), ALL_NO_PREFIX);
   ATTR_STROKE_DASHARRAY = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_dasharray), ALL_NO_PREFIX);
   ATTR_XCHANNELSELECTOR = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::xchannelselector, nsHtml5Atoms::xChannelSelector), ALL_NO_PREFIX);
   ATTR_YCHANNELSELECTOR = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::ychannelselector, nsHtml5Atoms::yChannelSelector), ALL_NO_PREFIX);
   ATTR_ARIA_AUTOCOMPLETE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_autocomplete), ALL_NO_PREFIX);
-  ATTR_CONTENTSCRIPTTYPE = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::contentscripttype, nsHtml5Atoms::contentScriptType), ALL_NO_PREFIX);
   ATTR_ENABLE_BACKGROUND = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::enable_background), ALL_NO_PREFIX);
   ATTR_DOMINANT_BASELINE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::dominant_baseline), ALL_NO_PREFIX);
   ATTR_GRADIENTTRANSFORM = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::gradienttransform, nsHtml5Atoms::gradientTransform), ALL_NO_PREFIX);
   ATTR_ONBEFORDEACTIVATE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbefordeactivate), ALL_NO_PREFIX);
   ATTR_ONDATASETCOMPLETE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondatasetcomplete), ALL_NO_PREFIX);
   ATTR_OVERLINE_POSITION = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::overline_position), ALL_NO_PREFIX);
   ATTR_ONBEFOREEDITFOCUS = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforeeditfocus), ALL_NO_PREFIX);
   ATTR_LIMITINGCONEANGLE = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::limitingconeangle, nsHtml5Atoms::limitingConeAngle), ALL_NO_PREFIX);
@@ -1392,21 +1385,20 @@ nsHtml5AttributeName::initializeStatics(
   ATTR_PATTERNCONTENTUNITS = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::patterncontentunits, nsHtml5Atoms::patternContentUnits), ALL_NO_PREFIX);
   ATTR_ARIA_MULTISELECTABLE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_multiselectable), ALL_NO_PREFIX);
   ATTR_SCRIPTSIZEMULTIPLIER = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scriptsizemultiplier), ALL_NO_PREFIX);
   ATTR_ARIA_ACTIVEDESCENDANT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_activedescendant), ALL_NO_PREFIX);
   ATTR_VERYVERYTHINMATHSPACE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::veryverythinmathspace), ALL_NO_PREFIX);
   ATTR_VERYVERYTHICKMATHSPACE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::veryverythickmathspace), ALL_NO_PREFIX);
   ATTR_STRIKETHROUGH_POSITION = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::strikethrough_position), ALL_NO_PREFIX);
   ATTR_STRIKETHROUGH_THICKNESS = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::strikethrough_thickness), ALL_NO_PREFIX);
-  ATTR_EXTERNALRESOURCESREQUIRED = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::externalresourcesrequired, nsHtml5Atoms::externalResourcesRequired), ALL_NO_PREFIX);
   ATTR_GLYPH_ORIENTATION_VERTICAL = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::glyph_orientation_vertical), ALL_NO_PREFIX);
   ATTR_COLOR_INTERPOLATION_FILTERS = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::color_interpolation_filters), ALL_NO_PREFIX);
   ATTR_GLYPH_ORIENTATION_HORIZONTAL = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::glyph_orientation_horizontal), ALL_NO_PREFIX);
-  ATTRIBUTE_NAMES = new nsHtml5AttributeName*[584];
+  ATTRIBUTE_NAMES = new nsHtml5AttributeName*[580];
   ATTRIBUTE_NAMES[0] = ATTR_D;
   ATTRIBUTE_NAMES[1] = ATTR_K;
   ATTRIBUTE_NAMES[2] = ATTR_R;
   ATTRIBUTE_NAMES[3] = ATTR_X;
   ATTRIBUTE_NAMES[4] = ATTR_Y;
   ATTRIBUTE_NAMES[5] = ATTR_Z;
   ATTRIBUTE_NAMES[6] = ATTR_BY;
   ATTRIBUTE_NAMES[7] = ATTR_CX;
@@ -1690,307 +1682,303 @@ nsHtml5AttributeName::initializeStatics(
   ATTRIBUTE_NAMES[285] = ATTR_AMPLITUDE;
   ATTRIBUTE_NAMES[286] = ATTR_ARIA_LIVE;
   ATTRIBUTE_NAMES[287] = ATTR_CLIP_RULE;
   ATTRIBUTE_NAMES[288] = ATTR_CLIP_PATH;
   ATTRIBUTE_NAMES[289] = ATTR_EQUALROWS;
   ATTRIBUTE_NAMES[290] = ATTR_ELEVATION;
   ATTRIBUTE_NAMES[291] = ATTR_DIRECTION;
   ATTRIBUTE_NAMES[292] = ATTR_DRAGGABLE;
-  ATTRIBUTE_NAMES[293] = ATTR_FILTERRES;
-  ATTRIBUTE_NAMES[294] = ATTR_FILL_RULE;
-  ATTRIBUTE_NAMES[295] = ATTR_FONTSTYLE;
-  ATTRIBUTE_NAMES[296] = ATTR_FONT_SIZE;
-  ATTRIBUTE_NAMES[297] = ATTR_KEYSYSTEM;
-  ATTRIBUTE_NAMES[298] = ATTR_KEYPOINTS;
-  ATTRIBUTE_NAMES[299] = ATTR_HIDEFOCUS;
-  ATTRIBUTE_NAMES[300] = ATTR_ONMESSAGE;
-  ATTRIBUTE_NAMES[301] = ATTR_INTERCEPT;
-  ATTRIBUTE_NAMES[302] = ATTR_ONDRAGEND;
-  ATTRIBUTE_NAMES[303] = ATTR_ONMOVEEND;
-  ATTRIBUTE_NAMES[304] = ATTR_ONINVALID;
-  ATTRIBUTE_NAMES[305] = ATTR_ONKEYDOWN;
-  ATTRIBUTE_NAMES[306] = ATTR_ONFOCUSIN;
-  ATTRIBUTE_NAMES[307] = ATTR_ONMOUSEUP;
-  ATTRIBUTE_NAMES[308] = ATTR_INPUTMODE;
-  ATTRIBUTE_NAMES[309] = ATTR_ONROWEXIT;
-  ATTRIBUTE_NAMES[310] = ATTR_MATHCOLOR;
-  ATTRIBUTE_NAMES[311] = ATTR_MASKUNITS;
-  ATTRIBUTE_NAMES[312] = ATTR_MAXLENGTH;
-  ATTRIBUTE_NAMES[313] = ATTR_LINEBREAK;
-  ATTRIBUTE_NAMES[314] = ATTR_TRANSFORM;
-  ATTRIBUTE_NAMES[315] = ATTR_V_HANGING;
-  ATTRIBUTE_NAMES[316] = ATTR_VALUETYPE;
-  ATTRIBUTE_NAMES[317] = ATTR_POINTSATZ;
-  ATTRIBUTE_NAMES[318] = ATTR_POINTSATX;
-  ATTRIBUTE_NAMES[319] = ATTR_POINTSATY;
-  ATTRIBUTE_NAMES[320] = ATTR_SYMMETRIC;
-  ATTRIBUTE_NAMES[321] = ATTR_SCROLLING;
-  ATTRIBUTE_NAMES[322] = ATTR_REPEATDUR;
-  ATTRIBUTE_NAMES[323] = ATTR_SELECTION;
-  ATTRIBUTE_NAMES[324] = ATTR_SEPARATOR;
-  ATTRIBUTE_NAMES[325] = ATTR_XML_SPACE;
-  ATTRIBUTE_NAMES[326] = ATTR_AUTOSUBMIT;
-  ATTRIBUTE_NAMES[327] = ATTR_ALPHABETIC;
-  ATTRIBUTE_NAMES[328] = ATTR_ACTIONTYPE;
-  ATTRIBUTE_NAMES[329] = ATTR_ACCUMULATE;
-  ATTRIBUTE_NAMES[330] = ATTR_ARIA_LEVEL;
-  ATTRIBUTE_NAMES[331] = ATTR_COLUMNSPAN;
-  ATTRIBUTE_NAMES[332] = ATTR_CAP_HEIGHT;
-  ATTRIBUTE_NAMES[333] = ATTR_BACKGROUND;
-  ATTRIBUTE_NAMES[334] = ATTR_GLYPH_NAME;
-  ATTRIBUTE_NAMES[335] = ATTR_GROUPALIGN;
-  ATTRIBUTE_NAMES[336] = ATTR_FONTFAMILY;
-  ATTRIBUTE_NAMES[337] = ATTR_FONTWEIGHT;
-  ATTRIBUTE_NAMES[338] = ATTR_FONT_STYLE;
-  ATTRIBUTE_NAMES[339] = ATTR_KEYSPLINES;
-  ATTRIBUTE_NAMES[340] = ATTR_HTTP_EQUIV;
-  ATTRIBUTE_NAMES[341] = ATTR_ONACTIVATE;
-  ATTRIBUTE_NAMES[342] = ATTR_OCCURRENCE;
-  ATTRIBUTE_NAMES[343] = ATTR_IRRELEVANT;
-  ATTRIBUTE_NAMES[344] = ATTR_ONDBLCLICK;
-  ATTRIBUTE_NAMES[345] = ATTR_ONDRAGDROP;
-  ATTRIBUTE_NAMES[346] = ATTR_ONKEYPRESS;
-  ATTRIBUTE_NAMES[347] = ATTR_ONROWENTER;
-  ATTRIBUTE_NAMES[348] = ATTR_ONDRAGOVER;
-  ATTRIBUTE_NAMES[349] = ATTR_ONFOCUSOUT;
-  ATTRIBUTE_NAMES[350] = ATTR_ONMOUSEOUT;
-  ATTRIBUTE_NAMES[351] = ATTR_NUMOCTAVES;
-  ATTRIBUTE_NAMES[352] = ATTR_MARKER_MID;
-  ATTRIBUTE_NAMES[353] = ATTR_MARKER_END;
-  ATTRIBUTE_NAMES[354] = ATTR_TEXTLENGTH;
-  ATTRIBUTE_NAMES[355] = ATTR_VISIBILITY;
-  ATTRIBUTE_NAMES[356] = ATTR_VIEWTARGET;
-  ATTRIBUTE_NAMES[357] = ATTR_VERT_ADV_Y;
-  ATTRIBUTE_NAMES[358] = ATTR_PATHLENGTH;
-  ATTRIBUTE_NAMES[359] = ATTR_REPEAT_MAX;
-  ATTRIBUTE_NAMES[360] = ATTR_RADIOGROUP;
-  ATTRIBUTE_NAMES[361] = ATTR_STOP_COLOR;
-  ATTRIBUTE_NAMES[362] = ATTR_SEPARATORS;
-  ATTRIBUTE_NAMES[363] = ATTR_REPEAT_MIN;
-  ATTRIBUTE_NAMES[364] = ATTR_ROWSPACING;
-  ATTRIBUTE_NAMES[365] = ATTR_ZOOMANDPAN;
-  ATTRIBUTE_NAMES[366] = ATTR_XLINK_TYPE;
-  ATTRIBUTE_NAMES[367] = ATTR_XLINK_ROLE;
-  ATTRIBUTE_NAMES[368] = ATTR_XLINK_HREF;
-  ATTRIBUTE_NAMES[369] = ATTR_XLINK_SHOW;
-  ATTRIBUTE_NAMES[370] = ATTR_ACCENTUNDER;
-  ATTRIBUTE_NAMES[371] = ATTR_ARIA_SECRET;
-  ATTRIBUTE_NAMES[372] = ATTR_ARIA_ATOMIC;
-  ATTRIBUTE_NAMES[373] = ATTR_ARIA_HIDDEN;
-  ATTRIBUTE_NAMES[374] = ATTR_ARIA_FLOWTO;
-  ATTRIBUTE_NAMES[375] = ATTR_ARABIC_FORM;
-  ATTRIBUTE_NAMES[376] = ATTR_CELLPADDING;
-  ATTRIBUTE_NAMES[377] = ATTR_CELLSPACING;
-  ATTRIBUTE_NAMES[378] = ATTR_COLUMNWIDTH;
-  ATTRIBUTE_NAMES[379] = ATTR_CROSSORIGIN;
-  ATTRIBUTE_NAMES[380] = ATTR_COLUMNALIGN;
-  ATTRIBUTE_NAMES[381] = ATTR_COLUMNLINES;
-  ATTRIBUTE_NAMES[382] = ATTR_CONTEXTMENU;
-  ATTRIBUTE_NAMES[383] = ATTR_BASEPROFILE;
-  ATTRIBUTE_NAMES[384] = ATTR_FONT_FAMILY;
-  ATTRIBUTE_NAMES[385] = ATTR_FRAMEBORDER;
-  ATTRIBUTE_NAMES[386] = ATTR_FILTERUNITS;
-  ATTRIBUTE_NAMES[387] = ATTR_FLOOD_COLOR;
-  ATTRIBUTE_NAMES[388] = ATTR_FONT_WEIGHT;
-  ATTRIBUTE_NAMES[389] = ATTR_HORIZ_ADV_X;
-  ATTRIBUTE_NAMES[390] = ATTR_ONDRAGLEAVE;
-  ATTRIBUTE_NAMES[391] = ATTR_ONMOUSEMOVE;
-  ATTRIBUTE_NAMES[392] = ATTR_ORIENTATION;
-  ATTRIBUTE_NAMES[393] = ATTR_ONMOUSEDOWN;
-  ATTRIBUTE_NAMES[394] = ATTR_ONMOUSEOVER;
-  ATTRIBUTE_NAMES[395] = ATTR_ONDRAGENTER;
-  ATTRIBUTE_NAMES[396] = ATTR_IDEOGRAPHIC;
-  ATTRIBUTE_NAMES[397] = ATTR_ONBEFORECUT;
-  ATTRIBUTE_NAMES[398] = ATTR_ONFORMINPUT;
-  ATTRIBUTE_NAMES[399] = ATTR_ONDRAGSTART;
-  ATTRIBUTE_NAMES[400] = ATTR_ONMOVESTART;
-  ATTRIBUTE_NAMES[401] = ATTR_MARKERUNITS;
-  ATTRIBUTE_NAMES[402] = ATTR_MATHVARIANT;
-  ATTRIBUTE_NAMES[403] = ATTR_MARGINWIDTH;
-  ATTRIBUTE_NAMES[404] = ATTR_MARKERWIDTH;
-  ATTRIBUTE_NAMES[405] = ATTR_TEXT_ANCHOR;
-  ATTRIBUTE_NAMES[406] = ATTR_TABLEVALUES;
-  ATTRIBUTE_NAMES[407] = ATTR_SCRIPTLEVEL;
-  ATTRIBUTE_NAMES[408] = ATTR_REPEATCOUNT;
-  ATTRIBUTE_NAMES[409] = ATTR_STITCHTILES;
-  ATTRIBUTE_NAMES[410] = ATTR_STARTOFFSET;
-  ATTRIBUTE_NAMES[411] = ATTR_SCROLLDELAY;
-  ATTRIBUTE_NAMES[412] = ATTR_XMLNS_XLINK;
-  ATTRIBUTE_NAMES[413] = ATTR_XLINK_TITLE;
-  ATTRIBUTE_NAMES[414] = ATTR_ARIA_INVALID;
-  ATTRIBUTE_NAMES[415] = ATTR_ARIA_PRESSED;
-  ATTRIBUTE_NAMES[416] = ATTR_ARIA_CHECKED;
-  ATTRIBUTE_NAMES[417] = ATTR_AUTOCOMPLETE;
-  ATTRIBUTE_NAMES[418] = ATTR_ARIA_SETSIZE;
-  ATTRIBUTE_NAMES[419] = ATTR_ARIA_CHANNEL;
-  ATTRIBUTE_NAMES[420] = ATTR_EQUALCOLUMNS;
-  ATTRIBUTE_NAMES[421] = ATTR_DISPLAYSTYLE;
-  ATTRIBUTE_NAMES[422] = ATTR_DATAFORMATAS;
-  ATTRIBUTE_NAMES[423] = ATTR_FILL_OPACITY;
-  ATTRIBUTE_NAMES[424] = ATTR_FONT_VARIANT;
-  ATTRIBUTE_NAMES[425] = ATTR_FONT_STRETCH;
-  ATTRIBUTE_NAMES[426] = ATTR_FRAMESPACING;
-  ATTRIBUTE_NAMES[427] = ATTR_KERNELMATRIX;
-  ATTRIBUTE_NAMES[428] = ATTR_ONDEACTIVATE;
-  ATTRIBUTE_NAMES[429] = ATTR_ONROWSDELETE;
-  ATTRIBUTE_NAMES[430] = ATTR_ONMOUSELEAVE;
-  ATTRIBUTE_NAMES[431] = ATTR_ONFORMCHANGE;
-  ATTRIBUTE_NAMES[432] = ATTR_ONCELLCHANGE;
-  ATTRIBUTE_NAMES[433] = ATTR_ONMOUSEWHEEL;
-  ATTRIBUTE_NAMES[434] = ATTR_ONMOUSEENTER;
-  ATTRIBUTE_NAMES[435] = ATTR_ONAFTERPRINT;
-  ATTRIBUTE_NAMES[436] = ATTR_ONBEFORECOPY;
-  ATTRIBUTE_NAMES[437] = ATTR_MARGINHEIGHT;
-  ATTRIBUTE_NAMES[438] = ATTR_MARKERHEIGHT;
-  ATTRIBUTE_NAMES[439] = ATTR_MARKER_START;
-  ATTRIBUTE_NAMES[440] = ATTR_MATHEMATICAL;
-  ATTRIBUTE_NAMES[441] = ATTR_LENGTHADJUST;
-  ATTRIBUTE_NAMES[442] = ATTR_UNSELECTABLE;
-  ATTRIBUTE_NAMES[443] = ATTR_UNICODE_BIDI;
-  ATTRIBUTE_NAMES[444] = ATTR_UNITS_PER_EM;
-  ATTRIBUTE_NAMES[445] = ATTR_WORD_SPACING;
-  ATTRIBUTE_NAMES[446] = ATTR_WRITING_MODE;
-  ATTRIBUTE_NAMES[447] = ATTR_V_ALPHABETIC;
-  ATTRIBUTE_NAMES[448] = ATTR_PATTERNUNITS;
-  ATTRIBUTE_NAMES[449] = ATTR_SPREADMETHOD;
-  ATTRIBUTE_NAMES[450] = ATTR_SURFACESCALE;
-  ATTRIBUTE_NAMES[451] = ATTR_STROKE_WIDTH;
-  ATTRIBUTE_NAMES[452] = ATTR_REPEAT_START;
-  ATTRIBUTE_NAMES[453] = ATTR_STDDEVIATION;
-  ATTRIBUTE_NAMES[454] = ATTR_STOP_OPACITY;
-  ATTRIBUTE_NAMES[455] = ATTR_ARIA_CONTROLS;
-  ATTRIBUTE_NAMES[456] = ATTR_ARIA_HASPOPUP;
-  ATTRIBUTE_NAMES[457] = ATTR_ACCENT_HEIGHT;
-  ATTRIBUTE_NAMES[458] = ATTR_ARIA_VALUENOW;
-  ATTRIBUTE_NAMES[459] = ATTR_ARIA_RELEVANT;
-  ATTRIBUTE_NAMES[460] = ATTR_ARIA_POSINSET;
-  ATTRIBUTE_NAMES[461] = ATTR_ARIA_VALUEMAX;
-  ATTRIBUTE_NAMES[462] = ATTR_ARIA_READONLY;
-  ATTRIBUTE_NAMES[463] = ATTR_ARIA_SELECTED;
-  ATTRIBUTE_NAMES[464] = ATTR_ARIA_REQUIRED;
-  ATTRIBUTE_NAMES[465] = ATTR_ARIA_EXPANDED;
-  ATTRIBUTE_NAMES[466] = ATTR_ARIA_DISABLED;
-  ATTRIBUTE_NAMES[467] = ATTR_ATTRIBUTETYPE;
-  ATTRIBUTE_NAMES[468] = ATTR_ATTRIBUTENAME;
-  ATTRIBUTE_NAMES[469] = ATTR_ARIA_DATATYPE;
-  ATTRIBUTE_NAMES[470] = ATTR_ARIA_VALUEMIN;
-  ATTRIBUTE_NAMES[471] = ATTR_BASEFREQUENCY;
-  ATTRIBUTE_NAMES[472] = ATTR_COLUMNSPACING;
-  ATTRIBUTE_NAMES[473] = ATTR_COLOR_PROFILE;
-  ATTRIBUTE_NAMES[474] = ATTR_CLIPPATHUNITS;
-  ATTRIBUTE_NAMES[475] = ATTR_DEFINITIONURL;
-  ATTRIBUTE_NAMES[476] = ATTR_GRADIENTUNITS;
-  ATTRIBUTE_NAMES[477] = ATTR_FLOOD_OPACITY;
-  ATTRIBUTE_NAMES[478] = ATTR_ONAFTERUPDATE;
-  ATTRIBUTE_NAMES[479] = ATTR_ONERRORUPDATE;
-  ATTRIBUTE_NAMES[480] = ATTR_ONBEFOREPASTE;
-  ATTRIBUTE_NAMES[481] = ATTR_ONLOSECAPTURE;
-  ATTRIBUTE_NAMES[482] = ATTR_ONCONTEXTMENU;
-  ATTRIBUTE_NAMES[483] = ATTR_ONSELECTSTART;
-  ATTRIBUTE_NAMES[484] = ATTR_ONBEFOREPRINT;
-  ATTRIBUTE_NAMES[485] = ATTR_MOVABLELIMITS;
-  ATTRIBUTE_NAMES[486] = ATTR_LINETHICKNESS;
-  ATTRIBUTE_NAMES[487] = ATTR_UNICODE_RANGE;
-  ATTRIBUTE_NAMES[488] = ATTR_THINMATHSPACE;
-  ATTRIBUTE_NAMES[489] = ATTR_VERT_ORIGIN_X;
-  ATTRIBUTE_NAMES[490] = ATTR_VERT_ORIGIN_Y;
-  ATTRIBUTE_NAMES[491] = ATTR_V_IDEOGRAPHIC;
-  ATTRIBUTE_NAMES[492] = ATTR_PRESERVEALPHA;
-  ATTRIBUTE_NAMES[493] = ATTR_SCRIPTMINSIZE;
-  ATTRIBUTE_NAMES[494] = ATTR_SPECIFICATION;
-  ATTRIBUTE_NAMES[495] = ATTR_XLINK_ACTUATE;
-  ATTRIBUTE_NAMES[496] = ATTR_XLINK_ARCROLE;
-  ATTRIBUTE_NAMES[497] = ATTR_ACCEPT_CHARSET;
-  ATTRIBUTE_NAMES[498] = ATTR_ALIGNMENTSCOPE;
-  ATTRIBUTE_NAMES[499] = ATTR_ARIA_MULTILINE;
-  ATTRIBUTE_NAMES[500] = ATTR_BASELINE_SHIFT;
-  ATTRIBUTE_NAMES[501] = ATTR_HORIZ_ORIGIN_X;
-  ATTRIBUTE_NAMES[502] = ATTR_HORIZ_ORIGIN_Y;
-  ATTRIBUTE_NAMES[503] = ATTR_ONBEFOREUPDATE;
-  ATTRIBUTE_NAMES[504] = ATTR_ONFILTERCHANGE;
-  ATTRIBUTE_NAMES[505] = ATTR_ONROWSINSERTED;
-  ATTRIBUTE_NAMES[506] = ATTR_ONBEFOREUNLOAD;
-  ATTRIBUTE_NAMES[507] = ATTR_MATHBACKGROUND;
-  ATTRIBUTE_NAMES[508] = ATTR_LETTER_SPACING;
-  ATTRIBUTE_NAMES[509] = ATTR_LIGHTING_COLOR;
-  ATTRIBUTE_NAMES[510] = ATTR_THICKMATHSPACE;
-  ATTRIBUTE_NAMES[511] = ATTR_TEXT_RENDERING;
-  ATTRIBUTE_NAMES[512] = ATTR_V_MATHEMATICAL;
-  ATTRIBUTE_NAMES[513] = ATTR_POINTER_EVENTS;
-  ATTRIBUTE_NAMES[514] = ATTR_PRIMITIVEUNITS;
-  ATTRIBUTE_NAMES[515] = ATTR_SYSTEMLANGUAGE;
-  ATTRIBUTE_NAMES[516] = ATTR_STROKE_LINECAP;
-  ATTRIBUTE_NAMES[517] = ATTR_SUBSCRIPTSHIFT;
-  ATTRIBUTE_NAMES[518] = ATTR_STROKE_OPACITY;
-  ATTRIBUTE_NAMES[519] = ATTR_ARIA_DROPEFFECT;
-  ATTRIBUTE_NAMES[520] = ATTR_ARIA_LABELLEDBY;
-  ATTRIBUTE_NAMES[521] = ATTR_ARIA_TEMPLATEID;
-  ATTRIBUTE_NAMES[522] = ATTR_COLOR_RENDERING;
-  ATTRIBUTE_NAMES[523] = ATTR_CONTENTEDITABLE;
-  ATTRIBUTE_NAMES[524] = ATTR_DIFFUSECONSTANT;
-  ATTRIBUTE_NAMES[525] = ATTR_ONDATAAVAILABLE;
-  ATTRIBUTE_NAMES[526] = ATTR_ONCONTROLSELECT;
-  ATTRIBUTE_NAMES[527] = ATTR_IMAGE_RENDERING;
-  ATTRIBUTE_NAMES[528] = ATTR_MEDIUMMATHSPACE;
-  ATTRIBUTE_NAMES[529] = ATTR_TEXT_DECORATION;
-  ATTRIBUTE_NAMES[530] = ATTR_SHAPE_RENDERING;
-  ATTRIBUTE_NAMES[531] = ATTR_STROKE_LINEJOIN;
-  ATTRIBUTE_NAMES[532] = ATTR_REPEAT_TEMPLATE;
-  ATTRIBUTE_NAMES[533] = ATTR_ARIA_DESCRIBEDBY;
-  ATTRIBUTE_NAMES[534] = ATTR_CONTENTSTYLETYPE;
-  ATTRIBUTE_NAMES[535] = ATTR_FONT_SIZE_ADJUST;
-  ATTRIBUTE_NAMES[536] = ATTR_KERNELUNITLENGTH;
-  ATTRIBUTE_NAMES[537] = ATTR_ONBEFOREACTIVATE;
-  ATTRIBUTE_NAMES[538] = ATTR_ONPROPERTYCHANGE;
-  ATTRIBUTE_NAMES[539] = ATTR_ONDATASETCHANGED;
-  ATTRIBUTE_NAMES[540] = ATTR_MASKCONTENTUNITS;
-  ATTRIBUTE_NAMES[541] = ATTR_PATTERNTRANSFORM;
-  ATTRIBUTE_NAMES[542] = ATTR_REQUIREDFEATURES;
-  ATTRIBUTE_NAMES[543] = ATTR_RENDERING_INTENT;
-  ATTRIBUTE_NAMES[544] = ATTR_SPECULAREXPONENT;
-  ATTRIBUTE_NAMES[545] = ATTR_SPECULARCONSTANT;
-  ATTRIBUTE_NAMES[546] = ATTR_SUPERSCRIPTSHIFT;
-  ATTRIBUTE_NAMES[547] = ATTR_STROKE_DASHARRAY;
-  ATTRIBUTE_NAMES[548] = ATTR_XCHANNELSELECTOR;
-  ATTRIBUTE_NAMES[549] = ATTR_YCHANNELSELECTOR;
-  ATTRIBUTE_NAMES[550] = ATTR_ARIA_AUTOCOMPLETE;
-  ATTRIBUTE_NAMES[551] = ATTR_CONTENTSCRIPTTYPE;
-  ATTRIBUTE_NAMES[552] = ATTR_ENABLE_BACKGROUND;
-  ATTRIBUTE_NAMES[553] = ATTR_DOMINANT_BASELINE;
-  ATTRIBUTE_NAMES[554] = ATTR_GRADIENTTRANSFORM;
-  ATTRIBUTE_NAMES[555] = ATTR_ONBEFORDEACTIVATE;
-  ATTRIBUTE_NAMES[556] = ATTR_ONDATASETCOMPLETE;
-  ATTRIBUTE_NAMES[557] = ATTR_OVERLINE_POSITION;
-  ATTRIBUTE_NAMES[558] = ATTR_ONBEFOREEDITFOCUS;
-  ATTRIBUTE_NAMES[559] = ATTR_LIMITINGCONEANGLE;
-  ATTRIBUTE_NAMES[560] = ATTR_VERYTHINMATHSPACE;
-  ATTRIBUTE_NAMES[561] = ATTR_STROKE_DASHOFFSET;
-  ATTRIBUTE_NAMES[562] = ATTR_STROKE_MITERLIMIT;
-  ATTRIBUTE_NAMES[563] = ATTR_ALIGNMENT_BASELINE;
-  ATTRIBUTE_NAMES[564] = ATTR_ONREADYSTATECHANGE;
-  ATTRIBUTE_NAMES[565] = ATTR_OVERLINE_THICKNESS;
-  ATTRIBUTE_NAMES[566] = ATTR_UNDERLINE_POSITION;
-  ATTRIBUTE_NAMES[567] = ATTR_VERYTHICKMATHSPACE;
-  ATTRIBUTE_NAMES[568] = ATTR_REQUIREDEXTENSIONS;
-  ATTRIBUTE_NAMES[569] = ATTR_COLOR_INTERPOLATION;
-  ATTRIBUTE_NAMES[570] = ATTR_UNDERLINE_THICKNESS;
-  ATTRIBUTE_NAMES[571] = ATTR_PRESERVEASPECTRATIO;
-  ATTRIBUTE_NAMES[572] = ATTR_PATTERNCONTENTUNITS;
-  ATTRIBUTE_NAMES[573] = ATTR_ARIA_MULTISELECTABLE;
-  ATTRIBUTE_NAMES[574] = ATTR_SCRIPTSIZEMULTIPLIER;
-  ATTRIBUTE_NAMES[575] = ATTR_ARIA_ACTIVEDESCENDANT;
-  ATTRIBUTE_NAMES[576] = ATTR_VERYVERYTHINMATHSPACE;
-  ATTRIBUTE_NAMES[577] = ATTR_VERYVERYTHICKMATHSPACE;
-  ATTRIBUTE_NAMES[578] = ATTR_STRIKETHROUGH_POSITION;
-  ATTRIBUTE_NAMES[579] = ATTR_STRIKETHROUGH_THICKNESS;
-  ATTRIBUTE_NAMES[580] = ATTR_EXTERNALRESOURCESREQUIRED;
-  ATTRIBUTE_NAMES[581] = ATTR_GLYPH_ORIENTATION_VERTICAL;
-  ATTRIBUTE_NAMES[582] = ATTR_COLOR_INTERPOLATION_FILTERS;
-  ATTRIBUTE_NAMES[583] = ATTR_GLYPH_ORIENTATION_HORIZONTAL;
+  ATTRIBUTE_NAMES[293] = ATTR_FILL_RULE;
+  ATTRIBUTE_NAMES[294] = ATTR_FONTSTYLE;
+  ATTRIBUTE_NAMES[295] = ATTR_FONT_SIZE;
+  ATTRIBUTE_NAMES[296] = ATTR_KEYSYSTEM;
+  ATTRIBUTE_NAMES[297] = ATTR_KEYPOINTS;
+  ATTRIBUTE_NAMES[298] = ATTR_HIDEFOCUS;
+  ATTRIBUTE_NAMES[299] = ATTR_ONMESSAGE;
+  ATTRIBUTE_NAMES[300] = ATTR_INTERCEPT;
+  ATTRIBUTE_NAMES[301] = ATTR_ONDRAGEND;
+  ATTRIBUTE_NAMES[302] = ATTR_ONMOVEEND;
+  ATTRIBUTE_NAMES[303] = ATTR_ONINVALID;
+  ATTRIBUTE_NAMES[304] = ATTR_ONKEYDOWN;
+  ATTRIBUTE_NAMES[305] = ATTR_ONFOCUSIN;
+  ATTRIBUTE_NAMES[306] = ATTR_ONMOUSEUP;
+  ATTRIBUTE_NAMES[307] = ATTR_INPUTMODE;
+  ATTRIBUTE_NAMES[308] = ATTR_ONROWEXIT;
+  ATTRIBUTE_NAMES[309] = ATTR_MATHCOLOR;
+  ATTRIBUTE_NAMES[310] = ATTR_MASKUNITS;
+  ATTRIBUTE_NAMES[311] = ATTR_MAXLENGTH;
+  ATTRIBUTE_NAMES[312] = ATTR_LINEBREAK;
+  ATTRIBUTE_NAMES[313] = ATTR_TRANSFORM;
+  ATTRIBUTE_NAMES[314] = ATTR_V_HANGING;
+  ATTRIBUTE_NAMES[315] = ATTR_VALUETYPE;
+  ATTRIBUTE_NAMES[316] = ATTR_POINTSATZ;
+  ATTRIBUTE_NAMES[317] = ATTR_POINTSATX;
+  ATTRIBUTE_NAMES[318] = ATTR_POINTSATY;
+  ATTRIBUTE_NAMES[319] = ATTR_SYMMETRIC;
+  ATTRIBUTE_NAMES[320] = ATTR_SCROLLING;
+  ATTRIBUTE_NAMES[321] = ATTR_REPEATDUR;
+  ATTRIBUTE_NAMES[322] = ATTR_SELECTION;
+  ATTRIBUTE_NAMES[323] = ATTR_SEPARATOR;
+  ATTRIBUTE_NAMES[324] = ATTR_XML_SPACE;
+  ATTRIBUTE_NAMES[325] = ATTR_AUTOSUBMIT;
+  ATTRIBUTE_NAMES[326] = ATTR_ALPHABETIC;
+  ATTRIBUTE_NAMES[327] = ATTR_ACTIONTYPE;
+  ATTRIBUTE_NAMES[328] = ATTR_ACCUMULATE;
+  ATTRIBUTE_NAMES[329] = ATTR_ARIA_LEVEL;
+  ATTRIBUTE_NAMES[330] = ATTR_COLUMNSPAN;
+  ATTRIBUTE_NAMES[331] = ATTR_CAP_HEIGHT;
+  ATTRIBUTE_NAMES[332] = ATTR_BACKGROUND;
+  ATTRIBUTE_NAMES[333] = ATTR_GLYPH_NAME;
+  ATTRIBUTE_NAMES[334] = ATTR_GROUPALIGN;
+  ATTRIBUTE_NAMES[335] = ATTR_FONTFAMILY;
+  ATTRIBUTE_NAMES[336] = ATTR_FONTWEIGHT;
+  ATTRIBUTE_NAMES[337] = ATTR_FONT_STYLE;
+  ATTRIBUTE_NAMES[338] = ATTR_KEYSPLINES;
+  ATTRIBUTE_NAMES[339] = ATTR_HTTP_EQUIV;
+  ATTRIBUTE_NAMES[340] = ATTR_ONACTIVATE;
+  ATTRIBUTE_NAMES[341] = ATTR_OCCURRENCE;
+  ATTRIBUTE_NAMES[342] = ATTR_IRRELEVANT;
+  ATTRIBUTE_NAMES[343] = ATTR_ONDBLCLICK;
+  ATTRIBUTE_NAMES[344] = ATTR_ONDRAGDROP;
+  ATTRIBUTE_NAMES[345] = ATTR_ONKEYPRESS;
+  ATTRIBUTE_NAMES[346] = ATTR_ONROWENTER;
+  ATTRIBUTE_NAMES[347] = ATTR_ONDRAGOVER;
+  ATTRIBUTE_NAMES[348] = ATTR_ONFOCUSOUT;
+  ATTRIBUTE_NAMES[349] = ATTR_ONMOUSEOUT;
+  ATTRIBUTE_NAMES[350] = ATTR_NUMOCTAVES;
+  ATTRIBUTE_NAMES[351] = ATTR_MARKER_MID;
+  ATTRIBUTE_NAMES[352] = ATTR_MARKER_END;
+  ATTRIBUTE_NAMES[353] = ATTR_TEXTLENGTH;
+  ATTRIBUTE_NAMES[354] = ATTR_VISIBILITY;
+  ATTRIBUTE_NAMES[355] = ATTR_VIEWTARGET;
+  ATTRIBUTE_NAMES[356] = ATTR_VERT_ADV_Y;
+  ATTRIBUTE_NAMES[357] = ATTR_PATHLENGTH;
+  ATTRIBUTE_NAMES[358] = ATTR_REPEAT_MAX;
+  ATTRIBUTE_NAMES[359] = ATTR_RADIOGROUP;
+  ATTRIBUTE_NAMES[360] = ATTR_STOP_COLOR;
+  ATTRIBUTE_NAMES[361] = ATTR_SEPARATORS;
+  ATTRIBUTE_NAMES[362] = ATTR_REPEAT_MIN;
+  ATTRIBUTE_NAMES[363] = ATTR_ROWSPACING;
+  ATTRIBUTE_NAMES[364] = ATTR_ZOOMANDPAN;
+  ATTRIBUTE_NAMES[365] = ATTR_XLINK_TYPE;
+  ATTRIBUTE_NAMES[366] = ATTR_XLINK_ROLE;
+  ATTRIBUTE_NAMES[367] = ATTR_XLINK_HREF;
+  ATTRIBUTE_NAMES[368] = ATTR_XLINK_SHOW;
+  ATTRIBUTE_NAMES[369] = ATTR_ACCENTUNDER;
+  ATTRIBUTE_NAMES[370] = ATTR_ARIA_SECRET;
+  ATTRIBUTE_NAMES[371] = ATTR_ARIA_ATOMIC;
+  ATTRIBUTE_NAMES[372] = ATTR_ARIA_HIDDEN;
+  ATTRIBUTE_NAMES[373] = ATTR_ARIA_FLOWTO;
+  ATTRIBUTE_NAMES[374] = ATTR_ARABIC_FORM;
+  ATTRIBUTE_NAMES[375] = ATTR_CELLPADDING;
+  ATTRIBUTE_NAMES[376] = ATTR_CELLSPACING;
+  ATTRIBUTE_NAMES[377] = ATTR_COLUMNWIDTH;
+  ATTRIBUTE_NAMES[378] = ATTR_CROSSORIGIN;
+  ATTRIBUTE_NAMES[379] = ATTR_COLUMNALIGN;
+  ATTRIBUTE_NAMES[380] = ATTR_COLUMNLINES;
+  ATTRIBUTE_NAMES[381] = ATTR_CONTEXTMENU;
+  ATTRIBUTE_NAMES[382] = ATTR_BASEPROFILE;
+  ATTRIBUTE_NAMES[383] = ATTR_FONT_FAMILY;
+  ATTRIBUTE_NAMES[384] = ATTR_FRAMEBORDER;
+  ATTRIBUTE_NAMES[385] = ATTR_FILTERUNITS;
+  ATTRIBUTE_NAMES[386] = ATTR_FLOOD_COLOR;
+  ATTRIBUTE_NAMES[387] = ATTR_FONT_WEIGHT;
+  ATTRIBUTE_NAMES[388] = ATTR_HORIZ_ADV_X;
+  ATTRIBUTE_NAMES[389] = ATTR_ONDRAGLEAVE;
+  ATTRIBUTE_NAMES[390] = ATTR_ONMOUSEMOVE;
+  ATTRIBUTE_NAMES[391] = ATTR_ORIENTATION;
+  ATTRIBUTE_NAMES[392] = ATTR_ONMOUSEDOWN;
+  ATTRIBUTE_NAMES[393] = ATTR_ONMOUSEOVER;
+  ATTRIBUTE_NAMES[394] = ATTR_ONDRAGENTER;
+  ATTRIBUTE_NAMES[395] = ATTR_IDEOGRAPHIC;
+  ATTRIBUTE_NAMES[396] = ATTR_ONBEFORECUT;
+  ATTRIBUTE_NAMES[397] = ATTR_ONFORMINPUT;
+  ATTRIBUTE_NAMES[398] = ATTR_ONDRAGSTART;
+  ATTRIBUTE_NAMES[399] = ATTR_ONMOVESTART;
+  ATTRIBUTE_NAMES[400] = ATTR_MARKERUNITS;
+  ATTRIBUTE_NAMES[401] = ATTR_MATHVARIANT;
+  ATTRIBUTE_NAMES[402] = ATTR_MARGINWIDTH;
+  ATTRIBUTE_NAMES[403] = ATTR_MARKERWIDTH;
+  ATTRIBUTE_NAMES[404] = ATTR_TEXT_ANCHOR;
+  ATTRIBUTE_NAMES[405] = ATTR_TABLEVALUES;
+  ATTRIBUTE_NAMES[406] = ATTR_SCRIPTLEVEL;
+  ATTRIBUTE_NAMES[407] = ATTR_REPEATCOUNT;
+  ATTRIBUTE_NAMES[408] = ATTR_STITCHTILES;
+  ATTRIBUTE_NAMES[409] = ATTR_STARTOFFSET;
+  ATTRIBUTE_NAMES[410] = ATTR_SCROLLDELAY;
+  ATTRIBUTE_NAMES[411] = ATTR_XMLNS_XLINK;
+  ATTRIBUTE_NAMES[412] = ATTR_XLINK_TITLE;
+  ATTRIBUTE_NAMES[413] = ATTR_ARIA_INVALID;
+  ATTRIBUTE_NAMES[414] = ATTR_ARIA_PRESSED;
+  ATTRIBUTE_NAMES[415] = ATTR_ARIA_CHECKED;
+  ATTRIBUTE_NAMES[416] = ATTR_AUTOCOMPLETE;
+  ATTRIBUTE_NAMES[417] = ATTR_ARIA_SETSIZE;
+  ATTRIBUTE_NAMES[418] = ATTR_ARIA_CHANNEL;
+  ATTRIBUTE_NAMES[419] = ATTR_EQUALCOLUMNS;
+  ATTRIBUTE_NAMES[420] = ATTR_DISPLAYSTYLE;
+  ATTRIBUTE_NAMES[421] = ATTR_DATAFORMATAS;
+  ATTRIBUTE_NAMES[422] = ATTR_FILL_OPACITY;
+  ATTRIBUTE_NAMES[423] = ATTR_FONT_VARIANT;
+  ATTRIBUTE_NAMES[424] = ATTR_FONT_STRETCH;
+  ATTRIBUTE_NAMES[425] = ATTR_FRAMESPACING;
+  ATTRIBUTE_NAMES[426] = ATTR_KERNELMATRIX;
+  ATTRIBUTE_NAMES[427] = ATTR_ONDEACTIVATE;
+  ATTRIBUTE_NAMES[428] = ATTR_ONROWSDELETE;
+  ATTRIBUTE_NAMES[429] = ATTR_ONMOUSELEAVE;
+  ATTRIBUTE_NAMES[430] = ATTR_ONFORMCHANGE;
+  ATTRIBUTE_NAMES[431] = ATTR_ONCELLCHANGE;
+  ATTRIBUTE_NAMES[432] = ATTR_ONMOUSEWHEEL;
+  ATTRIBUTE_NAMES[433] = ATTR_ONMOUSEENTER;
+  ATTRIBUTE_NAMES[434] = ATTR_ONAFTERPRINT;
+  ATTRIBUTE_NAMES[435] = ATTR_ONBEFORECOPY;
+  ATTRIBUTE_NAMES[436] = ATTR_MARGINHEIGHT;
+  ATTRIBUTE_NAMES[437] = ATTR_MARKERHEIGHT;
+  ATTRIBUTE_NAMES[438] = ATTR_MARKER_START;
+  ATTRIBUTE_NAMES[439] = ATTR_MATHEMATICAL;
+  ATTRIBUTE_NAMES[440] = ATTR_LENGTHADJUST;
+  ATTRIBUTE_NAMES[441] = ATTR_UNSELECTABLE;
+  ATTRIBUTE_NAMES[442] = ATTR_UNICODE_BIDI;
+  ATTRIBUTE_NAMES[443] = ATTR_UNITS_PER_EM;
+  ATTRIBUTE_NAMES[444] = ATTR_WORD_SPACING;
+  ATTRIBUTE_NAMES[445] = ATTR_WRITING_MODE;
+  ATTRIBUTE_NAMES[446] = ATTR_V_ALPHABETIC;
+  ATTRIBUTE_NAMES[447] = ATTR_PATTERNUNITS;
+  ATTRIBUTE_NAMES[448] = ATTR_SPREADMETHOD;
+  ATTRIBUTE_NAMES[449] = ATTR_SURFACESCALE;
+  ATTRIBUTE_NAMES[450] = ATTR_STROKE_WIDTH;
+  ATTRIBUTE_NAMES[451] = ATTR_REPEAT_START;
+  ATTRIBUTE_NAMES[452] = ATTR_STDDEVIATION;
+  ATTRIBUTE_NAMES[453] = ATTR_STOP_OPACITY;
+  ATTRIBUTE_NAMES[454] = ATTR_ARIA_CONTROLS;
+  ATTRIBUTE_NAMES[455] = ATTR_ARIA_HASPOPUP;
+  ATTRIBUTE_NAMES[456] = ATTR_ACCENT_HEIGHT;
+  ATTRIBUTE_NAMES[457] = ATTR_ARIA_VALUENOW;
+  ATTRIBUTE_NAMES[458] = ATTR_ARIA_RELEVANT;
+  ATTRIBUTE_NAMES[459] = ATTR_ARIA_POSINSET;
+  ATTRIBUTE_NAMES[460] = ATTR_ARIA_VALUEMAX;
+  ATTRIBUTE_NAMES[461] = ATTR_ARIA_READONLY;
+  ATTRIBUTE_NAMES[462] = ATTR_ARIA_SELECTED;
+  ATTRIBUTE_NAMES[463] = ATTR_ARIA_REQUIRED;
+  ATTRIBUTE_NAMES[464] = ATTR_ARIA_EXPANDED;
+  ATTRIBUTE_NAMES[465] = ATTR_ARIA_DISABLED;
+  ATTRIBUTE_NAMES[466] = ATTR_ATTRIBUTETYPE;
+  ATTRIBUTE_NAMES[467] = ATTR_ATTRIBUTENAME;
+  ATTRIBUTE_NAMES[468] = ATTR_ARIA_DATATYPE;
+  ATTRIBUTE_NAMES[469] = ATTR_ARIA_VALUEMIN;
+  ATTRIBUTE_NAMES[470] = ATTR_BASEFREQUENCY;
+  ATTRIBUTE_NAMES[471] = ATTR_COLUMNSPACING;
+  ATTRIBUTE_NAMES[472] = ATTR_COLOR_PROFILE;
+  ATTRIBUTE_NAMES[473] = ATTR_CLIPPATHUNITS;
+  ATTRIBUTE_NAMES[474] = ATTR_DEFINITIONURL;
+  ATTRIBUTE_NAMES[475] = ATTR_GRADIENTUNITS;
+  ATTRIBUTE_NAMES[476] = ATTR_FLOOD_OPACITY;
+  ATTRIBUTE_NAMES[477] = ATTR_ONAFTERUPDATE;
+  ATTRIBUTE_NAMES[478] = ATTR_ONERRORUPDATE;
+  ATTRIBUTE_NAMES[479] = ATTR_ONBEFOREPASTE;
+  ATTRIBUTE_NAMES[480] = ATTR_ONLOSECAPTURE;
+  ATTRIBUTE_NAMES[481] = ATTR_ONCONTEXTMENU;
+  ATTRIBUTE_NAMES[482] = ATTR_ONSELECTSTART;
+  ATTRIBUTE_NAMES[483] = ATTR_ONBEFOREPRINT;
+  ATTRIBUTE_NAMES[484] = ATTR_MOVABLELIMITS;
+  ATTRIBUTE_NAMES[485] = ATTR_LINETHICKNESS;
+  ATTRIBUTE_NAMES[486] = ATTR_UNICODE_RANGE;
+  ATTRIBUTE_NAMES[487] = ATTR_THINMATHSPACE;
+  ATTRIBUTE_NAMES[488] = ATTR_VERT_ORIGIN_X;
+  ATTRIBUTE_NAMES[489] = ATTR_VERT_ORIGIN_Y;
+  ATTRIBUTE_NAMES[490] = ATTR_V_IDEOGRAPHIC;
+  ATTRIBUTE_NAMES[491] = ATTR_PRESERVEALPHA;
+  ATTRIBUTE_NAMES[492] = ATTR_SCRIPTMINSIZE;
+  ATTRIBUTE_NAMES[493] = ATTR_SPECIFICATION;
+  ATTRIBUTE_NAMES[494] = ATTR_XLINK_ACTUATE;
+  ATTRIBUTE_NAMES[495] = ATTR_XLINK_ARCROLE;
+  ATTRIBUTE_NAMES[496] = ATTR_ACCEPT_CHARSET;
+  ATTRIBUTE_NAMES[497] = ATTR_ALIGNMENTSCOPE;
+  ATTRIBUTE_NAMES[498] = ATTR_ARIA_MULTILINE;
+  ATTRIBUTE_NAMES[499] = ATTR_BASELINE_SHIFT;
+  ATTRIBUTE_NAMES[500] = ATTR_HORIZ_ORIGIN_X;
+  ATTRIBUTE_NAMES[501] = ATTR_HORIZ_ORIGIN_Y;
+  ATTRIBUTE_NAMES[502] = ATTR_ONBEFOREUPDATE;
+  ATTRIBUTE_NAMES[503] = ATTR_ONFILTERCHANGE;
+  ATTRIBUTE_NAMES[504] = ATTR_ONROWSINSERTED;
+  ATTRIBUTE_NAMES[505] = ATTR_ONBEFOREUNLOAD;
+  ATTRIBUTE_NAMES[506] = ATTR_MATHBACKGROUND;
+  ATTRIBUTE_NAMES[507] = ATTR_LETTER_SPACING;
+  ATTRIBUTE_NAMES[508] = ATTR_LIGHTING_COLOR;
+  ATTRIBUTE_NAMES[509] = ATTR_THICKMATHSPACE;
+  ATTRIBUTE_NAMES[510] = ATTR_TEXT_RENDERING;
+  ATTRIBUTE_NAMES[511] = ATTR_V_MATHEMATICAL;
+  ATTRIBUTE_NAMES[512] = ATTR_POINTER_EVENTS;
+  ATTRIBUTE_NAMES[513] = ATTR_PRIMITIVEUNITS;
+  ATTRIBUTE_NAMES[514] = ATTR_SYSTEMLANGUAGE;
+  ATTRIBUTE_NAMES[515] = ATTR_STROKE_LINECAP;
+  ATTRIBUTE_NAMES[516] = ATTR_SUBSCRIPTSHIFT;
+  ATTRIBUTE_NAMES[517] = ATTR_STROKE_OPACITY;
+  ATTRIBUTE_NAMES[518] = ATTR_ARIA_DROPEFFECT;
+  ATTRIBUTE_NAMES[519] = ATTR_ARIA_LABELLEDBY;
+  ATTRIBUTE_NAMES[520] = ATTR_ARIA_TEMPLATEID;
+  ATTRIBUTE_NAMES[521] = ATTR_COLOR_RENDERING;
+  ATTRIBUTE_NAMES[522] = ATTR_CONTENTEDITABLE;
+  ATTRIBUTE_NAMES[523] = ATTR_DIFFUSECONSTANT;
+  ATTRIBUTE_NAMES[524] = ATTR_ONDATAAVAILABLE;
+  ATTRIBUTE_NAMES[525] = ATTR_ONCONTROLSELECT;
+  ATTRIBUTE_NAMES[526] = ATTR_IMAGE_RENDERING;
+  ATTRIBUTE_NAMES[527] = ATTR_MEDIUMMATHSPACE;
+  ATTRIBUTE_NAMES[528] = ATTR_TEXT_DECORATION;
+  ATTRIBUTE_NAMES[529] = ATTR_SHAPE_RENDERING;
+  ATTRIBUTE_NAMES[530] = ATTR_STROKE_LINEJOIN;
+  ATTRIBUTE_NAMES[531] = ATTR_REPEAT_TEMPLATE;
+  ATTRIBUTE_NAMES[532] = ATTR_ARIA_DESCRIBEDBY;
+  ATTRIBUTE_NAMES[533] = ATTR_FONT_SIZE_ADJUST;
+  ATTRIBUTE_NAMES[534] = ATTR_KERNELUNITLENGTH;
+  ATTRIBUTE_NAMES[535] = ATTR_ONBEFOREACTIVATE;
+  ATTRIBUTE_NAMES[536] = ATTR_ONPROPERTYCHANGE;
+  ATTRIBUTE_NAMES[537] = ATTR_ONDATASETCHANGED;
+  ATTRIBUTE_NAMES[538] = ATTR_MASKCONTENTUNITS;
+  ATTRIBUTE_NAMES[539] = ATTR_PATTERNTRANSFORM;
+  ATTRIBUTE_NAMES[540] = ATTR_REQUIREDFEATURES;
+  ATTRIBUTE_NAMES[541] = ATTR_RENDERING_INTENT;
+  ATTRIBUTE_NAMES[542] = ATTR_SPECULAREXPONENT;
+  ATTRIBUTE_NAMES[543] = ATTR_SPECULARCONSTANT;
+  ATTRIBUTE_NAMES[544] = ATTR_SUPERSCRIPTSHIFT;
+  ATTRIBUTE_NAMES[545] = ATTR_STROKE_DASHARRAY;
+  ATTRIBUTE_NAMES[546] = ATTR_XCHANNELSELECTOR;
+  ATTRIBUTE_NAMES[547] = ATTR_YCHANNELSELECTOR;
+  ATTRIBUTE_NAMES[548] = ATTR_ARIA_AUTOCOMPLETE;
+  ATTRIBUTE_NAMES[549] = ATTR_ENABLE_BACKGROUND;
+  ATTRIBUTE_NAMES[550] = ATTR_DOMINANT_BASELINE;
+  ATTRIBUTE_NAMES[551] = ATTR_GRADIENTTRANSFORM;
+  ATTRIBUTE_NAMES[552] = ATTR_ONBEFORDEACTIVATE;
+  ATTRIBUTE_NAMES[553] = ATTR_ONDATASETCOMPLETE;
+  ATTRIBUTE_NAMES[554] = ATTR_OVERLINE_POSITION;
+  ATTRIBUTE_NAMES[555] = ATTR_ONBEFOREEDITFOCUS;
+  ATTRIBUTE_NAMES[556] = ATTR_LIMITINGCONEANGLE;
+  ATTRIBUTE_NAMES[557] = ATTR_VERYTHINMATHSPACE;
+  ATTRIBUTE_NAMES[558] = ATTR_STROKE_DASHOFFSET;
+  ATTRIBUTE_NAMES[559] = ATTR_STROKE_MITERLIMIT;
+  ATTRIBUTE_NAMES[560] = ATTR_ALIGNMENT_BASELINE;
+  ATTRIBUTE_NAMES[561] = ATTR_ONREADYSTATECHANGE;
+  ATTRIBUTE_NAMES[562] = ATTR_OVERLINE_THICKNESS;
+  ATTRIBUTE_NAMES[563] = ATTR_UNDERLINE_POSITION;
+  ATTRIBUTE_NAMES[564] = ATTR_VERYTHICKMATHSPACE;
+  ATTRIBUTE_NAMES[565] = ATTR_REQUIREDEXTENSIONS;
+  ATTRIBUTE_NAMES[566] = ATTR_COLOR_INTERPOLATION;
+  ATTRIBUTE_NAMES[567] = ATTR_UNDERLINE_THICKNESS;
+  ATTRIBUTE_NAMES[568] = ATTR_PRESERVEASPECTRATIO;
+  ATTRIBUTE_NAMES[569] = ATTR_PATTERNCONTENTUNITS;
+  ATTRIBUTE_NAMES[570] = ATTR_ARIA_MULTISELECTABLE;
+  ATTRIBUTE_NAMES[571] = ATTR_SCRIPTSIZEMULTIPLIER;
+  ATTRIBUTE_NAMES[572] = ATTR_ARIA_ACTIVEDESCENDANT;
+  ATTRIBUTE_NAMES[573] = ATTR_VERYVERYTHINMATHSPACE;
+  ATTRIBUTE_NAMES[574] = ATTR_VERYVERYTHICKMATHSPACE;
+  ATTRIBUTE_NAMES[575] = ATTR_STRIKETHROUGH_POSITION;
+  ATTRIBUTE_NAMES[576] = ATTR_STRIKETHROUGH_THICKNESS;
+  ATTRIBUTE_NAMES[577] = ATTR_GLYPH_ORIENTATION_VERTICAL;
+  ATTRIBUTE_NAMES[578] = ATTR_COLOR_INTERPOLATION_FILTERS;
+  ATTRIBUTE_NAMES[579] = ATTR_GLYPH_ORIENTATION_HORIZONTAL;
 }
 
 void
 nsHtml5AttributeName::releaseStatics()
 {
   delete[] ALL_NO_NS;
   delete[] XMLNS_NS;
   delete[] XML_NS;
@@ -2287,17 +2275,16 @@ nsHtml5AttributeName::releaseStatics()
   delete ATTR_AMPLITUDE;
   delete ATTR_ARIA_LIVE;
   delete ATTR_CLIP_RULE;
   delete ATTR_CLIP_PATH;
   delete ATTR_EQUALROWS;
   delete ATTR_ELEVATION;
   delete ATTR_DIRECTION;
   delete ATTR_DRAGGABLE;
-  delete ATTR_FILTERRES;
   delete ATTR_FILL_RULE;
   delete ATTR_FONTSTYLE;
   delete ATTR_FONT_SIZE;
   delete ATTR_KEYSYSTEM;
   delete ATTR_KEYPOINTS;
   delete ATTR_HIDEFOCUS;
   delete ATTR_ONMESSAGE;
   delete ATTR_INTERCEPT;
@@ -2528,34 +2515,32 @@ nsHtml5AttributeName::releaseStatics()
   delete ATTR_ONCONTROLSELECT;
   delete ATTR_IMAGE_RENDERING;
   delete ATTR_MEDIUMMATHSPACE;
   delete ATTR_TEXT_DECORATION;
   delete ATTR_SHAPE_RENDERING;
   delete ATTR_STROKE_LINEJOIN;
   delete ATTR_REPEAT_TEMPLATE;
   delete ATTR_ARIA_DESCRIBEDBY;
-  delete ATTR_CONTENTSTYLETYPE;
   delete ATTR_FONT_SIZE_ADJUST;
   delete ATTR_KERNELUNITLENGTH;
   delete ATTR_ONBEFOREACTIVATE;
   delete ATTR_ONPROPERTYCHANGE;
   delete ATTR_ONDATASETCHANGED;
   delete ATTR_MASKCONTENTUNITS;
   delete ATTR_PATTERNTRANSFORM;
   delete ATTR_REQUIREDFEATURES;
   delete ATTR_RENDERING_INTENT;
   delete ATTR_SPECULAREXPONENT;
   delete ATTR_SPECULARCONSTANT;
   delete ATTR_SUPERSCRIPTSHIFT;
   delete ATTR_STROKE_DASHARRAY;
   delete ATTR_XCHANNELSELECTOR;
   delete ATTR_YCHANNELSELECTOR;
   delete ATTR_ARIA_AUTOCOMPLETE;
-  delete ATTR_CONTENTSCRIPTTYPE;
   delete ATTR_ENABLE_BACKGROUND;
   delete ATTR_DOMINANT_BASELINE;
   delete ATTR_GRADIENTTRANSFORM;
   delete ATTR_ONBEFORDEACTIVATE;
   delete ATTR_ONDATASETCOMPLETE;
   delete ATTR_OVERLINE_POSITION;
   delete ATTR_ONBEFOREEDITFOCUS;
   delete ATTR_LIMITINGCONEANGLE;
@@ -2574,16 +2559,15 @@ nsHtml5AttributeName::releaseStatics()
   delete ATTR_PATTERNCONTENTUNITS;
   delete ATTR_ARIA_MULTISELECTABLE;
   delete ATTR_SCRIPTSIZEMULTIPLIER;
   delete ATTR_ARIA_ACTIVEDESCENDANT;
   delete ATTR_VERYVERYTHINMATHSPACE;
   delete ATTR_VERYVERYTHICKMATHSPACE;
   delete ATTR_STRIKETHROUGH_POSITION;
   delete ATTR_STRIKETHROUGH_THICKNESS;
-  delete ATTR_EXTERNALRESOURCESREQUIRED;
   delete ATTR_GLYPH_ORIENTATION_VERTICAL;
   delete ATTR_COLOR_INTERPOLATION_FILTERS;
   delete ATTR_GLYPH_ORIENTATION_HORIZONTAL;
   delete[] ATTRIBUTE_NAMES;
 }
 
 
--- a/parser/html/nsHtml5AttributeName.h
+++ b/parser/html/nsHtml5AttributeName.h
@@ -380,17 +380,16 @@ class nsHtml5AttributeName
     static nsHtml5AttributeName* ATTR_AMPLITUDE;
     static nsHtml5AttributeName* ATTR_ARIA_LIVE;
     static nsHtml5AttributeName* ATTR_CLIP_RULE;
     static nsHtml5AttributeName* ATTR_CLIP_PATH;
     static nsHtml5AttributeName* ATTR_EQUALROWS;
     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;
     static nsHtml5AttributeName* ATTR_KEYSYSTEM;
     static nsHtml5AttributeName* ATTR_KEYPOINTS;
     static nsHtml5AttributeName* ATTR_HIDEFOCUS;
     static nsHtml5AttributeName* ATTR_ONMESSAGE;
     static nsHtml5AttributeName* ATTR_INTERCEPT;
@@ -621,34 +620,32 @@ class nsHtml5AttributeName
     static nsHtml5AttributeName* ATTR_ONCONTROLSELECT;
     static nsHtml5AttributeName* ATTR_IMAGE_RENDERING;
     static nsHtml5AttributeName* ATTR_MEDIUMMATHSPACE;
     static nsHtml5AttributeName* ATTR_TEXT_DECORATION;
     static nsHtml5AttributeName* ATTR_SHAPE_RENDERING;
     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;
     static nsHtml5AttributeName* ATTR_ONPROPERTYCHANGE;
     static nsHtml5AttributeName* ATTR_ONDATASETCHANGED;
     static nsHtml5AttributeName* ATTR_MASKCONTENTUNITS;
     static nsHtml5AttributeName* ATTR_PATTERNTRANSFORM;
     static nsHtml5AttributeName* ATTR_REQUIREDFEATURES;
     static nsHtml5AttributeName* ATTR_RENDERING_INTENT;
     static nsHtml5AttributeName* ATTR_SPECULAREXPONENT;
     static nsHtml5AttributeName* ATTR_SPECULARCONSTANT;
     static nsHtml5AttributeName* ATTR_SUPERSCRIPTSHIFT;
     static nsHtml5AttributeName* ATTR_STROKE_DASHARRAY;
     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;
     static nsHtml5AttributeName* ATTR_ONBEFORDEACTIVATE;
     static nsHtml5AttributeName* ATTR_ONDATASETCOMPLETE;
     static nsHtml5AttributeName* ATTR_OVERLINE_POSITION;
     static nsHtml5AttributeName* ATTR_ONBEFOREEDITFOCUS;
     static nsHtml5AttributeName* ATTR_LIMITINGCONEANGLE;
@@ -667,17 +664,16 @@ class nsHtml5AttributeName
     static nsHtml5AttributeName* ATTR_PATTERNCONTENTUNITS;
     static nsHtml5AttributeName* ATTR_ARIA_MULTISELECTABLE;
     static nsHtml5AttributeName* ATTR_SCRIPTSIZEMULTIPLIER;
     static nsHtml5AttributeName* ATTR_ARIA_ACTIVEDESCENDANT;
     static nsHtml5AttributeName* ATTR_VERYVERYTHINMATHSPACE;
     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;
   private:
     static nsHtml5AttributeName** ATTRIBUTE_NAMES;
     static staticJArray<int32_t,int32_t> ATTRIBUTE_HASHES;
   public:
     static void initializeStatics();
--- a/parser/htmlparser/tests/mochitest/html5lib_tree_construction/tests11.dat
+++ b/parser/htmlparser/tests/mochitest/html5lib_tree_construction/tests11.dat
@@ -8,23 +8,23 @@
 |   <body>
 |     <svg svg>
 |       attributeName=""
 |       attributeType=""
 |       baseFrequency=""
 |       baseProfile=""
 |       calcMode=""
 |       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
+|       contentscripttype=""
+|       contentstyletype=""
 |       diffuseConstant=""
 |       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
+|       externalresourcesrequired=""
 |       filterUnits=""
+|       filterres=""
 |       glyphRef=""
 |       gradientTransform=""
 |       gradientUnits=""
 |       kernelMatrix=""
 |       kernelUnitLength=""
 |       keyPoints=""
 |       keySplines=""
 |       keyTimes=""
@@ -80,23 +80,23 @@
 |   <body>
 |     <svg svg>
 |       attributeName=""
 |       attributeType=""
 |       baseFrequency=""
 |       baseProfile=""
 |       calcMode=""
 |       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
+|       contentscripttype=""
+|       contentstyletype=""
 |       diffuseConstant=""
 |       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
+|       externalresourcesrequired=""
 |       filterUnits=""
+|       filterres=""
 |       glyphRef=""
 |       gradientTransform=""
 |       gradientUnits=""
 |       kernelMatrix=""
 |       kernelUnitLength=""
 |       keyPoints=""
 |       keySplines=""
 |       keyTimes=""
@@ -152,23 +152,23 @@
 |   <body>
 |     <svg svg>
 |       attributeName=""
 |       attributeType=""
 |       baseFrequency=""
 |       baseProfile=""
 |       calcMode=""
 |       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
+|       contentscripttype=""
+|       contentstyletype=""
 |       diffuseConstant=""
 |       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
+|       externalresourcesrequired=""
 |       filterUnits=""
+|       filterres=""
 |       glyphRef=""
 |       gradientTransform=""
 |       gradientUnits=""
 |       kernelMatrix=""
 |       kernelUnitLength=""
 |       keyPoints=""
 |       keySplines=""
 |       keyTimes=""