Bug 1269490 - Merge nsHtml5Atoms into nsGkAtoms. r=wchen
authorHenri Sivonen <hsivonen@hsivonen.fi>
Thu, 20 Apr 2017 11:47:02 +0300
changeset 356845 355a23c6c2bd2806475c17e36267a189a87901f9
parent 356844 b363981633ad2707328a7828e17abcaf37af00a5
child 356846 bb299d98bdc428ffe9ae3aef5ace8cb03e27052b
push id31775
push userihsiao@mozilla.com
push dateMon, 08 May 2017 03:10:38 +0000
treeherdermozilla-central@22aaf8bad4df [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerswchen
bugs1269490
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1269490 - Merge nsHtml5Atoms into nsGkAtoms. r=wchen MozReview-Commit-ID: EcfnXkFuJy3
dom/base/nsGkAtomList.h
dom/events/EventListenerManager.cpp
layout/base/nsLayoutUtils.cpp
layout/build/nsLayoutStatics.cpp
layout/generic/nsFrame.cpp
parser/html/moz.build
parser/html/nsHtml5AtomList.h
parser/html/nsHtml5Atoms.cpp
parser/html/nsHtml5Atoms.h
parser/html/nsHtml5AttributeName.cpp
parser/html/nsHtml5AttributeName.h
parser/html/nsHtml5ElementName.cpp
parser/html/nsHtml5ElementName.h
parser/html/nsHtml5Highlighter.cpp
parser/html/nsHtml5HtmlAttributes.cpp
parser/html/nsHtml5HtmlAttributes.h
parser/html/nsHtml5MetaScanner.cpp
parser/html/nsHtml5MetaScanner.h
parser/html/nsHtml5Portability.h
parser/html/nsHtml5StackNode.cpp
parser/html/nsHtml5StackNode.h
parser/html/nsHtml5StateSnapshot.cpp
parser/html/nsHtml5StateSnapshot.h
parser/html/nsHtml5Tokenizer.cpp
parser/html/nsHtml5Tokenizer.h
parser/html/nsHtml5TreeBuilder.cpp
parser/html/nsHtml5TreeBuilder.h
parser/html/nsHtml5TreeBuilderCppSupplement.h
parser/html/nsHtml5TreeOperation.cpp
parser/html/nsHtml5UTF16Buffer.cpp
parser/html/nsHtml5UTF16Buffer.h
--- a/dom/base/nsGkAtomList.h
+++ b/dom/base/nsGkAtomList.h
@@ -2389,8 +2389,452 @@ GK_ATOM(nsuri_svg, "http://www.w3.org/20
 GK_ATOM(onsourceopen, "onsourceopen")
 GK_ATOM(onsourceended, "onsourceended")
 GK_ATOM(onsourceclosed, "onsourceclosed")
 GK_ATOM(onupdatestart, "onupdatestart")
 GK_ATOM(onupdate, "onupdate")
 GK_ATOM(onupdateend, "onupdateend")
 GK_ATOM(onaddsourcebuffer, "onaddsourcebuffer")
 GK_ATOM(onremovesourcebuffer, "onremovesourcebuffer")
+
+// THE REST OF THE FILE IS GENERATED BY THE HTML PARSER TRANSLATOR AND
+// WILL BE OVERWRITTEN!
+// Please put manually-added atoms above this section and please avoid #ifdefing
+// them so that the translator doesn't need to learn to deal with conditionally
+// present manual atoms.
+// BEGIN GENERATED
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xlink, "xlink")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(k, "k")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(cap_height, "cap-height")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(g1, "g1")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(u1, "u1")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(g2, "g2")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(u2, "u2")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xml_space, "xml:space")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xml_lang, "xml:lang")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xml_base, "xml:base")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(aria_grab, "aria-grab")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(aria_channel, "aria-channel")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(aria_secret, "aria-secret")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(aria_templateid, "aria-templateid")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(aria_datatype, "aria-datatype")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(dataformatas, "dataformatas")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(datafld, "datafld")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(datasrc, "datasrc")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(local, "local")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(ondatasetchanged, "ondatasetchanged")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(ondatasetcomplete, "ondatasetcomplete")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(v_mathematical, "v-mathematical")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(v_hanging, "v-hanging")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xchannelselector, "xchannelselector")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(ychannelselector, "ychannelselector")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(arabic_form, "arabic-form")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(enable_background, "enable-background")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(calcmode, "calcmode")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(descent, "descent")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(specularexponent, "specularexponent")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(specularconstant, "specularconstant")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(specification, "specification")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(thickmathspace, "thickmathspace")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(unicode_, "unicode")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(unicode_range, "unicode-range")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(gradienttransform, "gradienttransform")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(gradientunits, "gradientunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(rendering_intent, "rendering-intent")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(stddeviation, "stddeviation")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(v_ideographic, "v-ideographic")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(accent_height, "accent-height")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(ascent, "ascent")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(basefrequency, "basefrequency")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(baseprofile, "baseprofile")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(baseProfile, "baseProfile")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(edgemode, "edgemode")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(hidefocus, "hidefocus")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(irrelevant, "irrelevant")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(oncellchange, "oncellchange")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onhelp, "onhelp")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onbeforeupdate, "onbeforeupdate")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(ondeactivate, "ondeactivate")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onbeforeactivate, "onbeforeactivate")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onbefordeactivate, "onbefordeactivate")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onbeforeeditfocus, "onbeforeeditfocus")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(repeat_max, "repeat-max")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(repeat_min, "repeat-min")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(repeatcount, "repeatcount")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(repeat_start, "repeat-start")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(repeat_template, "repeat-template")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(repeatdur, "repeatdur")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(speed, "speed")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(spreadmethod, "spreadmethod")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(unselectable, "unselectable")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(underline_position, "underline-position")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(underline_thickness, "underline-thickness")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(x_height, "x-height")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(diffuseconstant, "diffuseconstant")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onafterupdate, "onafterupdate")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(surfacescale, "surfacescale")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(hanging, "hanging")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(lengthadjust, "lengthadjust")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(nargs, "nargs")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(origin, "origin")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(targetx, "targetx")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(targety, "targety")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(alphabetic, "alphabetic")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(mathematical, "mathematical")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(pathlength, "pathlength")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(definitionurl, "definitionurl")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(horiz_adv_x, "horiz-adv-x")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(horiz_origin_x, "horiz-origin-x")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(horiz_origin_y, "horiz-origin-y")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(limitingconeangle, "limitingconeangle")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(mediummathspace, "mediummathspace")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onfilterchange, "onfilterchange")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(strikethrough_position, "strikethrough-position")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(strikethrough_thickness, "strikethrough-thickness")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(markerheight, "markerheight")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(markerwidth, "markerwidth")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(maskunits, "maskunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(markerunits, "markerunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(maskcontentunits, "maskcontentunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(tablevalues, "tablevalues")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(v_alphabetic, "v-alphabetic")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(primitiveunits, "primitiveunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(stemh, "stemh")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(stemv, "stemv")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(seamless, "seamless")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(zoomandpan, "zoomandpan")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(kernelmatrix, "kernelmatrix")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(kerning, "kerning")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(kernelunitlength, "kernelunitlength")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(pointsatx, "pointsatx")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(pointsaty, "pointsaty")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(pointsatz, "pointsatz")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(thinmathspace, "thinmathspace")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xlink_href, "xlink:href")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xlink_title, "xlink:title")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xlink_role, "xlink:role")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xlink_arcrole, "xlink:arcrole")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(arcrole, "arcrole")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xmlns_xlink, "xmlns:xlink")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xlink_type, "xlink:type")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xlink_show, "xlink:show")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(xlink_actuate, "xlink:actuate")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(autosubmit, "autosubmit")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(color_rendering, "color-rendering")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(ideographic, "ideographic")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(panose_1, "panose-1")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(numoctaves, "numoctaves")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onbounce, "onbounce")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(oncontrolselect, "oncontrolselect")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onrowsinserted, "onrowsinserted")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onmousewheel, "onmousewheel")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onrowenter, "onrowenter")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onformchange, "onformchange")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onrowexit, "onrowexit")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onmoveend, "onmoveend")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onlosecapture, "onlosecapture")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onmovestart, "onmovestart")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onrowsdelete, "onrowsdelete")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onmove, "onmove")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onforminput, "onforminput")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(scrolldelay, "scrolldelay")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(clippathunits, "clippathunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(glyph_orientation_vertical, "glyph-orientation-vertical")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(glyph_orientation_horizontal, "glyph-orientation-horizontal")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(glyphref, "glyphref")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(glyph_name, "glyph-name")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(keypoints, "keypoints")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(attributename, "attributename")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(attributetype, "attributetype")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(macros, "macros")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onpropertychange, "onpropertychange")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(overline_position, "overline-position")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(onerrorupdate, "onerrorupdate")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(overline_thickness, "overline-thickness")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(startoffset, "startoffset")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(keysplines, "keysplines")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(preservealpha, "preservealpha")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(preserveaspectratio, "preserveaspectratio")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(alttext, "alttext")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(filterunits, "filterunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(keytimes, "keytimes")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(patterntransform, "patterntransform")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(patternunits, "patternunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(patterncontentunits, "patterncontentunits")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(stitchtiles, "stitchtiles")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(systemlanguage, "systemlanguage")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(vert_origin_x, "vert-origin-x")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(vert_adv_y, "vert-adv-y")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(vert_origin_y, "vert-origin-y")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(textlength, "textlength")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(units_per_em, "units-per-em")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(widths, "widths")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(occurrence, "occurrence")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(requiredfeatures, "requiredfeatures")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(requiredextensions, "requiredextensions")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(viewtarget, "viewtarget")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(viewbox, "viewbox")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(bbox, "bbox")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(refx, "refx")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(refy, "refy")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(verythinmathspace, "verythinmathspace")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(verythickmathspace, "verythickmathspace")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(veryverythinmathspace, "veryverythinmathspace")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(veryverythickmathspace, "veryverythickmathspace")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(isindex, "isindex")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fefunca, "fefunca")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fefuncb, "fefuncb")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(feblend, "feblend")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(feflood, "feflood")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(feturbulence, "feturbulence")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(femergenode, "femergenode")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(feimage, "feimage")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(femerge, "femerge")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fetile, "fetile")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fecomposite, "fecomposite")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(altglyphdef, "altglyphdef")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(altGlyphDef, "altGlyphDef")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fefuncg, "fefuncg")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fediffuselighting, "fediffuselighting")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fespecularlighting, "fespecularlighting")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(altglyph, "altglyph")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(altGlyph, "altGlyph")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(clippath, "clippath")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(textpath, "textpath")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(altglyphitem, "altglyphitem")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(altGlyphItem, "altGlyphItem")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(animatetransform, "animatetransform")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(animatemotion, "animatemotion")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fedisplacementmap, "fedisplacementmap")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(animatecolor, "animatecolor")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fefuncr, "fefuncr")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fecomponenttransfer, "fecomponenttransfer")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fegaussianblur, "fegaussianblur")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(foreignobject, "foreignobject")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(feoffset, "feoffset")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fespotlight, "fespotlight")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fepointlight, "fepointlight")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fedistantlight, "fedistantlight")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(lineargradient, "lineargradient")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(radialgradient, "radialgradient")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fedropshadow, "fedropshadow")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(fecolormatrix, "fecolormatrix")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(feconvolvematrix, "feconvolvematrix")
+// ATOM GENERATED BY HTML PARSER TRANSLATOR (WILL BE AUTOMATICALLY OVERWRITTEN):
+GK_ATOM(femorphology, "femorphology")
+// END GENERATED ATOMS, DO NOT ADD CODE BELOW THIS LINE
--- a/dom/events/EventListenerManager.cpp
+++ b/dom/events/EventListenerManager.cpp
@@ -37,17 +37,16 @@
 #include "ProfilerMarkerPayload.h"
 #endif
 #include "nsCOMArray.h"
 #include "nsCOMPtr.h"
 #include "nsContentUtils.h"
 #include "nsDOMCID.h"
 #include "nsError.h"
 #include "nsGkAtoms.h"
-#include "nsHtml5Atoms.h"
 #include "nsIContent.h"
 #include "nsIContentSecurityPolicy.h"
 #include "nsIDocument.h"
 #include "nsIDOMEventListener.h"
 #include "nsIScriptGlobalObject.h"
 #include "nsISupports.h"
 #include "nsIXPConnect.h"
 #include "nsJSUtils.h"
@@ -1789,19 +1788,18 @@ bool
 EventListenerManager::IsApzAwareListener(Listener* aListener)
 {
   return !aListener->mFlags.mPassive && IsApzAwareEvent(aListener->mTypeAtom);
 }
 
 bool
 EventListenerManager::IsApzAwareEvent(nsIAtom* aEvent)
 {
-  if (aEvent == nsGkAtoms::onwheel ||
-      aEvent == nsGkAtoms::onDOMMouseScroll ||
-      aEvent == nsHtml5Atoms::onmousewheel ||
+  if (aEvent == nsGkAtoms::onwheel || aEvent == nsGkAtoms::onDOMMouseScroll ||
+      aEvent == nsGkAtoms::onmousewheel ||
       aEvent == nsGkAtoms::onMozMousePixelScroll) {
     return true;
   }
   // In theory we should schedule a repaint if the touch event pref changes,
   // because the event regions might be out of date. In practice that seems like
   // overkill because users generally shouldn't be flipping this pref, much
   // less expecting touch listeners on the page to immediately start preventing
   // scrolling without so much as a repaint. Tests that we write can work
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -25,17 +25,16 @@
 #include "nsDocument.h"
 #include "nsFontMetrics.h"
 #include "nsPresContext.h"
 #include "nsIContent.h"
 #include "nsIDOMHTMLDocument.h"
 #include "nsIDOMHTMLElement.h"
 #include "nsFrameList.h"
 #include "nsGkAtoms.h"
-#include "nsHtml5Atoms.h"
 #include "nsIAtom.h"
 #include "nsCaret.h"
 #include "nsCSSPseudoElements.h"
 #include "nsCSSAnonBoxes.h"
 #include "nsCSSColorUtils.h"
 #include "nsView.h"
 #include "nsViewManager.h"
 #include "nsPlaceholderFrame.h"
--- a/layout/build/nsLayoutStatics.cpp
+++ b/layout/build/nsLayoutStatics.cpp
@@ -46,17 +46,16 @@
 #include "nsTreeSanitizer.h"
 #include "nsCellMap.h"
 #include "nsTextFrame.h"
 #include "nsCCUncollectableMarker.h"
 #include "nsTextFragment.h"
 #include "nsCSSRuleProcessor.h"
 #include "nsCORSListenerProxy.h"
 #include "nsHTMLDNSPrefetch.h"
-#include "nsHtml5Atoms.h"
 #include "nsHtml5Module.h"
 #include "nsHTMLTags.h"
 #include "nsIRDFContentSink.h"	// for RDF atom initialization
 #include "mozilla/dom/FallbackEncoding.h"
 #include "nsFocusManager.h"
 #include "nsListControlFrame.h"
 #include "mozilla/dom/HTMLInputElement.h"
 #include "SVGElementFactory.h"
@@ -153,17 +152,16 @@ nsLayoutStatics::Initialize()
   // Register all of our atoms once
   nsCSSAnonBoxes::AddRefAtoms();
   nsCSSPseudoClasses::AddRefAtoms();
   nsCSSPseudoElements::AddRefAtoms();
   nsCSSKeywords::AddRefTable();
   nsCSSProps::AddRefTable();
   nsColorNames::AddRefTable();
   nsGkAtoms::AddRefAtoms();
-  nsHtml5Atoms::AddRefAtoms();
   nsTextServicesDocument::RegisterAtoms();
   nsHTMLTags::RegisterAtoms();
   nsRDFAtoms::RegisterAtoms();
 
   NS_SealStaticAtomTable();
 
   StartupJSEnvironment();
   rv = nsRegion::InitStatic();
--- a/layout/generic/nsFrame.cpp
+++ b/layout/generic/nsFrame.cpp
@@ -46,17 +46,16 @@
 #include "mozilla/RestyleManager.h"
 #include "mozilla/RestyleManagerInlines.h"
 
 #include "nsIDOMNode.h"
 #include "nsISelection.h"
 #include "nsISelectionPrivate.h"
 #include "nsFrameSelection.h"
 #include "nsGkAtoms.h"
-#include "nsHtml5Atoms.h"
 #include "nsCSSAnonBoxes.h"
 
 #include "nsFrameTraversal.h"
 #include "nsRange.h"
 #include "nsITextControlFrame.h"
 #include "nsNameSpaceManager.h"
 #include "nsIPercentBSizeObserver.h"
 #include "nsStyleStructInlines.h"
--- a/parser/html/moz.build
+++ b/parser/html/moz.build
@@ -11,18 +11,16 @@ XPIDL_SOURCES += [
 
 XPIDL_MODULE = 'html5'
 
 EXPORTS += [
     'jArray.h',
     'nsAHtml5TreeBuilderState.h',
     'nsAHtml5TreeOpSink.h',
     'nsHtml5ArrayCopy.h',
-    'nsHtml5AtomList.h',
-    'nsHtml5Atoms.h',
     'nsHtml5AtomTable.h',
     'nsHtml5AttributeEntry.h',
     'nsHtml5AttributeName.h',
     'nsHtml5ByteReadable.h',
     'nsHtml5DependentUTF16Buffer.h',
     'nsHtml5DocumentBuilder.h',
     'nsHtml5DocumentMode.h',
     'nsHtml5HtmlAttributes.h',
@@ -52,17 +50,16 @@ EXPORTS += [
     'nsHtml5UTF16BufferHSupplement.h',
     'nsHtml5ViewSourceUtils.h',
     'nsIContentHandle.h',
     'nsParserUtils.h',
 ]
 
 UNIFIED_SOURCES += [
     'nsHtml5Atom.cpp',
-    'nsHtml5Atoms.cpp',
     'nsHtml5AtomTable.cpp',
     'nsHtml5AttributeName.cpp',
     'nsHtml5DependentUTF16Buffer.cpp',
     'nsHtml5DocumentBuilder.cpp',
     'nsHtml5ElementName.cpp',
     'nsHtml5Highlighter.cpp',
     'nsHtml5HtmlAttributes.cpp',
     'nsHtml5MetaScanner.cpp',
deleted file mode 100644
--- a/parser/html/nsHtml5AtomList.h
+++ /dev/null
@@ -1,890 +0,0 @@
-/*
- * Copyright (c) 2008-2010 Mozilla Foundation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a 
- * copy of this software and associated documentation files (the "Software"), 
- * to deal in the Software without restriction, including without limitation 
- * the rights to use, copy, modify, merge, publish, distribute, sublicense, 
- * and/or sell copies of the Software, and to permit persons to whom the 
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in 
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
- * DEALINGS IN THE SOFTWARE.
- */
-
-HTML5_ATOM(xmlns, "xmlns")
-HTML5_ATOM(xlink, "xlink")
-HTML5_ATOM(xml, "xml")
-HTML5_ATOM(alt, "alt")
-HTML5_ATOM(dir, "dir")
-HTML5_ATOM(dur, "dur")
-HTML5_ATOM(end, "end")
-HTML5_ATOM(for_, "for")
-HTML5_ATOM(in2, "in2")
-HTML5_ATOM(low, "low")
-HTML5_ATOM(min, "min")
-HTML5_ATOM(max, "max")
-HTML5_ATOM(rel, "rel")
-HTML5_ATOM(rev, "rev")
-HTML5_ATOM(src, "src")
-HTML5_ATOM(d, "d")
-HTML5_ATOM(k, "k")
-HTML5_ATOM(r, "r")
-HTML5_ATOM(x, "x")
-HTML5_ATOM(y, "y")
-HTML5_ATOM(z, "z")
-HTML5_ATOM(cap_height, "cap-height")
-HTML5_ATOM(g1, "g1")
-HTML5_ATOM(k1, "k1")
-HTML5_ATOM(u1, "u1")
-HTML5_ATOM(x1, "x1")
-HTML5_ATOM(y1, "y1")
-HTML5_ATOM(g2, "g2")
-HTML5_ATOM(k2, "k2")
-HTML5_ATOM(u2, "u2")
-HTML5_ATOM(x2, "x2")
-HTML5_ATOM(y2, "y2")
-HTML5_ATOM(k3, "k3")
-HTML5_ATOM(k4, "k4")
-HTML5_ATOM(xml_space, "xml:space")
-HTML5_ATOM(space, "space")
-HTML5_ATOM(xml_lang, "xml:lang")
-HTML5_ATOM(lang, "lang")
-HTML5_ATOM(xml_base, "xml:base")
-HTML5_ATOM(base, "base")
-HTML5_ATOM(aria_grab, "aria-grab")
-HTML5_ATOM(aria_valuemax, "aria-valuemax")
-HTML5_ATOM(aria_labelledby, "aria-labelledby")
-HTML5_ATOM(aria_describedby, "aria-describedby")
-HTML5_ATOM(aria_disabled, "aria-disabled")
-HTML5_ATOM(aria_checked, "aria-checked")
-HTML5_ATOM(aria_selected, "aria-selected")
-HTML5_ATOM(aria_dropeffect, "aria-dropeffect")
-HTML5_ATOM(aria_required, "aria-required")
-HTML5_ATOM(aria_expanded, "aria-expanded")
-HTML5_ATOM(aria_pressed, "aria-pressed")
-HTML5_ATOM(aria_level, "aria-level")
-HTML5_ATOM(aria_channel, "aria-channel")
-HTML5_ATOM(aria_hidden, "aria-hidden")
-HTML5_ATOM(aria_secret, "aria-secret")
-HTML5_ATOM(aria_posinset, "aria-posinset")
-HTML5_ATOM(aria_atomic, "aria-atomic")
-HTML5_ATOM(aria_invalid, "aria-invalid")
-HTML5_ATOM(aria_templateid, "aria-templateid")
-HTML5_ATOM(aria_valuemin, "aria-valuemin")
-HTML5_ATOM(aria_multiselectable, "aria-multiselectable")
-HTML5_ATOM(aria_controls, "aria-controls")
-HTML5_ATOM(aria_multiline, "aria-multiline")
-HTML5_ATOM(aria_readonly, "aria-readonly")
-HTML5_ATOM(aria_owns, "aria-owns")
-HTML5_ATOM(aria_activedescendant, "aria-activedescendant")
-HTML5_ATOM(aria_relevant, "aria-relevant")
-HTML5_ATOM(aria_datatype, "aria-datatype")
-HTML5_ATOM(aria_valuenow, "aria-valuenow")
-HTML5_ATOM(aria_sort, "aria-sort")
-HTML5_ATOM(aria_autocomplete, "aria-autocomplete")
-HTML5_ATOM(aria_flowto, "aria-flowto")
-HTML5_ATOM(aria_busy, "aria-busy")
-HTML5_ATOM(aria_live, "aria-live")
-HTML5_ATOM(aria_haspopup, "aria-haspopup")
-HTML5_ATOM(aria_setsize, "aria-setsize")
-HTML5_ATOM(clear, "clear")
-HTML5_ATOM(dataformatas, "dataformatas")
-HTML5_ATOM(disabled, "disabled")
-HTML5_ATOM(datafld, "datafld")
-HTML5_ATOM(default_, "default")
-HTML5_ATOM(datasrc, "datasrc")
-HTML5_ATOM(data, "data")
-HTML5_ATOM(equalcolumns, "equalcolumns")
-HTML5_ATOM(equalrows, "equalrows")
-HTML5_ATOM(hspace, "hspace")
-HTML5_ATOM(ismap, "ismap")
-HTML5_ATOM(local, "local")
-HTML5_ATOM(lspace, "lspace")
-HTML5_ATOM(movablelimits, "movablelimits")
-HTML5_ATOM(notation, "notation")
-HTML5_ATOM(ondatasetchanged, "ondatasetchanged")
-HTML5_ATOM(ondataavailable, "ondataavailable")
-HTML5_ATOM(onpaste, "onpaste")
-HTML5_ATOM(ondatasetcomplete, "ondatasetcomplete")
-HTML5_ATOM(rspace, "rspace")
-HTML5_ATOM(rowalign, "rowalign")
-HTML5_ATOM(rotate, "rotate")
-HTML5_ATOM(separator, "separator")
-HTML5_ATOM(separators, "separators")
-HTML5_ATOM(v_mathematical, "v-mathematical")
-HTML5_ATOM(vspace, "vspace")
-HTML5_ATOM(v_hanging, "v-hanging")
-HTML5_ATOM(xchannelselector, "xchannelselector")
-HTML5_ATOM(xChannelSelector, "xChannelSelector")
-HTML5_ATOM(ychannelselector, "ychannelselector")
-HTML5_ATOM(yChannelSelector, "yChannelSelector")
-HTML5_ATOM(arabic_form, "arabic-form")
-HTML5_ATOM(enable_background, "enable-background")
-HTML5_ATOM(ondblclick, "ondblclick")
-HTML5_ATOM(onabort, "onabort")
-HTML5_ATOM(calcmode, "calcmode")
-HTML5_ATOM(calcMode, "calcMode")
-HTML5_ATOM(checked, "checked")
-HTML5_ATOM(descent, "descent")
-HTML5_ATOM(fence, "fence")
-HTML5_ATOM(onscroll, "onscroll")
-HTML5_ATOM(onactivate, "onactivate")
-HTML5_ATOM(opacity, "opacity")
-HTML5_ATOM(spacing, "spacing")
-HTML5_ATOM(specularexponent, "specularexponent")
-HTML5_ATOM(specularExponent, "specularExponent")
-HTML5_ATOM(specularconstant, "specularconstant")
-HTML5_ATOM(specularConstant, "specularConstant")
-HTML5_ATOM(specification, "specification")
-HTML5_ATOM(thickmathspace, "thickmathspace")
-HTML5_ATOM(unicode_, "unicode")
-HTML5_ATOM(unicode_bidi, "unicode-bidi")
-HTML5_ATOM(unicode_range, "unicode-range")
-HTML5_ATOM(border, "border")
-HTML5_ATOM(id, "id")
-HTML5_ATOM(gradienttransform, "gradienttransform")
-HTML5_ATOM(gradientTransform, "gradientTransform")
-HTML5_ATOM(gradientunits, "gradientunits")
-HTML5_ATOM(gradientUnits, "gradientUnits")
-HTML5_ATOM(hidden, "hidden")
-HTML5_ATOM(headers, "headers")
-HTML5_ATOM(readonly, "readonly")
-HTML5_ATOM(rendering_intent, "rendering-intent")
-HTML5_ATOM(seed, "seed")
-HTML5_ATOM(srcdoc, "srcdoc")
-HTML5_ATOM(stddeviation, "stddeviation")
-HTML5_ATOM(stdDeviation, "stdDeviation")
-HTML5_ATOM(sandbox, "sandbox")
-HTML5_ATOM(v_ideographic, "v-ideographic")
-HTML5_ATOM(word_spacing, "word-spacing")
-HTML5_ATOM(accentunder, "accentunder")
-HTML5_ATOM(accept_charset, "accept-charset")
-HTML5_ATOM(accesskey, "accesskey")
-HTML5_ATOM(accent_height, "accent-height")
-HTML5_ATOM(accent, "accent")
-HTML5_ATOM(ascent, "ascent")
-HTML5_ATOM(accept, "accept")
-HTML5_ATOM(bevelled, "bevelled")
-HTML5_ATOM(basefrequency, "basefrequency")
-HTML5_ATOM(baseFrequency, "baseFrequency")
-HTML5_ATOM(baseline_shift, "baseline-shift")
-HTML5_ATOM(baseprofile, "baseprofile")
-HTML5_ATOM(baseProfile, "baseProfile")
-HTML5_ATOM(baseline, "baseline")
-HTML5_ATOM(code, "code")
-HTML5_ATOM(codetype, "codetype")
-HTML5_ATOM(codebase, "codebase")
-HTML5_ATOM(cite, "cite")
-HTML5_ATOM(defer, "defer")
-HTML5_ATOM(datetime, "datetime")
-HTML5_ATOM(direction, "direction")
-HTML5_ATOM(edgemode, "edgemode")
-HTML5_ATOM(edgeMode, "edgeMode")
-HTML5_ATOM(edge, "edge")
-HTML5_ATOM(face, "face")
-HTML5_ATOM(hidefocus, "hidefocus")
-HTML5_ATOM(index, "index")
-HTML5_ATOM(irrelevant, "irrelevant")
-HTML5_ATOM(intercept, "intercept")
-HTML5_ATOM(integrity, "integrity")
-HTML5_ATOM(linebreak, "linebreak")
-HTML5_ATOM(label, "label")
-HTML5_ATOM(linethickness, "linethickness")
-HTML5_ATOM(mode, "mode")
-HTML5_ATOM(name, "name")
-HTML5_ATOM(noresize, "noresize")
-HTML5_ATOM(onbeforeunload, "onbeforeunload")
-HTML5_ATOM(onrepeat, "onrepeat")
-HTML5_ATOM(object, "object")
-HTML5_ATOM(onselect, "onselect")
-HTML5_ATOM(order, "order")
-HTML5_ATOM(other, "other")
-HTML5_ATOM(onreset, "onreset")
-HTML5_ATOM(oncellchange, "oncellchange")
-HTML5_ATOM(onreadystatechange, "onreadystatechange")
-HTML5_ATOM(onmessage, "onmessage")
-HTML5_ATOM(onbegin, "onbegin")
-HTML5_ATOM(onhelp, "onhelp")
-HTML5_ATOM(onbeforeprint, "onbeforeprint")
-HTML5_ATOM(orient, "orient")
-HTML5_ATOM(orientation, "orientation")
-HTML5_ATOM(onbeforecopy, "onbeforecopy")
-HTML5_ATOM(onselectstart, "onselectstart")
-HTML5_ATOM(onbeforepaste, "onbeforepaste")
-HTML5_ATOM(onbeforeupdate, "onbeforeupdate")
-HTML5_ATOM(ondeactivate, "ondeactivate")
-HTML5_ATOM(onbeforeactivate, "onbeforeactivate")
-HTML5_ATOM(onbefordeactivate, "onbefordeactivate")
-HTML5_ATOM(onkeypress, "onkeypress")
-HTML5_ATOM(onkeyup, "onkeyup")
-HTML5_ATOM(onbeforeeditfocus, "onbeforeeditfocus")
-HTML5_ATOM(onbeforecut, "onbeforecut")
-HTML5_ATOM(onkeydown, "onkeydown")
-HTML5_ATOM(onresize, "onresize")
-HTML5_ATOM(repeat, "repeat")
-HTML5_ATOM(repeat_max, "repeat-max")
-HTML5_ATOM(referrerpolicy, "referrerpolicy")
-HTML5_ATOM(rules, "rules")
-HTML5_ATOM(repeat_min, "repeat-min")
-HTML5_ATOM(role, "role")
-HTML5_ATOM(repeatcount, "repeatcount")
-HTML5_ATOM(repeatCount, "repeatCount")
-HTML5_ATOM(repeat_start, "repeat-start")
-HTML5_ATOM(repeat_template, "repeat-template")
-HTML5_ATOM(repeatdur, "repeatdur")
-HTML5_ATOM(repeatDur, "repeatDur")
-HTML5_ATOM(selected, "selected")
-HTML5_ATOM(speed, "speed")
-HTML5_ATOM(sizes, "sizes")
-HTML5_ATOM(superscriptshift, "superscriptshift")
-HTML5_ATOM(stretchy, "stretchy")
-HTML5_ATOM(scheme, "scheme")
-HTML5_ATOM(spreadmethod, "spreadmethod")
-HTML5_ATOM(spreadMethod, "spreadMethod")
-HTML5_ATOM(selection, "selection")
-HTML5_ATOM(size, "size")
-HTML5_ATOM(type, "type")
-HTML5_ATOM(unselectable, "unselectable")
-HTML5_ATOM(underline_position, "underline-position")
-HTML5_ATOM(underline_thickness, "underline-thickness")
-HTML5_ATOM(x_height, "x-height")
-HTML5_ATOM(diffuseconstant, "diffuseconstant")
-HTML5_ATOM(diffuseConstant, "diffuseConstant")
-HTML5_ATOM(href, "href")
-HTML5_ATOM(hreflang, "hreflang")
-HTML5_ATOM(onafterprint, "onafterprint")
-HTML5_ATOM(onafterupdate, "onafterupdate")
-HTML5_ATOM(profile, "profile")
-HTML5_ATOM(surfacescale, "surfacescale")
-HTML5_ATOM(surfaceScale, "surfaceScale")
-HTML5_ATOM(xref, "xref")
-HTML5_ATOM(align, "align")
-HTML5_ATOM(alignment_baseline, "alignment-baseline")
-HTML5_ATOM(alignmentscope, "alignmentscope")
-HTML5_ATOM(draggable, "draggable")
-HTML5_ATOM(height, "height")
-HTML5_ATOM(hanging, "hanging")
-HTML5_ATOM(image_rendering, "image-rendering")
-HTML5_ATOM(language, "language")
-HTML5_ATOM(largeop, "largeop")
-HTML5_ATOM(longdesc, "longdesc")
-HTML5_ATOM(lengthadjust, "lengthadjust")
-HTML5_ATOM(lengthAdjust, "lengthAdjust")
-HTML5_ATOM(marginheight, "marginheight")
-HTML5_ATOM(marginwidth, "marginwidth")
-HTML5_ATOM(nargs, "nargs")
-HTML5_ATOM(origin, "origin")
-HTML5_ATOM(ping, "ping")
-HTML5_ATOM(target, "target")
-HTML5_ATOM(targetx, "targetx")
-HTML5_ATOM(targetX, "targetX")
-HTML5_ATOM(targety, "targety")
-HTML5_ATOM(targetY, "targetY")
-HTML5_ATOM(alphabetic, "alphabetic")
-HTML5_ATOM(archive, "archive")
-HTML5_ATOM(high, "high")
-HTML5_ATOM(lighting_color, "lighting-color")
-HTML5_ATOM(mathematical, "mathematical")
-HTML5_ATOM(mathbackground, "mathbackground")
-HTML5_ATOM(method, "method")
-HTML5_ATOM(mathvariant, "mathvariant")
-HTML5_ATOM(mathcolor, "mathcolor")
-HTML5_ATOM(mathsize, "mathsize")
-HTML5_ATOM(noshade, "noshade")
-HTML5_ATOM(onchange, "onchange")
-HTML5_ATOM(pathlength, "pathlength")
-HTML5_ATOM(pathLength, "pathLength")
-HTML5_ATOM(path, "path")
-HTML5_ATOM(altimg, "altimg")
-HTML5_ATOM(actiontype, "actiontype")
-HTML5_ATOM(action, "action")
-HTML5_ATOM(active, "active")
-HTML5_ATOM(additive, "additive")
-HTML5_ATOM(begin, "begin")
-HTML5_ATOM(dominant_baseline, "dominant-baseline")
-HTML5_ATOM(divisor, "divisor")
-HTML5_ATOM(definitionurl, "definitionurl")
-HTML5_ATOM(definitionURL, "definitionURL")
-HTML5_ATOM(horiz_adv_x, "horiz-adv-x")
-HTML5_ATOM(horiz_origin_x, "horiz-origin-x")
-HTML5_ATOM(horiz_origin_y, "horiz-origin-y")
-HTML5_ATOM(limitingconeangle, "limitingconeangle")
-HTML5_ATOM(limitingConeAngle, "limitingConeAngle")
-HTML5_ATOM(mediummathspace, "mediummathspace")
-HTML5_ATOM(media, "media")
-HTML5_ATOM(manifest, "manifest")
-HTML5_ATOM(onfilterchange, "onfilterchange")
-HTML5_ATOM(onfinish, "onfinish")
-HTML5_ATOM(optimum, "optimum")
-HTML5_ATOM(radiogroup, "radiogroup")
-HTML5_ATOM(radius, "radius")
-HTML5_ATOM(scriptlevel, "scriptlevel")
-HTML5_ATOM(scriptsizemultiplier, "scriptsizemultiplier")
-HTML5_ATOM(string, "string")
-HTML5_ATOM(strikethrough_position, "strikethrough-position")
-HTML5_ATOM(strikethrough_thickness, "strikethrough-thickness")
-HTML5_ATOM(scriptminsize, "scriptminsize")
-HTML5_ATOM(tabindex, "tabindex")
-HTML5_ATOM(valign, "valign")
-HTML5_ATOM(visibility, "visibility")
-HTML5_ATOM(background, "background")
-HTML5_ATOM(link, "link")
-HTML5_ATOM(marker_mid, "marker-mid")
-HTML5_ATOM(markerheight, "markerheight")
-HTML5_ATOM(markerHeight, "markerHeight")
-HTML5_ATOM(marker_end, "marker-end")
-HTML5_ATOM(mask, "mask")
-HTML5_ATOM(marker_start, "marker-start")
-HTML5_ATOM(markerwidth, "markerwidth")
-HTML5_ATOM(markerWidth, "markerWidth")
-HTML5_ATOM(maskunits, "maskunits")
-HTML5_ATOM(maskUnits, "maskUnits")
-HTML5_ATOM(markerunits, "markerunits")
-HTML5_ATOM(markerUnits, "markerUnits")
-HTML5_ATOM(maskcontentunits, "maskcontentunits")
-HTML5_ATOM(maskContentUnits, "maskContentUnits")
-HTML5_ATOM(amplitude, "amplitude")
-HTML5_ATOM(cellspacing, "cellspacing")
-HTML5_ATOM(cellpadding, "cellpadding")
-HTML5_ATOM(declare, "declare")
-HTML5_ATOM(fill_rule, "fill-rule")
-HTML5_ATOM(fill, "fill")
-HTML5_ATOM(fill_opacity, "fill-opacity")
-HTML5_ATOM(maxlength, "maxlength")
-HTML5_ATOM(onclick, "onclick")
-HTML5_ATOM(onblur, "onblur")
-HTML5_ATOM(replace, "replace")
-HTML5_ATOM(rowlines, "rowlines")
-HTML5_ATOM(scale, "scale")
-HTML5_ATOM(style, "style")
-HTML5_ATOM(tablevalues, "tablevalues")
-HTML5_ATOM(tableValues, "tableValues")
-HTML5_ATOM(title, "title")
-HTML5_ATOM(v_alphabetic, "v-alphabetic")
-HTML5_ATOM(azimuth, "azimuth")
-HTML5_ATOM(format, "format")
-HTML5_ATOM(frameborder, "frameborder")
-HTML5_ATOM(frame, "frame")
-HTML5_ATOM(framespacing, "framespacing")
-HTML5_ATOM(from, "from")
-HTML5_ATOM(form, "form")
-HTML5_ATOM(prompt, "prompt")
-HTML5_ATOM(primitiveunits, "primitiveunits")
-HTML5_ATOM(primitiveUnits, "primitiveUnits")
-HTML5_ATOM(symmetric, "symmetric")
-HTML5_ATOM(stemh, "stemh")
-HTML5_ATOM(stemv, "stemv")
-HTML5_ATOM(seamless, "seamless")
-HTML5_ATOM(summary, "summary")
-HTML5_ATOM(usemap, "usemap")
-HTML5_ATOM(zoomandpan, "zoomandpan")
-HTML5_ATOM(zoomAndPan, "zoomAndPan")
-HTML5_ATOM(async, "async")
-HTML5_ATOM(alink, "alink")
-HTML5_ATOM(in, "in")
-HTML5_ATOM(icon, "icon")
-HTML5_ATOM(kernelmatrix, "kernelmatrix")
-HTML5_ATOM(kernelMatrix, "kernelMatrix")
-HTML5_ATOM(kerning, "kerning")
-HTML5_ATOM(kernelunitlength, "kernelunitlength")
-HTML5_ATOM(kernelUnitLength, "kernelUnitLength")
-HTML5_ATOM(onunload, "onunload")
-HTML5_ATOM(open, "open")
-HTML5_ATOM(oninvalid, "oninvalid")
-HTML5_ATOM(onend, "onend")
-HTML5_ATOM(oninput, "oninput")
-HTML5_ATOM(pointer_events, "pointer-events")
-HTML5_ATOM(points, "points")
-HTML5_ATOM(pointsatx, "pointsatx")
-HTML5_ATOM(pointsAtX, "pointsAtX")
-HTML5_ATOM(pointsaty, "pointsaty")
-HTML5_ATOM(pointsAtY, "pointsAtY")
-HTML5_ATOM(pointsatz, "pointsatz")
-HTML5_ATOM(pointsAtZ, "pointsAtZ")
-HTML5_ATOM(span, "span")
-HTML5_ATOM(standby, "standby")
-HTML5_ATOM(thinmathspace, "thinmathspace")
-HTML5_ATOM(transform, "transform")
-HTML5_ATOM(vlink, "vlink")
-HTML5_ATOM(when, "when")
-HTML5_ATOM(xlink_href, "xlink:href")
-HTML5_ATOM(xlink_title, "xlink:title")
-HTML5_ATOM(xlink_role, "xlink:role")
-HTML5_ATOM(xlink_arcrole, "xlink:arcrole")
-HTML5_ATOM(arcrole, "arcrole")
-HTML5_ATOM(xmlns_xlink, "xmlns:xlink")
-HTML5_ATOM(xlink_type, "xlink:type")
-HTML5_ATOM(xlink_show, "xlink:show")
-HTML5_ATOM(show, "show")
-HTML5_ATOM(xlink_actuate, "xlink:actuate")
-HTML5_ATOM(actuate, "actuate")
-HTML5_ATOM(autoplay, "autoplay")
-HTML5_ATOM(autosubmit, "autosubmit")
-HTML5_ATOM(autocomplete, "autocomplete")
-HTML5_ATOM(autofocus, "autofocus")
-HTML5_ATOM(bgcolor, "bgcolor")
-HTML5_ATOM(color_profile, "color-profile")
-HTML5_ATOM(color_rendering, "color-rendering")
-HTML5_ATOM(color_interpolation, "color-interpolation")
-HTML5_ATOM(color, "color")
-HTML5_ATOM(color_interpolation_filters, "color-interpolation-filters")
-HTML5_ATOM(encoding, "encoding")
-HTML5_ATOM(exponent, "exponent")
-HTML5_ATOM(flood_color, "flood-color")
-HTML5_ATOM(flood_opacity, "flood-opacity")
-HTML5_ATOM(ideographic, "ideographic")
-HTML5_ATOM(lquote, "lquote")
-HTML5_ATOM(panose_1, "panose-1")
-HTML5_ATOM(numoctaves, "numoctaves")
-HTML5_ATOM(numOctaves, "numOctaves")
-HTML5_ATOM(onload, "onload")
-HTML5_ATOM(onbounce, "onbounce")
-HTML5_ATOM(oncontrolselect, "oncontrolselect")
-HTML5_ATOM(onrowsinserted, "onrowsinserted")
-HTML5_ATOM(onmousewheel, "onmousewheel")
-HTML5_ATOM(onrowenter, "onrowenter")
-HTML5_ATOM(onmouseenter, "onmouseenter")
-HTML5_ATOM(onmouseover, "onmouseover")
-HTML5_ATOM(onformchange, "onformchange")
-HTML5_ATOM(onfocusin, "onfocusin")
-HTML5_ATOM(onrowexit, "onrowexit")
-HTML5_ATOM(onmoveend, "onmoveend")
-HTML5_ATOM(oncontextmenu, "oncontextmenu")
-HTML5_ATOM(onzoom, "onzoom")
-HTML5_ATOM(onlosecapture, "onlosecapture")
-HTML5_ATOM(oncopy, "oncopy")
-HTML5_ATOM(onmovestart, "onmovestart")
-HTML5_ATOM(onrowsdelete, "onrowsdelete")
-HTML5_ATOM(onmouseleave, "onmouseleave")
-HTML5_ATOM(onmove, "onmove")
-HTML5_ATOM(onmousemove, "onmousemove")
-HTML5_ATOM(onmouseup, "onmouseup")
-HTML5_ATOM(onfocus, "onfocus")
-HTML5_ATOM(onmouseout, "onmouseout")
-HTML5_ATOM(onforminput, "onforminput")
-HTML5_ATOM(onfocusout, "onfocusout")
-HTML5_ATOM(onmousedown, "onmousedown")
-HTML5_ATOM(to, "to")
-HTML5_ATOM(rquote, "rquote")
-HTML5_ATOM(stroke_linecap, "stroke-linecap")
-HTML5_ATOM(scrolldelay, "scrolldelay")
-HTML5_ATOM(stroke_dasharray, "stroke-dasharray")
-HTML5_ATOM(stroke_dashoffset, "stroke-dashoffset")
-HTML5_ATOM(stroke_linejoin, "stroke-linejoin")
-HTML5_ATOM(stroke_miterlimit, "stroke-miterlimit")
-HTML5_ATOM(stroke, "stroke")
-HTML5_ATOM(scrolling, "scrolling")
-HTML5_ATOM(stroke_width, "stroke-width")
-HTML5_ATOM(stroke_opacity, "stroke-opacity")
-HTML5_ATOM(compact, "compact")
-HTML5_ATOM(clip, "clip")
-HTML5_ATOM(clip_rule, "clip-rule")
-HTML5_ATOM(clip_path, "clip-path")
-HTML5_ATOM(clippathunits, "clippathunits")
-HTML5_ATOM(clipPathUnits, "clipPathUnits")
-HTML5_ATOM(display, "display")
-HTML5_ATOM(displaystyle, "displaystyle")
-HTML5_ATOM(glyph_orientation_vertical, "glyph-orientation-vertical")
-HTML5_ATOM(glyph_orientation_horizontal, "glyph-orientation-horizontal")
-HTML5_ATOM(glyphref, "glyphref")
-HTML5_ATOM(glyphRef, "glyphRef")
-HTML5_ATOM(glyph_name, "glyph-name")
-HTML5_ATOM(http_equiv, "http-equiv")
-HTML5_ATOM(keypoints, "keypoints")
-HTML5_ATOM(keyPoints, "keyPoints")
-HTML5_ATOM(loop, "loop")
-HTML5_ATOM(property, "property")
-HTML5_ATOM(scoped, "scoped")
-HTML5_ATOM(step, "step")
-HTML5_ATOM(shape_rendering, "shape-rendering")
-HTML5_ATOM(scope, "scope")
-HTML5_ATOM(shape, "shape")
-HTML5_ATOM(slope, "slope")
-HTML5_ATOM(stop_color, "stop-color")
-HTML5_ATOM(stop_opacity, "stop-opacity")
-HTML5_ATOM(template_, "template")
-HTML5_ATOM(wrap, "wrap")
-HTML5_ATOM(abbr, "abbr")
-HTML5_ATOM(attributename, "attributename")
-HTML5_ATOM(attributeName, "attributeName")
-HTML5_ATOM(attributetype, "attributetype")
-HTML5_ATOM(attributeType, "attributeType")
-HTML5_ATOM(char_, "char")
-HTML5_ATOM(coords, "coords")
-HTML5_ATOM(charoff, "charoff")
-HTML5_ATOM(charset, "charset")
-HTML5_ATOM(macros, "macros")
-HTML5_ATOM(nowrap, "nowrap")
-HTML5_ATOM(nohref, "nohref")
-HTML5_ATOM(ondrag, "ondrag")
-HTML5_ATOM(ondragenter, "ondragenter")
-HTML5_ATOM(ondragover, "ondragover")
-HTML5_ATOM(onpropertychange, "onpropertychange")
-HTML5_ATOM(ondragend, "ondragend")
-HTML5_ATOM(ondrop, "ondrop")
-HTML5_ATOM(ondragdrop, "ondragdrop")
-HTML5_ATOM(overline_position, "overline-position")
-HTML5_ATOM(onerror, "onerror")
-HTML5_ATOM(operator_, "operator")
-HTML5_ATOM(overflow, "overflow")
-HTML5_ATOM(ondragstart, "ondragstart")
-HTML5_ATOM(onerrorupdate, "onerrorupdate")
-HTML5_ATOM(overline_thickness, "overline-thickness")
-HTML5_ATOM(ondragleave, "ondragleave")
-HTML5_ATOM(startoffset, "startoffset")
-HTML5_ATOM(startOffset, "startOffset")
-HTML5_ATOM(start, "start")
-HTML5_ATOM(axis, "axis")
-HTML5_ATOM(bias, "bias")
-HTML5_ATOM(colspan, "colspan")
-HTML5_ATOM(classid, "classid")
-HTML5_ATOM(crossorigin, "crossorigin")
-HTML5_ATOM(cols, "cols")
-HTML5_ATOM(cursor, "cursor")
-HTML5_ATOM(closure, "closure")
-HTML5_ATOM(close, "close")
-HTML5_ATOM(class_, "class")
-HTML5_ATOM(keysystem, "keysystem")
-HTML5_ATOM(keysplines, "keysplines")
-HTML5_ATOM(keySplines, "keySplines")
-HTML5_ATOM(lowsrc, "lowsrc")
-HTML5_ATOM(maxsize, "maxsize")
-HTML5_ATOM(minsize, "minsize")
-HTML5_ATOM(offset, "offset")
-HTML5_ATOM(preservealpha, "preservealpha")
-HTML5_ATOM(preserveAlpha, "preserveAlpha")
-HTML5_ATOM(preserveaspectratio, "preserveaspectratio")
-HTML5_ATOM(preserveAspectRatio, "preserveAspectRatio")
-HTML5_ATOM(rowspan, "rowspan")
-HTML5_ATOM(rowspacing, "rowspacing")
-HTML5_ATOM(rows, "rows")
-HTML5_ATOM(srcset, "srcset")
-HTML5_ATOM(subscriptshift, "subscriptshift")
-HTML5_ATOM(version, "version")
-HTML5_ATOM(alttext, "alttext")
-HTML5_ATOM(contenteditable, "contenteditable")
-HTML5_ATOM(controls, "controls")
-HTML5_ATOM(content, "content")
-HTML5_ATOM(contextmenu, "contextmenu")
-HTML5_ATOM(depth, "depth")
-HTML5_ATOM(enctype, "enctype")
-HTML5_ATOM(font_stretch, "font-stretch")
-HTML5_ATOM(filter, "filter")
-HTML5_ATOM(fontweight, "fontweight")
-HTML5_ATOM(font_weight, "font-weight")
-HTML5_ATOM(fontstyle, "fontstyle")
-HTML5_ATOM(font_style, "font-style")
-HTML5_ATOM(fontfamily, "fontfamily")
-HTML5_ATOM(font_family, "font-family")
-HTML5_ATOM(font_variant, "font-variant")
-HTML5_ATOM(font_size_adjust, "font-size-adjust")
-HTML5_ATOM(filterunits, "filterunits")
-HTML5_ATOM(filterUnits, "filterUnits")
-HTML5_ATOM(fontsize, "fontsize")
-HTML5_ATOM(font_size, "font-size")
-HTML5_ATOM(keytimes, "keytimes")
-HTML5_ATOM(keyTimes, "keyTimes")
-HTML5_ATOM(letter_spacing, "letter-spacing")
-HTML5_ATOM(list, "list")
-HTML5_ATOM(multiple, "multiple")
-HTML5_ATOM(rt, "rt")
-HTML5_ATOM(onstop, "onstop")
-HTML5_ATOM(onstart, "onstart")
-HTML5_ATOM(poster, "poster")
-HTML5_ATOM(patterntransform, "patterntransform")
-HTML5_ATOM(patternTransform, "patternTransform")
-HTML5_ATOM(pattern, "pattern")
-HTML5_ATOM(patternunits, "patternunits")
-HTML5_ATOM(patternUnits, "patternUnits")
-HTML5_ATOM(patterncontentunits, "patterncontentunits")
-HTML5_ATOM(patternContentUnits, "patternContentUnits")
-HTML5_ATOM(restart, "restart")
-HTML5_ATOM(stitchtiles, "stitchtiles")
-HTML5_ATOM(stitchTiles, "stitchTiles")
-HTML5_ATOM(systemlanguage, "systemlanguage")
-HTML5_ATOM(systemLanguage, "systemLanguage")
-HTML5_ATOM(text_rendering, "text-rendering")
-HTML5_ATOM(vert_origin_x, "vert-origin-x")
-HTML5_ATOM(vert_adv_y, "vert-adv-y")
-HTML5_ATOM(vert_origin_y, "vert-origin-y")
-HTML5_ATOM(text_decoration, "text-decoration")
-HTML5_ATOM(text_anchor, "text-anchor")
-HTML5_ATOM(textlength, "textlength")
-HTML5_ATOM(textLength, "textLength")
-HTML5_ATOM(text, "text")
-HTML5_ATOM(units_per_em, "units-per-em")
-HTML5_ATOM(writing_mode, "writing-mode")
-HTML5_ATOM(widths, "widths")
-HTML5_ATOM(width, "width")
-HTML5_ATOM(accumulate, "accumulate")
-HTML5_ATOM(columnspan, "columnspan")
-HTML5_ATOM(columnlines, "columnlines")
-HTML5_ATOM(columnalign, "columnalign")
-HTML5_ATOM(columnspacing, "columnspacing")
-HTML5_ATOM(columnwidth, "columnwidth")
-HTML5_ATOM(groupalign, "groupalign")
-HTML5_ATOM(inputmode, "inputmode")
-HTML5_ATOM(occurrence, "occurrence")
-HTML5_ATOM(onsubmit, "onsubmit")
-HTML5_ATOM(oncut, "oncut")
-HTML5_ATOM(required, "required")
-HTML5_ATOM(requiredfeatures, "requiredfeatures")
-HTML5_ATOM(requiredFeatures, "requiredFeatures")
-HTML5_ATOM(result, "result")
-HTML5_ATOM(requiredextensions, "requiredextensions")
-HTML5_ATOM(requiredExtensions, "requiredExtensions")
-HTML5_ATOM(values, "values")
-HTML5_ATOM(valuetype, "valuetype")
-HTML5_ATOM(value, "value")
-HTML5_ATOM(elevation, "elevation")
-HTML5_ATOM(viewtarget, "viewtarget")
-HTML5_ATOM(viewTarget, "viewTarget")
-HTML5_ATOM(viewbox, "viewbox")
-HTML5_ATOM(viewBox, "viewBox")
-HTML5_ATOM(cx, "cx")
-HTML5_ATOM(dx, "dx")
-HTML5_ATOM(fx, "fx")
-HTML5_ATOM(bbox, "bbox")
-HTML5_ATOM(rx, "rx")
-HTML5_ATOM(refx, "refx")
-HTML5_ATOM(refX, "refX")
-HTML5_ATOM(by, "by")
-HTML5_ATOM(cy, "cy")
-HTML5_ATOM(dy, "dy")
-HTML5_ATOM(fy, "fy")
-HTML5_ATOM(ry, "ry")
-HTML5_ATOM(refy, "refy")
-HTML5_ATOM(refY, "refY")
-HTML5_ATOM(verythinmathspace, "verythinmathspace")
-HTML5_ATOM(verythickmathspace, "verythickmathspace")
-HTML5_ATOM(veryverythinmathspace, "veryverythinmathspace")
-HTML5_ATOM(veryverythickmathspace, "veryverythickmathspace")
-HTML5_ATOM(annotation_xml, "annotation-xml")
-HTML5_ATOM(isindex, "isindex")
-HTML5_ATOM(big, "big")
-HTML5_ATOM(bdo, "bdo")
-HTML5_ATOM(col, "col")
-HTML5_ATOM(del, "del")
-HTML5_ATOM(dfn, "dfn")
-HTML5_ATOM(div, "div")
-HTML5_ATOM(img, "img")
-HTML5_ATOM(ins, "ins")
-HTML5_ATOM(kbd, "kbd")
-HTML5_ATOM(map, "map")
-HTML5_ATOM(nav, "nav")
-HTML5_ATOM(pre, "pre")
-HTML5_ATOM(a, "a")
-HTML5_ATOM(b, "b")
-HTML5_ATOM(rtc, "rtc")
-HTML5_ATOM(sub, "sub")
-HTML5_ATOM(svg, "svg")
-HTML5_ATOM(sup, "sup")
-HTML5_ATOM(set, "set")
-HTML5_ATOM(use, "use")
-HTML5_ATOM(var, "var")
-HTML5_ATOM(g, "g")
-HTML5_ATOM(wbr, "wbr")
-HTML5_ATOM(xmp, "xmp")
-HTML5_ATOM(i, "i")
-HTML5_ATOM(p, "p")
-HTML5_ATOM(q, "q")
-HTML5_ATOM(s, "s")
-HTML5_ATOM(u, "u")
-HTML5_ATOM(h1, "h1")
-HTML5_ATOM(h2, "h2")
-HTML5_ATOM(h3, "h3")
-HTML5_ATOM(h4, "h4")
-HTML5_ATOM(h5, "h5")
-HTML5_ATOM(h6, "h6")
-HTML5_ATOM(area, "area")
-HTML5_ATOM(fefunca, "fefunca")
-HTML5_ATOM(feFuncA, "feFuncA")
-HTML5_ATOM(metadata, "metadata")
-HTML5_ATOM(meta, "meta")
-HTML5_ATOM(textarea, "textarea")
-HTML5_ATOM(fefuncb, "fefuncb")
-HTML5_ATOM(feFuncB, "feFuncB")
-HTML5_ATOM(rb, "rb")
-HTML5_ATOM(desc, "desc")
-HTML5_ATOM(dd, "dd")
-HTML5_ATOM(bgsound, "bgsound")
-HTML5_ATOM(embed, "embed")
-HTML5_ATOM(feblend, "feblend")
-HTML5_ATOM(feBlend, "feBlend")
-HTML5_ATOM(feflood, "feflood")
-HTML5_ATOM(feFlood, "feFlood")
-HTML5_ATOM(head, "head")
-HTML5_ATOM(legend, "legend")
-HTML5_ATOM(noembed, "noembed")
-HTML5_ATOM(td, "td")
-HTML5_ATOM(thead, "thead")
-HTML5_ATOM(aside, "aside")
-HTML5_ATOM(article, "article")
-HTML5_ATOM(animate, "animate")
-HTML5_ATOM(blockquote, "blockquote")
-HTML5_ATOM(circle, "circle")
-HTML5_ATOM(ellipse, "ellipse")
-HTML5_ATOM(feturbulence, "feturbulence")
-HTML5_ATOM(feTurbulence, "feTurbulence")
-HTML5_ATOM(femergenode, "femergenode")
-HTML5_ATOM(feMergeNode, "feMergeNode")
-HTML5_ATOM(feimage, "feimage")
-HTML5_ATOM(feImage, "feImage")
-HTML5_ATOM(femerge, "femerge")
-HTML5_ATOM(feMerge, "feMerge")
-HTML5_ATOM(fetile, "fetile")
-HTML5_ATOM(feTile, "feTile")
-HTML5_ATOM(figure, "figure")
-HTML5_ATOM(fecomposite, "fecomposite")
-HTML5_ATOM(feComposite, "feComposite")
-HTML5_ATOM(image, "image")
-HTML5_ATOM(iframe, "iframe")
-HTML5_ATOM(line, "line")
-HTML5_ATOM(marquee, "marquee")
-HTML5_ATOM(polyline, "polyline")
-HTML5_ATOM(picture, "picture")
-HTML5_ATOM(source, "source")
-HTML5_ATOM(strike, "strike")
-HTML5_ATOM(table, "table")
-HTML5_ATOM(time, "time")
-HTML5_ATOM(altglyphdef, "altglyphdef")
-HTML5_ATOM(altGlyphDef, "altGlyphDef")
-HTML5_ATOM(dialog, "dialog")
-HTML5_ATOM(fefuncg, "fefuncg")
-HTML5_ATOM(feFuncG, "feFuncG")
-HTML5_ATOM(fediffuselighting, "fediffuselighting")
-HTML5_ATOM(feDiffuseLighting, "feDiffuseLighting")
-HTML5_ATOM(fespecularlighting, "fespecularlighting")
-HTML5_ATOM(feSpecularLighting, "feSpecularLighting")
-HTML5_ATOM(listing, "listing")
-HTML5_ATOM(strong, "strong")
-HTML5_ATOM(altglyph, "altglyph")
-HTML5_ATOM(altGlyph, "altGlyph")
-HTML5_ATOM(clippath, "clippath")
-HTML5_ATOM(clipPath, "clipPath")
-HTML5_ATOM(mglyph, "mglyph")
-HTML5_ATOM(math, "math")
-HTML5_ATOM(mpath, "mpath")
-HTML5_ATOM(th, "th")
-HTML5_ATOM(switch_, "switch")
-HTML5_ATOM(textpath, "textpath")
-HTML5_ATOM(textPath, "textPath")
-HTML5_ATOM(li, "li")
-HTML5_ATOM(mi, "mi")
-HTML5_ATOM(mark, "mark")
-HTML5_ATOM(malignmark, "malignmark")
-HTML5_ATOM(track, "track")
-HTML5_ATOM(dl, "dl")
-HTML5_ATOM(html, "html")
-HTML5_ATOM(ol, "ol")
-HTML5_ATOM(ul, "ul")
-HTML5_ATOM(small_, "small")
-HTML5_ATOM(symbol, "symbol")
-HTML5_ATOM(altglyphitem, "altglyphitem")
-HTML5_ATOM(altGlyphItem, "altGlyphItem")
-HTML5_ATOM(animatetransform, "animatetransform")
-HTML5_ATOM(animateTransform, "animateTransform")
-HTML5_ATOM(acronym, "acronym")
-HTML5_ATOM(em, "em")
-HTML5_ATOM(menuitem, "menuitem")
-HTML5_ATOM(param, "param")
-HTML5_ATOM(animatemotion, "animatemotion")
-HTML5_ATOM(animateMotion, "animateMotion")
-HTML5_ATOM(button, "button")
-HTML5_ATOM(caption, "caption")
-HTML5_ATOM(figcaption, "figcaption")
-HTML5_ATOM(mn, "mn")
-HTML5_ATOM(keygen, "keygen")
-HTML5_ATOM(main, "main")
-HTML5_ATOM(option, "option")
-HTML5_ATOM(polygon, "polygon")
-HTML5_ATOM(section, "section")
-HTML5_ATOM(tspan, "tspan")
-HTML5_ATOM(audio, "audio")
-HTML5_ATOM(mo, "mo")
-HTML5_ATOM(video, "video")
-HTML5_ATOM(colgroup, "colgroup")
-HTML5_ATOM(fedisplacementmap, "fedisplacementmap")
-HTML5_ATOM(feDisplacementMap, "feDisplacementMap")
-HTML5_ATOM(hgroup, "hgroup")
-HTML5_ATOM(rp, "rp")
-HTML5_ATOM(optgroup, "optgroup")
-HTML5_ATOM(samp, "samp")
-HTML5_ATOM(stop, "stop")
-HTML5_ATOM(br, "br")
-HTML5_ATOM(animatecolor, "animatecolor")
-HTML5_ATOM(animateColor, "animateColor")
-HTML5_ATOM(center, "center")
-HTML5_ATOM(hr, "hr")
-HTML5_ATOM(fefuncr, "fefuncr")
-HTML5_ATOM(feFuncR, "feFuncR")
-HTML5_ATOM(fecomponenttransfer, "fecomponenttransfer")
-HTML5_ATOM(feComponentTransfer, "feComponentTransfer")
-HTML5_ATOM(footer, "footer")
-HTML5_ATOM(fegaussianblur, "fegaussianblur")
-HTML5_ATOM(feGaussianBlur, "feGaussianBlur")
-HTML5_ATOM(header, "header")
-HTML5_ATOM(marker, "marker")
-HTML5_ATOM(meter, "meter")
-HTML5_ATOM(nobr, "nobr")
-HTML5_ATOM(tr, "tr")
-HTML5_ATOM(address, "address")
-HTML5_ATOM(canvas, "canvas")
-HTML5_ATOM(defs, "defs")
-HTML5_ATOM(details, "details")
-HTML5_ATOM(ms, "ms")
-HTML5_ATOM(noframes, "noframes")
-HTML5_ATOM(progress, "progress")
-HTML5_ATOM(dt, "dt")
-HTML5_ATOM(applet, "applet")
-HTML5_ATOM(basefont, "basefont")
-HTML5_ATOM(foreignobject, "foreignobject")
-HTML5_ATOM(foreignObject, "foreignObject")
-HTML5_ATOM(fieldset, "fieldset")
-HTML5_ATOM(frameset, "frameset")
-HTML5_ATOM(feoffset, "feoffset")
-HTML5_ATOM(feOffset, "feOffset")
-HTML5_ATOM(fespotlight, "fespotlight")
-HTML5_ATOM(feSpotLight, "feSpotLight")
-HTML5_ATOM(fepointlight, "fepointlight")
-HTML5_ATOM(fePointLight, "fePointLight")
-HTML5_ATOM(fedistantlight, "fedistantlight")
-HTML5_ATOM(feDistantLight, "feDistantLight")
-HTML5_ATOM(font, "font")
-HTML5_ATOM(input, "input")
-HTML5_ATOM(lineargradient, "lineargradient")
-HTML5_ATOM(linearGradient, "linearGradient")
-HTML5_ATOM(mtext, "mtext")
-HTML5_ATOM(noscript, "noscript")
-HTML5_ATOM(output, "output")
-HTML5_ATOM(plaintext, "plaintext")
-HTML5_ATOM(tt, "tt")
-HTML5_ATOM(rect, "rect")
-HTML5_ATOM(radialgradient, "radialgradient")
-HTML5_ATOM(radialGradient, "radialGradient")
-HTML5_ATOM(select, "select")
-HTML5_ATOM(script, "script")
-HTML5_ATOM(tfoot, "tfoot")
-HTML5_ATOM(menu, "menu")
-HTML5_ATOM(fedropshadow, "fedropshadow")
-HTML5_ATOM(feDropShadow, "feDropShadow")
-HTML5_ATOM(view, "view")
-HTML5_ATOM(fecolormatrix, "fecolormatrix")
-HTML5_ATOM(feColorMatrix, "feColorMatrix")
-HTML5_ATOM(feconvolvematrix, "feconvolvematrix")
-HTML5_ATOM(feConvolveMatrix, "feConvolveMatrix")
-HTML5_ATOM(body, "body")
-HTML5_ATOM(femorphology, "femorphology")
-HTML5_ATOM(feMorphology, "feMorphology")
-HTML5_ATOM(ruby, "ruby")
-HTML5_ATOM(tbody, "tbody")
-HTML5_ATOM(emptystring, "")
deleted file mode 100644
--- a/parser/html/nsHtml5Atoms.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
-/*
- * This class wraps up the creation (and destruction) of the standard
- * set of atoms used by the HTML5 parser; the atoms are created when
- * nsHtml5Module is loaded and they are destroyed when nsHtml5Module is
- * unloaded.
- */
-
-#include "nsHtml5Atoms.h"
-#include "nsStaticAtom.h"
-
-using namespace mozilla;
-
-// define storage for all atoms
-#define HTML5_ATOM(_name, _value) nsIAtom* nsHtml5Atoms::_name;
-#include "nsHtml5AtomList.h"
-#undef HTML5_ATOM
-
-#define HTML5_ATOM(name_, value_) NS_STATIC_ATOM_BUFFER(name_##_buffer, value_)
-#include "nsHtml5AtomList.h"
-#undef HTML5_ATOM
-
-static const nsStaticAtom Html5Atoms_info[] = {
-#define HTML5_ATOM(name_, value_) NS_STATIC_ATOM(name_##_buffer, &nsHtml5Atoms::name_),
-#include "nsHtml5AtomList.h"
-#undef HTML5_ATOM
-};
-
-void nsHtml5Atoms::AddRefAtoms()
-{
-  NS_RegisterStaticAtoms(Html5Atoms_info);
-}
deleted file mode 100644
--- a/parser/html/nsHtml5Atoms.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
- 
-/*
- * This class wraps up the creation (and destruction) of the standard
- * set of atoms used by gklayout; the atoms are created when gklayout
- * is loaded and they are destroyed when gklayout is unloaded.
- */
-
-#ifndef nsHtml5Atoms_h
-#define nsHtml5Atoms_h
-
-#include "nsIAtom.h"
-
-class nsHtml5Atoms {
-  public:
-    static void AddRefAtoms();
-    /* Declare all atoms
-       The atom names and values are stored in nsGkAtomList.h and
-       are brought to you by the magic of C preprocessing
-       Add new atoms to nsGkAtomList and all support logic will be auto-generated
-     */
-#define HTML5_ATOM(_name, _value) static nsIAtom* _name;
-#include "nsHtml5AtomList.h"
-#undef HTML5_ATOM
-};
-
-#endif /* nsHtml5Atoms_h */
--- a/parser/html/nsHtml5AttributeName.cpp
+++ b/parser/html/nsHtml5AttributeName.cpp
@@ -31,17 +31,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 #include "nsHtml5ElementName.h"
 #include "nsHtml5Tokenizer.h"
@@ -873,1289 +873,1330 @@ nsHtml5AttributeName::initializeStatics(
   XLINK_NS[1] = kNameSpaceID_XLink;
   XLINK_NS[2] = kNameSpaceID_XLink;
   ALL_NO_PREFIX = new nsIAtom*[3];
   ALL_NO_PREFIX[0] = nullptr;
   ALL_NO_PREFIX[1] = nullptr;
   ALL_NO_PREFIX[2] = nullptr;
   XMLNS_PREFIX = new nsIAtom*[3];
   XMLNS_PREFIX[0] = nullptr;
-  XMLNS_PREFIX[1] = nsHtml5Atoms::xmlns;
-  XMLNS_PREFIX[2] = nsHtml5Atoms::xmlns;
+  XMLNS_PREFIX[1] = nsGkAtoms::xmlns;
+  XMLNS_PREFIX[2] = nsGkAtoms::xmlns;
   XLINK_PREFIX = new nsIAtom*[3];
   XLINK_PREFIX[0] = nullptr;
-  XLINK_PREFIX[1] = nsHtml5Atoms::xlink;
-  XLINK_PREFIX[2] = nsHtml5Atoms::xlink;
+  XLINK_PREFIX[1] = nsGkAtoms::xlink;
+  XLINK_PREFIX[2] = nsGkAtoms::xlink;
   XML_PREFIX = new nsIAtom*[3];
   XML_PREFIX[0] = nullptr;
-  XML_PREFIX[1] = nsHtml5Atoms::xml;
-  XML_PREFIX[2] = nsHtml5Atoms::xml;
+  XML_PREFIX[1] = nsGkAtoms::xml;
+  XML_PREFIX[2] = nsGkAtoms::xml;
   ATTR_ALT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::alt), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::alt), ALL_NO_PREFIX);
   ATTR_DIR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::dir), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::dir), ALL_NO_PREFIX);
   ATTR_DUR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::dur), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::dur), ALL_NO_PREFIX);
   ATTR_END = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::end), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::end), ALL_NO_PREFIX);
   ATTR_FOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::for_), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::_for), ALL_NO_PREFIX);
   ATTR_IN2 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::in2), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::in2), ALL_NO_PREFIX);
   ATTR_LOW = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::low), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::low), ALL_NO_PREFIX);
   ATTR_MIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::min), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::min), ALL_NO_PREFIX);
   ATTR_MAX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::max), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::max), ALL_NO_PREFIX);
   ATTR_REL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rel), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rel), ALL_NO_PREFIX);
   ATTR_REV = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rev), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rev), ALL_NO_PREFIX);
   ATTR_SRC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::src), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::src), ALL_NO_PREFIX);
   ATTR_D = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::d), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::d), ALL_NO_PREFIX);
   ATTR_K = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::k), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::k), ALL_NO_PREFIX);
   ATTR_R = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::r), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::r), ALL_NO_PREFIX);
   ATTR_X = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::x), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::x), ALL_NO_PREFIX);
   ATTR_Y = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::y), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::y), ALL_NO_PREFIX);
   ATTR_Z = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::z), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::z), ALL_NO_PREFIX);
   ATTR_CAP_HEIGHT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::cap_height), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::cap_height), ALL_NO_PREFIX);
   ATTR_G1 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::g1), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::g1), ALL_NO_PREFIX);
   ATTR_K1 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::k1), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::k1), ALL_NO_PREFIX);
   ATTR_U1 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::u1), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::u1), ALL_NO_PREFIX);
   ATTR_X1 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::x1), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::x1), ALL_NO_PREFIX);
   ATTR_Y1 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::y1), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::y1), ALL_NO_PREFIX);
   ATTR_G2 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::g2), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::g2), ALL_NO_PREFIX);
   ATTR_K2 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::k2), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::k2), ALL_NO_PREFIX);
   ATTR_U2 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::u2), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::u2), ALL_NO_PREFIX);
   ATTR_X2 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::x2), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::x2), ALL_NO_PREFIX);
   ATTR_Y2 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::y2), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::y2), ALL_NO_PREFIX);
   ATTR_K3 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::k3), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::k3), ALL_NO_PREFIX);
   ATTR_K4 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::k4), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::k4), ALL_NO_PREFIX);
   ATTR_XML_SPACE = new nsHtml5AttributeName(
     XML_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xml_space, nsHtml5Atoms::space),
+    COLONIFIED_LOCAL(nsGkAtoms::xml_space, nsGkAtoms::space),
     XML_PREFIX);
   ATTR_XML_LANG = new nsHtml5AttributeName(
-    XML_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xml_lang, nsHtml5Atoms::lang),
-    XML_PREFIX);
+    XML_NS, COLONIFIED_LOCAL(nsGkAtoms::xml_lang, nsGkAtoms::lang), XML_PREFIX);
   ATTR_XML_BASE = new nsHtml5AttributeName(
-    XML_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xml_base, nsHtml5Atoms::base),
-    XML_PREFIX);
+    XML_NS, COLONIFIED_LOCAL(nsGkAtoms::xml_base, nsGkAtoms::base), XML_PREFIX);
   ATTR_ARIA_GRAB = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_grab), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_grab), ALL_NO_PREFIX);
   ATTR_ARIA_VALUEMAX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_valuemax), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_valuemax), ALL_NO_PREFIX);
   ATTR_ARIA_LABELLEDBY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_labelledby), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_labelledby), ALL_NO_PREFIX);
   ATTR_ARIA_DESCRIBEDBY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_describedby), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_describedby), ALL_NO_PREFIX);
   ATTR_ARIA_DISABLED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_disabled), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_disabled), ALL_NO_PREFIX);
   ATTR_ARIA_CHECKED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_checked), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_checked), ALL_NO_PREFIX);
   ATTR_ARIA_SELECTED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_selected), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_selected), ALL_NO_PREFIX);
   ATTR_ARIA_DROPEFFECT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_dropeffect), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_dropeffect), ALL_NO_PREFIX);
   ATTR_ARIA_REQUIRED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_required), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_required), ALL_NO_PREFIX);
   ATTR_ARIA_EXPANDED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_expanded), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_expanded), ALL_NO_PREFIX);
   ATTR_ARIA_PRESSED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_pressed), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_pressed), ALL_NO_PREFIX);
   ATTR_ARIA_LEVEL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_level), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_level), ALL_NO_PREFIX);
   ATTR_ARIA_CHANNEL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_channel), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_channel), ALL_NO_PREFIX);
   ATTR_ARIA_HIDDEN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_hidden), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_hidden), ALL_NO_PREFIX);
   ATTR_ARIA_SECRET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_secret), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_secret), ALL_NO_PREFIX);
   ATTR_ARIA_POSINSET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_posinset), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_posinset), ALL_NO_PREFIX);
   ATTR_ARIA_ATOMIC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_atomic), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_atomic), ALL_NO_PREFIX);
   ATTR_ARIA_INVALID = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_invalid), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_invalid), ALL_NO_PREFIX);
   ATTR_ARIA_TEMPLATEID = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_templateid), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_templateid), ALL_NO_PREFIX);
   ATTR_ARIA_VALUEMIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_valuemin), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_valuemin), ALL_NO_PREFIX);
   ATTR_ARIA_MULTISELECTABLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_multiselectable), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_multiselectable), ALL_NO_PREFIX);
   ATTR_ARIA_CONTROLS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_controls), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_controls), ALL_NO_PREFIX);
   ATTR_ARIA_MULTILINE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_multiline), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_multiline), ALL_NO_PREFIX);
   ATTR_ARIA_READONLY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_readonly), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_readonly), ALL_NO_PREFIX);
   ATTR_ARIA_OWNS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_owns), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_owns), ALL_NO_PREFIX);
   ATTR_ARIA_ACTIVEDESCENDANT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_activedescendant), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_activedescendant), ALL_NO_PREFIX);
   ATTR_ARIA_RELEVANT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_relevant), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_relevant), ALL_NO_PREFIX);
   ATTR_ARIA_DATATYPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_datatype), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_datatype), ALL_NO_PREFIX);
   ATTR_ARIA_VALUENOW = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_valuenow), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_valuenow), ALL_NO_PREFIX);
   ATTR_ARIA_SORT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_sort), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_sort), ALL_NO_PREFIX);
   ATTR_ARIA_AUTOCOMPLETE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_autocomplete), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_autocomplete), ALL_NO_PREFIX);
   ATTR_ARIA_FLOWTO = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_flowto), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_flowto), ALL_NO_PREFIX);
   ATTR_ARIA_BUSY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_busy), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_busy), ALL_NO_PREFIX);
   ATTR_ARIA_LIVE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_live), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_live), ALL_NO_PREFIX);
   ATTR_ARIA_HASPOPUP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_haspopup), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_haspopup), ALL_NO_PREFIX);
   ATTR_ARIA_SETSIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::aria_setsize), ALL_NO_PREFIX);
-  ATTR_CLEAR = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::clear), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::aria_setsize), ALL_NO_PREFIX);
+  ATTR_CLEAR = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::clear), ALL_NO_PREFIX);
   ATTR_DATAFORMATAS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::dataformatas), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::dataformatas), ALL_NO_PREFIX);
   ATTR_DISABLED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::disabled), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::disabled), ALL_NO_PREFIX);
   ATTR_DATAFLD = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::datafld), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::datafld), ALL_NO_PREFIX);
   ATTR_DEFAULT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::default_), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::_default), ALL_NO_PREFIX);
   ATTR_DATASRC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::datasrc), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::datasrc), ALL_NO_PREFIX);
   ATTR_DATA = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::data), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::data), ALL_NO_PREFIX);
   ATTR_EQUALCOLUMNS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::equalcolumns), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::equalcolumns_), ALL_NO_PREFIX);
   ATTR_EQUALROWS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::equalrows), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::equalrows_), ALL_NO_PREFIX);
   ATTR_HSPACE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::hspace), ALL_NO_PREFIX);
-  ATTR_ISMAP = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ismap), ALL_NO_PREFIX);
-  ATTR_LOCAL = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::local), ALL_NO_PREFIX);
-  ATTR_LSPACE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::lspace), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::hspace), ALL_NO_PREFIX);
+  ATTR_ISMAP = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ismap), ALL_NO_PREFIX);
+  ATTR_LOCAL = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::local), ALL_NO_PREFIX);
+  ATTR_LSPACE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::lspace_), ALL_NO_PREFIX);
   ATTR_MOVABLELIMITS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::movablelimits), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::movablelimits_), ALL_NO_PREFIX);
   ATTR_NOTATION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::notation), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::notation_), ALL_NO_PREFIX);
   ATTR_ONDATASETCHANGED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondatasetchanged), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondatasetchanged), ALL_NO_PREFIX);
   ATTR_ONDATAAVAILABLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondataavailable), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondataavailable), ALL_NO_PREFIX);
   ATTR_ONPASTE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onpaste), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onpaste), ALL_NO_PREFIX);
   ATTR_ONDATASETCOMPLETE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondatasetcomplete), ALL_NO_PREFIX);
-  ATTR_RSPACE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rspace), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondatasetcomplete), ALL_NO_PREFIX);
+  ATTR_RSPACE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rspace_), ALL_NO_PREFIX);
   ATTR_ROWALIGN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rowalign), ALL_NO_PREFIX);
-  ATTR_ROTATE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rotate), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rowalign_), ALL_NO_PREFIX);
+  ATTR_ROTATE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rotate), ALL_NO_PREFIX);
   ATTR_SEPARATOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::separator), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::separator_), ALL_NO_PREFIX);
   ATTR_SEPARATORS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::separators), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::separators_), ALL_NO_PREFIX);
   ATTR_V_MATHEMATICAL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::v_mathematical), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::v_mathematical), ALL_NO_PREFIX);
   ATTR_VSPACE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::vspace), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::vspace), ALL_NO_PREFIX);
   ATTR_V_HANGING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::v_hanging), 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);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::v_hanging), ALL_NO_PREFIX);
+  ATTR_XCHANNELSELECTOR = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::xchannelselector, nsGkAtoms::xChannelSelector),
+    ALL_NO_PREFIX);
+  ATTR_YCHANNELSELECTOR = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::ychannelselector, nsGkAtoms::yChannelSelector),
+    ALL_NO_PREFIX);
   ATTR_ARABIC_FORM = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::arabic_form), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::arabic_form), ALL_NO_PREFIX);
   ATTR_ENABLE_BACKGROUND = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::enable_background), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::enable_background), ALL_NO_PREFIX);
   ATTR_ONDBLCLICK = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondblclick), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondblclick), ALL_NO_PREFIX);
   ATTR_ONABORT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onabort), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onabort), ALL_NO_PREFIX);
   ATTR_CALCMODE = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::calcmode, nsHtml5Atoms::calcMode),
+    SVG_DIFFERENT(nsGkAtoms::calcmode, nsGkAtoms::calcMode),
     ALL_NO_PREFIX);
-  ATTR_CHECKED = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::checked), ALL_NO_PREFIX);
-  ATTR_DESCENT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::descent), ALL_NO_PREFIX);
+  ATTR_CHECKED = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::checked), ALL_NO_PREFIX);
+  ATTR_DESCENT = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::descent), ALL_NO_PREFIX);
   ATTR_FENCE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fence), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fence_), ALL_NO_PREFIX);
   ATTR_ONSCROLL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onscroll), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onscroll), ALL_NO_PREFIX);
   ATTR_ONACTIVATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onactivate), ALL_NO_PREFIX);
-  ATTR_OPACITY = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::opacity), ALL_NO_PREFIX);
-  ATTR_SPACING = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::spacing), 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);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onactivate), ALL_NO_PREFIX);
+  ATTR_OPACITY = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::opacity), ALL_NO_PREFIX);
+  ATTR_SPACING = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::spacing), ALL_NO_PREFIX);
+  ATTR_SPECULAREXPONENT = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::specularexponent, nsGkAtoms::specularExponent),
+    ALL_NO_PREFIX);
+  ATTR_SPECULARCONSTANT = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::specularconstant, nsGkAtoms::specularConstant),
+    ALL_NO_PREFIX);
   ATTR_SPECIFICATION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::specification), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::specification), ALL_NO_PREFIX);
   ATTR_THICKMATHSPACE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::thickmathspace), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::thickmathspace), ALL_NO_PREFIX);
   ATTR_UNICODE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::unicode_), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::unicode_), ALL_NO_PREFIX);
   ATTR_UNICODE_BIDI = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::unicode_bidi), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::unicode_bidi), ALL_NO_PREFIX);
   ATTR_UNICODE_RANGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::unicode_range), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::unicode_range), ALL_NO_PREFIX);
   ATTR_BORDER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::border), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::border), ALL_NO_PREFIX);
   ATTR_ID = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::id), ALL_NO_PREFIX);
-  ATTR_GRADIENTTRANSFORM =
-    new nsHtml5AttributeName(ALL_NO_NS,
-                             SVG_DIFFERENT(nsHtml5Atoms::gradienttransform,
-                                           nsHtml5Atoms::gradientTransform),
-                             ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::id), ALL_NO_PREFIX);
+  ATTR_GRADIENTTRANSFORM = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::gradienttransform, nsGkAtoms::gradientTransform),
+    ALL_NO_PREFIX);
   ATTR_GRADIENTUNITS = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::gradientunits, nsHtml5Atoms::gradientUnits),
+    SVG_DIFFERENT(nsGkAtoms::gradientunits, nsGkAtoms::gradientUnits),
     ALL_NO_PREFIX);
   ATTR_HIDDEN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::hidden), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::hidden), ALL_NO_PREFIX);
   ATTR_HEADERS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::headers), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::headers), ALL_NO_PREFIX);
   ATTR_READONLY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::readonly), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::readonly), ALL_NO_PREFIX);
   ATTR_RENDERING_INTENT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rendering_intent), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rendering_intent), ALL_NO_PREFIX);
   ATTR_SEED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::seed), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::seed), ALL_NO_PREFIX);
   ATTR_SRCDOC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::srcdoc), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::srcdoc), ALL_NO_PREFIX);
   ATTR_STDDEVIATION = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::stddeviation, nsHtml5Atoms::stdDeviation),
+    SVG_DIFFERENT(nsGkAtoms::stddeviation, nsGkAtoms::stdDeviation),
     ALL_NO_PREFIX);
   ATTR_SANDBOX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::sandbox), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::sandbox), ALL_NO_PREFIX);
   ATTR_V_IDEOGRAPHIC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::v_ideographic), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::v_ideographic), ALL_NO_PREFIX);
   ATTR_WORD_SPACING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::word_spacing), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::word_spacing), ALL_NO_PREFIX);
   ATTR_ACCENTUNDER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::accentunder), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::accentunder_), ALL_NO_PREFIX);
   ATTR_ACCEPT_CHARSET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::accept_charset), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::acceptcharset), ALL_NO_PREFIX);
   ATTR_ACCESSKEY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::accesskey), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::accesskey), ALL_NO_PREFIX);
   ATTR_ACCENT_HEIGHT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::accent_height), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::accent_height), ALL_NO_PREFIX);
   ATTR_ACCENT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::accent), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::accent_), ALL_NO_PREFIX);
   ATTR_ASCENT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ascent), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ascent), ALL_NO_PREFIX);
   ATTR_ACCEPT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::accept), ALL_NO_PREFIX);
-  ATTR_BEVELLED = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::bevelled), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::accept), ALL_NO_PREFIX);
+  ATTR_BEVELLED = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::bevelled_), ALL_NO_PREFIX);
   ATTR_BASEFREQUENCY = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::basefrequency, nsHtml5Atoms::baseFrequency),
+    SVG_DIFFERENT(nsGkAtoms::basefrequency, nsGkAtoms::baseFrequency),
     ALL_NO_PREFIX);
   ATTR_BASELINE_SHIFT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::baseline_shift), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::baseline_shift), ALL_NO_PREFIX);
   ATTR_BASEPROFILE = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::baseprofile, nsHtml5Atoms::baseProfile),
+    SVG_DIFFERENT(nsGkAtoms::baseprofile, nsGkAtoms::baseProfile),
     ALL_NO_PREFIX);
-  ATTR_BASELINE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::baseline), ALL_NO_PREFIX);
+  ATTR_BASELINE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::baseline), ALL_NO_PREFIX);
   ATTR_BASE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::base), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::base), ALL_NO_PREFIX);
   ATTR_CODE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::code), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::code), ALL_NO_PREFIX);
   ATTR_CODETYPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::codetype), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::codetype), ALL_NO_PREFIX);
   ATTR_CODEBASE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::codebase), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::codebase), ALL_NO_PREFIX);
   ATTR_CITE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::cite), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::cite), ALL_NO_PREFIX);
   ATTR_DEFER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::defer), ALL_NO_PREFIX);
-  ATTR_DATETIME = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::datetime), ALL_NO_PREFIX);
-  ATTR_DIRECTION = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::direction), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::defer), ALL_NO_PREFIX);
+  ATTR_DATETIME = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::datetime), ALL_NO_PREFIX);
+  ATTR_DIRECTION = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::direction), ALL_NO_PREFIX);
   ATTR_EDGEMODE = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::edgemode, nsHtml5Atoms::edgeMode),
+    SVG_DIFFERENT(nsGkAtoms::edgemode, nsGkAtoms::edgeMode),
     ALL_NO_PREFIX);
   ATTR_EDGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::edge), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::edge_), ALL_NO_PREFIX);
   ATTR_FACE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::face), ALL_NO_PREFIX);
-  ATTR_HIDEFOCUS = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::hidefocus), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::face), ALL_NO_PREFIX);
+  ATTR_HIDEFOCUS = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::hidefocus), ALL_NO_PREFIX);
   ATTR_INDEX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::index), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::index), ALL_NO_PREFIX);
   ATTR_IRRELEVANT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::irrelevant), ALL_NO_PREFIX);
-  ATTR_INTERCEPT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::intercept), ALL_NO_PREFIX);
-  ATTR_INTEGRITY = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::integrity), ALL_NO_PREFIX);
-  ATTR_LINEBREAK = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::linebreak), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::irrelevant), ALL_NO_PREFIX);
+  ATTR_INTERCEPT = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::intercept), ALL_NO_PREFIX);
+  ATTR_INTEGRITY = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::integrity), ALL_NO_PREFIX);
+  ATTR_LINEBREAK = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::linebreak_), ALL_NO_PREFIX);
   ATTR_LABEL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::label), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::label), ALL_NO_PREFIX);
   ATTR_LINETHICKNESS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::linethickness), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::linethickness_), ALL_NO_PREFIX);
   ATTR_MODE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mode), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::mode), ALL_NO_PREFIX);
   ATTR_NAME = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::name), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::name), ALL_NO_PREFIX);
   ATTR_NORESIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::noresize), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::noresize), ALL_NO_PREFIX);
   ATTR_ONBEFOREUNLOAD = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforeunload), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbeforeunload), ALL_NO_PREFIX);
   ATTR_ONREPEAT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onrepeat), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onrepeat), ALL_NO_PREFIX);
   ATTR_OBJECT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::object), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::object), ALL_NO_PREFIX);
   ATTR_ONSELECT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onselect), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onselect), ALL_NO_PREFIX);
   ATTR_ORDER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::order), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::order), ALL_NO_PREFIX);
   ATTR_OTHER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::other), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::other), ALL_NO_PREFIX);
   ATTR_ONRESET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onreset), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onreset), ALL_NO_PREFIX);
   ATTR_ONCELLCHANGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::oncellchange), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::oncellchange), ALL_NO_PREFIX);
   ATTR_ONREADYSTATECHANGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onreadystatechange), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onreadystatechange), ALL_NO_PREFIX);
   ATTR_ONMESSAGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmessage), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmessage), ALL_NO_PREFIX);
   ATTR_ONBEGIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbegin), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbegin), ALL_NO_PREFIX);
   ATTR_ONHELP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onhelp), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onhelp), ALL_NO_PREFIX);
   ATTR_ONBEFOREPRINT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforeprint), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbeforeprint), ALL_NO_PREFIX);
   ATTR_ORIENT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::orient), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::orient), ALL_NO_PREFIX);
   ATTR_ORIENTATION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::orientation), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::orientation), ALL_NO_PREFIX);
   ATTR_ONBEFORECOPY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforecopy), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbeforecopy), ALL_NO_PREFIX);
   ATTR_ONSELECTSTART = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onselectstart), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onselectstart), ALL_NO_PREFIX);
   ATTR_ONBEFOREPASTE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforepaste), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbeforepaste), ALL_NO_PREFIX);
   ATTR_ONBEFOREUPDATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforeupdate), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbeforeupdate), ALL_NO_PREFIX);
   ATTR_ONDEACTIVATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondeactivate), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondeactivate), ALL_NO_PREFIX);
   ATTR_ONBEFOREACTIVATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforeactivate), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbeforeactivate), ALL_NO_PREFIX);
   ATTR_ONBEFORDEACTIVATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbefordeactivate), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbefordeactivate), ALL_NO_PREFIX);
   ATTR_ONKEYPRESS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onkeypress), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onkeypress), ALL_NO_PREFIX);
   ATTR_ONKEYUP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onkeyup), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onkeyup), ALL_NO_PREFIX);
   ATTR_ONBEFOREEDITFOCUS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforeeditfocus), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbeforeeditfocus), ALL_NO_PREFIX);
   ATTR_ONBEFORECUT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbeforecut), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbeforecut), ALL_NO_PREFIX);
   ATTR_ONKEYDOWN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onkeydown), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onkeydown), ALL_NO_PREFIX);
   ATTR_ONRESIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onresize), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onresize), ALL_NO_PREFIX);
   ATTR_REPEAT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::repeat), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::repeat), ALL_NO_PREFIX);
   ATTR_REPEAT_MAX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::repeat_max), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::repeat_max), ALL_NO_PREFIX);
   ATTR_REFERRERPOLICY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::referrerpolicy), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::referrerpolicy), ALL_NO_PREFIX);
   ATTR_RULES = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rules), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rules), ALL_NO_PREFIX);
   ATTR_REPEAT_MIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::repeat_min), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::repeat_min), ALL_NO_PREFIX);
   ATTR_ROLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::role), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::role), ALL_NO_PREFIX);
   ATTR_REPEATCOUNT = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::repeatcount, nsHtml5Atoms::repeatCount),
+    SVG_DIFFERENT(nsGkAtoms::repeatcount, nsGkAtoms::repeatCount),
     ALL_NO_PREFIX);
   ATTR_REPEAT_START = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::repeat_start), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::repeat_start), ALL_NO_PREFIX);
   ATTR_REPEAT_TEMPLATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::repeat_template), ALL_NO_PREFIX);
-  ATTR_REPEATDUR = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::repeatdur, nsHtml5Atoms::repeatDur), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::repeat_template), ALL_NO_PREFIX);
+  ATTR_REPEATDUR = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::repeatdur, nsGkAtoms::repeatDur),
+    ALL_NO_PREFIX);
   ATTR_SELECTED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::selected), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::selected), ALL_NO_PREFIX);
   ATTR_SPEED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::speed), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::speed), ALL_NO_PREFIX);
   ATTR_SIZES = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::sizes), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::sizes), ALL_NO_PREFIX);
   ATTR_SUPERSCRIPTSHIFT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::superscriptshift), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::superscriptshift_), ALL_NO_PREFIX);
   ATTR_STRETCHY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stretchy), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stretchy_), ALL_NO_PREFIX);
   ATTR_SCHEME = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scheme), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scheme), ALL_NO_PREFIX);
   ATTR_SPREADMETHOD = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::spreadmethod, nsHtml5Atoms::spreadMethod),
+    SVG_DIFFERENT(nsGkAtoms::spreadmethod, nsGkAtoms::spreadMethod),
     ALL_NO_PREFIX);
-  ATTR_SELECTION = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::selection), ALL_NO_PREFIX);
+  ATTR_SELECTION = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::selection_), ALL_NO_PREFIX);
   ATTR_SIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::size), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::size), ALL_NO_PREFIX);
   ATTR_TYPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::type), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::type), ALL_NO_PREFIX);
   ATTR_UNSELECTABLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::unselectable), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::unselectable), ALL_NO_PREFIX);
   ATTR_UNDERLINE_POSITION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::underline_position), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::underline_position), ALL_NO_PREFIX);
   ATTR_UNDERLINE_THICKNESS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::underline_thickness), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::underline_thickness), ALL_NO_PREFIX);
   ATTR_X_HEIGHT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::x_height), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::x_height), ALL_NO_PREFIX);
   ATTR_DIFFUSECONSTANT = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::diffuseconstant, nsHtml5Atoms::diffuseConstant),
+    SVG_DIFFERENT(nsGkAtoms::diffuseconstant, nsGkAtoms::diffuseConstant),
     ALL_NO_PREFIX);
   ATTR_HREF = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::href), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::href), ALL_NO_PREFIX);
   ATTR_HREFLANG = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::hreflang), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::hreflang), ALL_NO_PREFIX);
   ATTR_ONAFTERPRINT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onafterprint), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onafterprint), ALL_NO_PREFIX);
   ATTR_ONAFTERUPDATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onafterupdate), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onafterupdate), ALL_NO_PREFIX);
   ATTR_PROFILE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::profile), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::profile), ALL_NO_PREFIX);
   ATTR_SURFACESCALE = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::surfacescale, nsHtml5Atoms::surfaceScale),
+    SVG_DIFFERENT(nsGkAtoms::surfacescale, nsGkAtoms::surfaceScale),
     ALL_NO_PREFIX);
   ATTR_XREF = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::xref), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::xref_), ALL_NO_PREFIX);
   ATTR_ALIGN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::align), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::align), ALL_NO_PREFIX);
   ATTR_ALIGNMENT_BASELINE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::alignment_baseline), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::alignment_baseline), ALL_NO_PREFIX);
   ATTR_ALIGNMENTSCOPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::alignmentscope), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::alignmentscope_), ALL_NO_PREFIX);
   ATTR_DRAGGABLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::draggable), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::draggable), ALL_NO_PREFIX);
   ATTR_HEIGHT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::height), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::height), ALL_NO_PREFIX);
   ATTR_HANGING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::hanging), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::hanging), ALL_NO_PREFIX);
   ATTR_IMAGE_RENDERING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::image_rendering), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::image_rendering), ALL_NO_PREFIX);
   ATTR_LANGUAGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::language), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::language), ALL_NO_PREFIX);
   ATTR_LANG = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::lang), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::lang), ALL_NO_PREFIX);
   ATTR_LARGEOP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::largeop), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::largeop_), ALL_NO_PREFIX);
   ATTR_LONGDESC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::longdesc), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::longdesc), ALL_NO_PREFIX);
   ATTR_LENGTHADJUST = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::lengthadjust, nsHtml5Atoms::lengthAdjust),
+    SVG_DIFFERENT(nsGkAtoms::lengthadjust, nsGkAtoms::lengthAdjust),
     ALL_NO_PREFIX);
   ATTR_MARGINHEIGHT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::marginheight), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::marginheight), ALL_NO_PREFIX);
   ATTR_MARGINWIDTH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::marginwidth), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::marginwidth), ALL_NO_PREFIX);
   ATTR_NARGS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::nargs), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::nargs), ALL_NO_PREFIX);
   ATTR_ORIGIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::origin), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::origin), ALL_NO_PREFIX);
   ATTR_PING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ping), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ping), ALL_NO_PREFIX);
   ATTR_TARGET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::target), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::target), ALL_NO_PREFIX);
   ATTR_TARGETX = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::targetx, nsHtml5Atoms::targetX),
+    SVG_DIFFERENT(nsGkAtoms::targetx, nsGkAtoms::targetX),
     ALL_NO_PREFIX);
   ATTR_TARGETY = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::targety, nsHtml5Atoms::targetY),
+    SVG_DIFFERENT(nsGkAtoms::targety, nsGkAtoms::targetY),
     ALL_NO_PREFIX);
-  ATTR_ALPHABETIC = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::alphabetic), ALL_NO_PREFIX);
+  ATTR_ALPHABETIC = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::alphabetic), ALL_NO_PREFIX);
   ATTR_ARCHIVE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::archive), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::archive), ALL_NO_PREFIX);
   ATTR_HIGH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::high), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::high), ALL_NO_PREFIX);
   ATTR_LIGHTING_COLOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::lighting_color), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::lighting_color), ALL_NO_PREFIX);
   ATTR_MATHEMATICAL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mathematical), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::mathematical), ALL_NO_PREFIX);
   ATTR_MATHBACKGROUND = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mathbackground), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::mathbackground_), ALL_NO_PREFIX);
   ATTR_METHOD = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::method), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::method), ALL_NO_PREFIX);
   ATTR_MATHVARIANT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mathvariant), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::mathvariant_), ALL_NO_PREFIX);
   ATTR_MATHCOLOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mathcolor), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::mathcolor_), ALL_NO_PREFIX);
   ATTR_MATHSIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mathsize), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::mathsize_), ALL_NO_PREFIX);
   ATTR_NOSHADE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::noshade), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::noshade), ALL_NO_PREFIX);
   ATTR_ONCHANGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onchange), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onchange), ALL_NO_PREFIX);
   ATTR_PATHLENGTH = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::pathlength, nsHtml5Atoms::pathLength),
+    SVG_DIFFERENT(nsGkAtoms::pathlength, nsGkAtoms::pathLength),
     ALL_NO_PREFIX);
   ATTR_PATH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::path), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::path), ALL_NO_PREFIX);
   ATTR_ALTIMG = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::altimg), ALL_NO_PREFIX);
-  ATTR_ACTIONTYPE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::actiontype), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::altimg_), ALL_NO_PREFIX);
+  ATTR_ACTIONTYPE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::actiontype_), ALL_NO_PREFIX);
   ATTR_ACTION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::action), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::action), ALL_NO_PREFIX);
   ATTR_ACTIVE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::active), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::active), ALL_NO_PREFIX);
   ATTR_ADDITIVE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::additive), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::additive), ALL_NO_PREFIX);
   ATTR_BEGIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::begin), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::begin), ALL_NO_PREFIX);
   ATTR_DOMINANT_BASELINE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::dominant_baseline), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::dominant_baseline), ALL_NO_PREFIX);
   ATTR_DIVISOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::divisor), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::divisor), ALL_NO_PREFIX);
   ATTR_DEFINITIONURL = new nsHtml5AttributeName(
     ALL_NO_NS,
-    MATH_DIFFERENT(nsHtml5Atoms::definitionurl, nsHtml5Atoms::definitionURL),
+    MATH_DIFFERENT(nsGkAtoms::definitionurl, nsGkAtoms::definitionURL_),
     ALL_NO_PREFIX);
   ATTR_HORIZ_ADV_X = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::horiz_adv_x), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::horiz_adv_x), ALL_NO_PREFIX);
   ATTR_HORIZ_ORIGIN_X = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::horiz_origin_x), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::horiz_origin_x), ALL_NO_PREFIX);
   ATTR_HORIZ_ORIGIN_Y = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::horiz_origin_y), ALL_NO_PREFIX);
-  ATTR_LIMITINGCONEANGLE =
-    new nsHtml5AttributeName(ALL_NO_NS,
-                             SVG_DIFFERENT(nsHtml5Atoms::limitingconeangle,
-                                           nsHtml5Atoms::limitingConeAngle),
-                             ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::horiz_origin_y), ALL_NO_PREFIX);
+  ATTR_LIMITINGCONEANGLE = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::limitingconeangle, nsGkAtoms::limitingConeAngle),
+    ALL_NO_PREFIX);
   ATTR_MEDIUMMATHSPACE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mediummathspace), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::mediummathspace), ALL_NO_PREFIX);
   ATTR_MEDIA = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::media), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::media), ALL_NO_PREFIX);
   ATTR_MANIFEST = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::manifest), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::manifest), ALL_NO_PREFIX);
   ATTR_ONFILTERCHANGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onfilterchange), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onfilterchange), ALL_NO_PREFIX);
   ATTR_ONFINISH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onfinish), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onfinish), ALL_NO_PREFIX);
   ATTR_OPTIMUM = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::optimum), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::optimum), ALL_NO_PREFIX);
   ATTR_RADIOGROUP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::radiogroup), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::radiogroup), ALL_NO_PREFIX);
   ATTR_RADIUS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::radius), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::radius), ALL_NO_PREFIX);
   ATTR_SCRIPTLEVEL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scriptlevel), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scriptlevel_), ALL_NO_PREFIX);
   ATTR_SCRIPTSIZEMULTIPLIER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scriptsizemultiplier), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scriptsizemultiplier_), ALL_NO_PREFIX);
   ATTR_STRING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::string), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::string), 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);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::strikethrough_position), ALL_NO_PREFIX);
+  ATTR_STRIKETHROUGH_THICKNESS = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::strikethrough_thickness), ALL_NO_PREFIX);
   ATTR_SCRIPTMINSIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scriptminsize), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scriptminsize_), ALL_NO_PREFIX);
   ATTR_TABINDEX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::tabindex), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::tabindex), ALL_NO_PREFIX);
   ATTR_VALIGN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::valign), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::valign), ALL_NO_PREFIX);
   ATTR_VISIBILITY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::visibility), ALL_NO_PREFIX);
-  ATTR_BACKGROUND = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::background), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::visibility), ALL_NO_PREFIX);
+  ATTR_BACKGROUND = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::background), ALL_NO_PREFIX);
   ATTR_LINK = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::link), ALL_NO_PREFIX);
-  ATTR_MARKER_MID = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::marker_mid), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::link), ALL_NO_PREFIX);
+  ATTR_MARKER_MID = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::marker_mid), ALL_NO_PREFIX);
   ATTR_MARKERHEIGHT = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::markerheight, nsHtml5Atoms::markerHeight),
+    SVG_DIFFERENT(nsGkAtoms::markerheight, nsGkAtoms::markerHeight),
     ALL_NO_PREFIX);
-  ATTR_MARKER_END = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::marker_end), ALL_NO_PREFIX);
+  ATTR_MARKER_END = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::marker_end), ALL_NO_PREFIX);
   ATTR_MASK = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::mask), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::mask), ALL_NO_PREFIX);
   ATTR_MARKER_START = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::marker_start), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::marker_start), ALL_NO_PREFIX);
   ATTR_MARKERWIDTH = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::markerwidth, nsHtml5Atoms::markerWidth),
+    SVG_DIFFERENT(nsGkAtoms::markerwidth, nsGkAtoms::markerWidth),
     ALL_NO_PREFIX);
   ATTR_MASKUNITS = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::maskunits, nsHtml5Atoms::maskUnits),
+    SVG_DIFFERENT(nsGkAtoms::maskunits, nsGkAtoms::maskUnits),
     ALL_NO_PREFIX);
   ATTR_MARKERUNITS = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::markerunits, nsHtml5Atoms::markerUnits),
+    SVG_DIFFERENT(nsGkAtoms::markerunits, nsGkAtoms::markerUnits),
     ALL_NO_PREFIX);
-  ATTR_MASKCONTENTUNITS =
-    new nsHtml5AttributeName(ALL_NO_NS,
-                             SVG_DIFFERENT(nsHtml5Atoms::maskcontentunits,
-                                           nsHtml5Atoms::maskContentUnits),
-                             ALL_NO_PREFIX);
+  ATTR_MASKCONTENTUNITS = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::maskcontentunits, nsGkAtoms::maskContentUnits),
+    ALL_NO_PREFIX);
   ATTR_AMPLITUDE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::amplitude), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::amplitude), ALL_NO_PREFIX);
   ATTR_CELLSPACING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::cellspacing), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::cellspacing), ALL_NO_PREFIX);
   ATTR_CELLPADDING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::cellpadding), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::cellpadding), ALL_NO_PREFIX);
   ATTR_DECLARE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::declare), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::declare), ALL_NO_PREFIX);
   ATTR_FILL_RULE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fill_rule), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fill_rule), ALL_NO_PREFIX);
   ATTR_FILL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fill), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fill), ALL_NO_PREFIX);
   ATTR_FILL_OPACITY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fill_opacity), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fill_opacity), ALL_NO_PREFIX);
   ATTR_MAXLENGTH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::maxlength), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::maxlength), ALL_NO_PREFIX);
   ATTR_ONCLICK = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onclick), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onclick), ALL_NO_PREFIX);
   ATTR_ONBLUR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onblur), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onblur), ALL_NO_PREFIX);
   ATTR_REPLACE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::replace), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::replace), ALL_NO_PREFIX);
   ATTR_ROWLINES = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rowlines), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rowlines_), ALL_NO_PREFIX);
   ATTR_SCALE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scale), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scale), ALL_NO_PREFIX);
   ATTR_STYLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::style), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::style), ALL_NO_PREFIX);
   ATTR_TABLEVALUES = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::tablevalues, nsHtml5Atoms::tableValues),
+    SVG_DIFFERENT(nsGkAtoms::tablevalues, nsGkAtoms::tableValues),
     ALL_NO_PREFIX);
   ATTR_TITLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::title), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::title), ALL_NO_PREFIX);
   ATTR_V_ALPHABETIC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::v_alphabetic), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::v_alphabetic), ALL_NO_PREFIX);
   ATTR_AZIMUTH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::azimuth), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::azimuth), ALL_NO_PREFIX);
   ATTR_FORMAT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::format), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::format), ALL_NO_PREFIX);
   ATTR_FRAMEBORDER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::frameborder), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::frameborder), ALL_NO_PREFIX);
   ATTR_FRAME = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::frame), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::frame), ALL_NO_PREFIX);
   ATTR_FRAMESPACING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::framespacing), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::framespacing_), ALL_NO_PREFIX);
   ATTR_FROM = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::from), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::from), ALL_NO_PREFIX);
   ATTR_FORM = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::form), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::form), ALL_NO_PREFIX);
   ATTR_PROMPT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::prompt), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::prompt), ALL_NO_PREFIX);
   ATTR_PRIMITIVEUNITS = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::primitiveunits, nsHtml5Atoms::primitiveUnits),
+    SVG_DIFFERENT(nsGkAtoms::primitiveunits, nsGkAtoms::primitiveUnits),
     ALL_NO_PREFIX);
   ATTR_SYMMETRIC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::symmetric), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::symmetric_), ALL_NO_PREFIX);
   ATTR_STEMH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stemh), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stemh), ALL_NO_PREFIX);
   ATTR_STEMV = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stemv), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stemv), ALL_NO_PREFIX);
   ATTR_SEAMLESS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::seamless), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::seamless), ALL_NO_PREFIX);
   ATTR_SUMMARY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::summary), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::summary), ALL_NO_PREFIX);
   ATTR_USEMAP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::usemap), ALL_NO_PREFIX);
-  ATTR_ZOOMANDPAN = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::zoomandpan, nsHtml5Atoms::zoomAndPan), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::usemap), ALL_NO_PREFIX);
+  ATTR_ZOOMANDPAN = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::zoomandpan, nsGkAtoms::zoomAndPan),
+    ALL_NO_PREFIX);
   ATTR_ASYNC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::async), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::async), ALL_NO_PREFIX);
   ATTR_ALINK = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::alink), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::alink), ALL_NO_PREFIX);
   ATTR_IN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::in), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::in), ALL_NO_PREFIX);
   ATTR_ICON = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::icon), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::icon), ALL_NO_PREFIX);
   ATTR_KERNELMATRIX = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::kernelmatrix, nsHtml5Atoms::kernelMatrix),
+    SVG_DIFFERENT(nsGkAtoms::kernelmatrix, nsGkAtoms::kernelMatrix),
     ALL_NO_PREFIX);
   ATTR_KERNING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::kerning), ALL_NO_PREFIX);
-  ATTR_KERNELUNITLENGTH =
-    new nsHtml5AttributeName(ALL_NO_NS,
-                             SVG_DIFFERENT(nsHtml5Atoms::kernelunitlength,
-                                           nsHtml5Atoms::kernelUnitLength),
-                             ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::kerning), ALL_NO_PREFIX);
+  ATTR_KERNELUNITLENGTH = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::kernelunitlength, nsGkAtoms::kernelUnitLength),
+    ALL_NO_PREFIX);
   ATTR_ONUNLOAD = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onunload), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onunload), ALL_NO_PREFIX);
   ATTR_OPEN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::open), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::open), ALL_NO_PREFIX);
   ATTR_ONINVALID = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::oninvalid), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::oninvalid), ALL_NO_PREFIX);
   ATTR_ONEND = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onend), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onend), ALL_NO_PREFIX);
   ATTR_ONINPUT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::oninput), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::oninput), ALL_NO_PREFIX);
   ATTR_POINTER_EVENTS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::pointer_events), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::pointer_events), ALL_NO_PREFIX);
   ATTR_POINTS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::points), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::points), ALL_NO_PREFIX);
   ATTR_POINTSATX = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::pointsatx, nsHtml5Atoms::pointsAtX),
+    SVG_DIFFERENT(nsGkAtoms::pointsatx, nsGkAtoms::pointsAtX),
     ALL_NO_PREFIX);
   ATTR_POINTSATY = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::pointsaty, nsHtml5Atoms::pointsAtY),
+    SVG_DIFFERENT(nsGkAtoms::pointsaty, nsGkAtoms::pointsAtY),
     ALL_NO_PREFIX);
   ATTR_POINTSATZ = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::pointsatz, nsHtml5Atoms::pointsAtZ),
+    SVG_DIFFERENT(nsGkAtoms::pointsatz, nsGkAtoms::pointsAtZ),
     ALL_NO_PREFIX);
   ATTR_SPAN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::span), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::span), ALL_NO_PREFIX);
   ATTR_STANDBY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::standby), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::standby), ALL_NO_PREFIX);
   ATTR_THINMATHSPACE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::thinmathspace), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::thinmathspace), ALL_NO_PREFIX);
   ATTR_TRANSFORM = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::transform), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::transform), ALL_NO_PREFIX);
   ATTR_VLINK = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::vlink), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::vlink), ALL_NO_PREFIX);
   ATTR_WHEN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::when), ALL_NO_PREFIX);
-  ATTR_XLINK_HREF = new nsHtml5AttributeName(XLINK_NS, COLONIFIED_LOCAL(nsHtml5Atoms::xlink_href, nsHtml5Atoms::href), XLINK_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::when), ALL_NO_PREFIX);
+  ATTR_XLINK_HREF = new nsHtml5AttributeName(
+    XLINK_NS,
+    COLONIFIED_LOCAL(nsGkAtoms::xlink_href, nsGkAtoms::href),
+    XLINK_PREFIX);
   ATTR_XLINK_TITLE = new nsHtml5AttributeName(
     XLINK_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xlink_title, nsHtml5Atoms::title),
+    COLONIFIED_LOCAL(nsGkAtoms::xlink_title, nsGkAtoms::title),
     XLINK_PREFIX);
   ATTR_XLINK_ROLE = new nsHtml5AttributeName(
     XLINK_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xlink_role, nsHtml5Atoms::role),
+    COLONIFIED_LOCAL(nsGkAtoms::xlink_role, nsGkAtoms::role),
     XLINK_PREFIX);
   ATTR_XLINK_ARCROLE = new nsHtml5AttributeName(
     XLINK_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xlink_arcrole, nsHtml5Atoms::arcrole),
+    COLONIFIED_LOCAL(nsGkAtoms::xlink_arcrole, nsGkAtoms::arcrole),
     XLINK_PREFIX);
   ATTR_XMLNS_XLINK = new nsHtml5AttributeName(
     XMLNS_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xmlns_xlink, nsHtml5Atoms::xlink),
+    COLONIFIED_LOCAL(nsGkAtoms::xmlns_xlink, nsGkAtoms::xlink),
     XMLNS_PREFIX);
   ATTR_XMLNS = new nsHtml5AttributeName(
-    XMLNS_NS, SAME_LOCAL(nsHtml5Atoms::xmlns), ALL_NO_PREFIX);
+    XMLNS_NS, SAME_LOCAL(nsGkAtoms::xmlns), ALL_NO_PREFIX);
   ATTR_XLINK_TYPE = new nsHtml5AttributeName(
     XLINK_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xlink_type, nsHtml5Atoms::type),
+    COLONIFIED_LOCAL(nsGkAtoms::xlink_type, nsGkAtoms::type),
     XLINK_PREFIX);
-  ATTR_XLINK_SHOW = new nsHtml5AttributeName(XLINK_NS, COLONIFIED_LOCAL(nsHtml5Atoms::xlink_show, nsHtml5Atoms::show), XLINK_PREFIX);
+  ATTR_XLINK_SHOW = new nsHtml5AttributeName(
+    XLINK_NS,
+    COLONIFIED_LOCAL(nsGkAtoms::xlink_show, nsGkAtoms::show),
+    XLINK_PREFIX);
   ATTR_XLINK_ACTUATE = new nsHtml5AttributeName(
     XLINK_NS,
-    COLONIFIED_LOCAL(nsHtml5Atoms::xlink_actuate, nsHtml5Atoms::actuate),
+    COLONIFIED_LOCAL(nsGkAtoms::xlink_actuate, nsGkAtoms::actuate),
     XLINK_PREFIX);
   ATTR_AUTOPLAY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::autoplay), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::autoplay), ALL_NO_PREFIX);
   ATTR_AUTOSUBMIT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::autosubmit), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::autosubmit), ALL_NO_PREFIX);
   ATTR_AUTOCOMPLETE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::autocomplete), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::autocomplete), ALL_NO_PREFIX);
   ATTR_AUTOFOCUS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::autofocus), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::autofocus), ALL_NO_PREFIX);
   ATTR_BGCOLOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::bgcolor), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::bgcolor), ALL_NO_PREFIX);
   ATTR_COLOR_PROFILE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::color_profile), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::colorProfile), ALL_NO_PREFIX);
   ATTR_COLOR_RENDERING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::color_rendering), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::color_rendering), ALL_NO_PREFIX);
   ATTR_COLOR_INTERPOLATION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::color_interpolation), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::colorInterpolation), ALL_NO_PREFIX);
   ATTR_COLOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::color), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::color), ALL_NO_PREFIX);
   ATTR_COLOR_INTERPOLATION_FILTERS = new nsHtml5AttributeName(
-    ALL_NO_NS,
-    SAME_LOCAL(nsHtml5Atoms::color_interpolation_filters),
-    ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::colorInterpolationFilters), ALL_NO_PREFIX);
   ATTR_ENCODING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::encoding), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::encoding), ALL_NO_PREFIX);
   ATTR_EXPONENT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::exponent), ALL_NO_PREFIX);
-  ATTR_FLOOD_COLOR = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::flood_color), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::exponent), ALL_NO_PREFIX);
+  ATTR_FLOOD_COLOR = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::flood_color), ALL_NO_PREFIX);
   ATTR_FLOOD_OPACITY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::flood_opacity), ALL_NO_PREFIX);
-  ATTR_IDEOGRAPHIC = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ideographic), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::flood_opacity), ALL_NO_PREFIX);
+  ATTR_IDEOGRAPHIC = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ideographic), ALL_NO_PREFIX);
   ATTR_LQUOTE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::lquote), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::lquote_), ALL_NO_PREFIX);
   ATTR_PANOSE_1 = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::panose_1), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::panose_1), ALL_NO_PREFIX);
   ATTR_NUMOCTAVES = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::numoctaves, nsHtml5Atoms::numOctaves),
+    SVG_DIFFERENT(nsGkAtoms::numoctaves, nsGkAtoms::numOctaves),
     ALL_NO_PREFIX);
   ATTR_ONLOAD = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onload), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onload), ALL_NO_PREFIX);
   ATTR_ONBOUNCE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onbounce), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onbounce), ALL_NO_PREFIX);
   ATTR_ONCONTROLSELECT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::oncontrolselect), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::oncontrolselect), ALL_NO_PREFIX);
   ATTR_ONROWSINSERTED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onrowsinserted), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onrowsinserted), ALL_NO_PREFIX);
   ATTR_ONMOUSEWHEEL = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmousewheel), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmousewheel), ALL_NO_PREFIX);
   ATTR_ONROWENTER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onrowenter), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onrowenter), ALL_NO_PREFIX);
   ATTR_ONMOUSEENTER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmouseenter), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmouseenter), ALL_NO_PREFIX);
   ATTR_ONMOUSEOVER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmouseover), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmouseover), ALL_NO_PREFIX);
   ATTR_ONFORMCHANGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onformchange), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onformchange), ALL_NO_PREFIX);
   ATTR_ONFOCUSIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onfocusin), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onfocusin), ALL_NO_PREFIX);
   ATTR_ONROWEXIT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onrowexit), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onrowexit), ALL_NO_PREFIX);
   ATTR_ONMOVEEND = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmoveend), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmoveend), ALL_NO_PREFIX);
   ATTR_ONCONTEXTMENU = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::oncontextmenu), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::oncontextmenu), ALL_NO_PREFIX);
   ATTR_ONZOOM = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onzoom), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onzoom), ALL_NO_PREFIX);
   ATTR_ONLOSECAPTURE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onlosecapture), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onlosecapture), ALL_NO_PREFIX);
   ATTR_ONCOPY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::oncopy), ALL_NO_PREFIX);
-  ATTR_ONMOVESTART = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmovestart), ALL_NO_PREFIX);
-  ATTR_ONROWSDELETE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onrowsdelete), ALL_NO_PREFIX);
-  ATTR_ONMOUSELEAVE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmouseleave), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::oncopy), ALL_NO_PREFIX);
+  ATTR_ONMOVESTART = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmovestart), ALL_NO_PREFIX);
+  ATTR_ONROWSDELETE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onrowsdelete), ALL_NO_PREFIX);
+  ATTR_ONMOUSELEAVE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmouseleave), ALL_NO_PREFIX);
   ATTR_ONMOVE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmove), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmove), ALL_NO_PREFIX);
   ATTR_ONMOUSEMOVE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmousemove), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmousemove), ALL_NO_PREFIX);
   ATTR_ONMOUSEUP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmouseup), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmouseup), ALL_NO_PREFIX);
   ATTR_ONFOCUS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onfocus), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onfocus), ALL_NO_PREFIX);
   ATTR_ONMOUSEOUT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmouseout), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmouseout), ALL_NO_PREFIX);
   ATTR_ONFORMINPUT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onforminput), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onforminput), ALL_NO_PREFIX);
   ATTR_ONFOCUSOUT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onfocusout), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onfocusout), ALL_NO_PREFIX);
   ATTR_ONMOUSEDOWN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onmousedown), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onmousedown), ALL_NO_PREFIX);
   ATTR_TO = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::to), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::to), ALL_NO_PREFIX);
   ATTR_RQUOTE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rquote), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rquote_), ALL_NO_PREFIX);
   ATTR_STROKE_LINECAP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_linecap), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stroke_linecap), ALL_NO_PREFIX);
   ATTR_SCROLLDELAY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scrolldelay), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scrolldelay), ALL_NO_PREFIX);
   ATTR_STROKE_DASHARRAY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_dasharray), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stroke_dasharray), ALL_NO_PREFIX);
   ATTR_STROKE_DASHOFFSET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_dashoffset), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stroke_dashoffset), ALL_NO_PREFIX);
   ATTR_STROKE_LINEJOIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_linejoin), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stroke_linejoin), ALL_NO_PREFIX);
   ATTR_STROKE_MITERLIMIT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_miterlimit), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stroke_miterlimit), ALL_NO_PREFIX);
   ATTR_STROKE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stroke), ALL_NO_PREFIX);
   ATTR_SCROLLING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scrolling), ALL_NO_PREFIX);
-  ATTR_STROKE_WIDTH = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_width), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scrolling), ALL_NO_PREFIX);
+  ATTR_STROKE_WIDTH = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stroke_width), ALL_NO_PREFIX);
   ATTR_STROKE_OPACITY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stroke_opacity), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stroke_opacity), ALL_NO_PREFIX);
   ATTR_COMPACT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::compact), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::compact), ALL_NO_PREFIX);
   ATTR_CLIP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::clip), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::clip), ALL_NO_PREFIX);
   ATTR_CLIP_RULE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::clip_rule), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::clip_rule), ALL_NO_PREFIX);
   ATTR_CLIP_PATH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::clip_path), ALL_NO_PREFIX);
-  ATTR_CLIPPATHUNITS = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::clippathunits, nsHtml5Atoms::clipPathUnits), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::clip_path), ALL_NO_PREFIX);
+  ATTR_CLIPPATHUNITS = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::clippathunits, nsGkAtoms::clipPathUnits),
+    ALL_NO_PREFIX);
   ATTR_DISPLAY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::display), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::display), ALL_NO_PREFIX);
   ATTR_DISPLAYSTYLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::displaystyle), ALL_NO_PREFIX);
-  ATTR_GLYPH_ORIENTATION_VERTICAL = new nsHtml5AttributeName(
-    ALL_NO_NS,
-    SAME_LOCAL(nsHtml5Atoms::glyph_orientation_vertical),
-    ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::displaystyle_), ALL_NO_PREFIX);
+  ATTR_GLYPH_ORIENTATION_VERTICAL =
+    new nsHtml5AttributeName(ALL_NO_NS,
+                             SAME_LOCAL(nsGkAtoms::glyph_orientation_vertical),
+                             ALL_NO_PREFIX);
   ATTR_GLYPH_ORIENTATION_HORIZONTAL = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SAME_LOCAL(nsHtml5Atoms::glyph_orientation_horizontal),
+    SAME_LOCAL(nsGkAtoms::glyph_orientation_horizontal),
     ALL_NO_PREFIX);
   ATTR_GLYPHREF = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::glyphref, nsHtml5Atoms::glyphRef),
+    SVG_DIFFERENT(nsGkAtoms::glyphref, nsGkAtoms::glyphRef),
     ALL_NO_PREFIX);
   ATTR_GLYPH_NAME = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::glyph_name), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::glyph_name), ALL_NO_PREFIX);
   ATTR_HTTP_EQUIV = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::http_equiv), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::httpEquiv), ALL_NO_PREFIX);
   ATTR_KEYPOINTS = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::keypoints, nsHtml5Atoms::keyPoints),
+    SVG_DIFFERENT(nsGkAtoms::keypoints, nsGkAtoms::keyPoints),
     ALL_NO_PREFIX);
   ATTR_LOOP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::loop), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::loop), ALL_NO_PREFIX);
   ATTR_PROPERTY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::property), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::property), ALL_NO_PREFIX);
   ATTR_SCOPED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scoped), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scoped), ALL_NO_PREFIX);
   ATTR_STEP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::step), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::step), ALL_NO_PREFIX);
   ATTR_SHAPE_RENDERING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::shape_rendering), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::shape_rendering), ALL_NO_PREFIX);
   ATTR_SCOPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::scope), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::scope), ALL_NO_PREFIX);
   ATTR_SHAPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::shape), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::shape), ALL_NO_PREFIX);
   ATTR_SLOPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::slope), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::slope), ALL_NO_PREFIX);
   ATTR_STOP_COLOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stop_color), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stop_color), ALL_NO_PREFIX);
   ATTR_STOP_OPACITY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::stop_opacity), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::stop_opacity), ALL_NO_PREFIX);
   ATTR_TEMPLATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::template_), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::_template), ALL_NO_PREFIX);
   ATTR_WRAP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::wrap), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::wrap), ALL_NO_PREFIX);
   ATTR_ABBR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::abbr), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::abbr), ALL_NO_PREFIX);
   ATTR_ATTRIBUTENAME = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::attributename, nsHtml5Atoms::attributeName),
+    SVG_DIFFERENT(nsGkAtoms::attributename, nsGkAtoms::attributeName),
     ALL_NO_PREFIX);
   ATTR_ATTRIBUTETYPE = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::attributetype, nsHtml5Atoms::attributeType),
+    SVG_DIFFERENT(nsGkAtoms::attributetype, nsGkAtoms::attributeType),
     ALL_NO_PREFIX);
   ATTR_CHAR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::char_), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::_char), ALL_NO_PREFIX);
   ATTR_COORDS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::coords), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::coords), ALL_NO_PREFIX);
   ATTR_CHAROFF = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::charoff), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::charoff), ALL_NO_PREFIX);
   ATTR_CHARSET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::charset), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::charset), ALL_NO_PREFIX);
   ATTR_MACROS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::macros), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::macros), ALL_NO_PREFIX);
   ATTR_NOWRAP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::nowrap), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::nowrap), ALL_NO_PREFIX);
   ATTR_NOHREF = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::nohref), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::nohref), ALL_NO_PREFIX);
   ATTR_ONDRAG = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondrag), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondrag), ALL_NO_PREFIX);
   ATTR_ONDRAGENTER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondragenter), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondragenter), ALL_NO_PREFIX);
   ATTR_ONDRAGOVER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondragover), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondragover), ALL_NO_PREFIX);
   ATTR_ONPROPERTYCHANGE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onpropertychange), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onpropertychange), ALL_NO_PREFIX);
   ATTR_ONDRAGEND = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondragend), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondragend), ALL_NO_PREFIX);
   ATTR_ONDROP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondrop), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondrop), ALL_NO_PREFIX);
   ATTR_ONDRAGDROP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondragdrop), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondragdrop), ALL_NO_PREFIX);
   ATTR_OVERLINE_POSITION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::overline_position), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::overline_position), ALL_NO_PREFIX);
   ATTR_ONERROR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onerror), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onerror), ALL_NO_PREFIX);
   ATTR_OPERATOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::operator_), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::_operator), ALL_NO_PREFIX);
   ATTR_OVERFLOW = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::overflow), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::overflow), ALL_NO_PREFIX);
   ATTR_ONDRAGSTART = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondragstart), ALL_NO_PREFIX);
-  ATTR_ONERRORUPDATE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onerrorupdate), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondragstart), ALL_NO_PREFIX);
+  ATTR_ONERRORUPDATE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onerrorupdate), ALL_NO_PREFIX);
   ATTR_OVERLINE_THICKNESS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::overline_thickness), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::overline_thickness), ALL_NO_PREFIX);
   ATTR_ONDRAGLEAVE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ondragleave), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ondragleave), ALL_NO_PREFIX);
   ATTR_STARTOFFSET = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::startoffset, nsHtml5Atoms::startOffset),
+    SVG_DIFFERENT(nsGkAtoms::startoffset, nsGkAtoms::startOffset),
     ALL_NO_PREFIX);
   ATTR_START = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::start), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::start), ALL_NO_PREFIX);
   ATTR_AXIS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::axis), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::axis), ALL_NO_PREFIX);
   ATTR_BIAS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::bias), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::bias), ALL_NO_PREFIX);
   ATTR_COLSPAN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::colspan), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::colspan), ALL_NO_PREFIX);
   ATTR_CLASSID = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::classid), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::classid), ALL_NO_PREFIX);
   ATTR_CROSSORIGIN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::crossorigin), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::crossorigin), ALL_NO_PREFIX);
   ATTR_COLS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::cols), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::cols), ALL_NO_PREFIX);
   ATTR_CURSOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::cursor), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::cursor), ALL_NO_PREFIX);
   ATTR_CLOSURE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::closure), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::closure_), ALL_NO_PREFIX);
   ATTR_CLOSE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::close), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::close), ALL_NO_PREFIX);
   ATTR_CLASS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::class_), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::_class), ALL_NO_PREFIX);
   ATTR_KEYSYSTEM = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::keysystem), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::keysystem), ALL_NO_PREFIX);
   ATTR_KEYSPLINES = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::keysplines, nsHtml5Atoms::keySplines),
+    SVG_DIFFERENT(nsGkAtoms::keysplines, nsGkAtoms::keySplines),
     ALL_NO_PREFIX);
   ATTR_LOWSRC = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::lowsrc), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::lowsrc), ALL_NO_PREFIX);
   ATTR_MAXSIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::maxsize), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::maxsize_), ALL_NO_PREFIX);
   ATTR_MINSIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::minsize), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::minsize_), ALL_NO_PREFIX);
   ATTR_OFFSET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::offset), ALL_NO_PREFIX);
-  ATTR_PRESERVEALPHA = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::preservealpha, nsHtml5Atoms::preserveAlpha), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::offset), ALL_NO_PREFIX);
+  ATTR_PRESERVEALPHA = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::preservealpha, nsGkAtoms::preserveAlpha),
+    ALL_NO_PREFIX);
   ATTR_PRESERVEASPECTRATIO =
     new nsHtml5AttributeName(ALL_NO_NS,
-                             SVG_DIFFERENT(nsHtml5Atoms::preserveaspectratio,
-                                           nsHtml5Atoms::preserveAspectRatio),
+                             SVG_DIFFERENT(nsGkAtoms::preserveaspectratio,
+                                           nsGkAtoms::preserveAspectRatio),
                              ALL_NO_PREFIX);
   ATTR_ROWSPAN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rowspan), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rowspan), ALL_NO_PREFIX);
   ATTR_ROWSPACING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rowspacing), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rowspacing_), ALL_NO_PREFIX);
   ATTR_ROWS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rows), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rows), ALL_NO_PREFIX);
   ATTR_SRCSET = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::srcset), ALL_NO_PREFIX);
-  ATTR_SUBSCRIPTSHIFT = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::subscriptshift), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::srcset), ALL_NO_PREFIX);
+  ATTR_SUBSCRIPTSHIFT = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::subscriptshift_), ALL_NO_PREFIX);
   ATTR_VERSION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::version), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::version), ALL_NO_PREFIX);
   ATTR_ALTTEXT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::alttext), ALL_NO_PREFIX);
-  ATTR_CONTENTEDITABLE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::contenteditable), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::alttext), ALL_NO_PREFIX);
+  ATTR_CONTENTEDITABLE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::contenteditable), ALL_NO_PREFIX);
   ATTR_CONTROLS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::controls), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::controls), ALL_NO_PREFIX);
   ATTR_CONTENT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::content), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::content), ALL_NO_PREFIX);
   ATTR_CONTEXTMENU = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::contextmenu), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::contextmenu), ALL_NO_PREFIX);
   ATTR_DEPTH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::depth), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::depth_), ALL_NO_PREFIX);
   ATTR_ENCTYPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::enctype), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::enctype), ALL_NO_PREFIX);
   ATTR_FONT_STRETCH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_stretch), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::font_stretch), ALL_NO_PREFIX);
   ATTR_FILTER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::filter), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::filter), ALL_NO_PREFIX);
   ATTR_FONTWEIGHT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fontweight), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fontweight_), ALL_NO_PREFIX);
   ATTR_FONT_WEIGHT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_weight), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fontWeight), ALL_NO_PREFIX);
   ATTR_FONTSTYLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fontstyle), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fontstyle_), ALL_NO_PREFIX);
   ATTR_FONT_STYLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_style), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::font_style), ALL_NO_PREFIX);
   ATTR_FONTFAMILY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fontfamily), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fontfamily_), ALL_NO_PREFIX);
   ATTR_FONT_FAMILY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_family), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::font_family), ALL_NO_PREFIX);
   ATTR_FONT_VARIANT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_variant), ALL_NO_PREFIX);
-  ATTR_FONT_SIZE_ADJUST = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_size_adjust), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::font_variant), ALL_NO_PREFIX);
+  ATTR_FONT_SIZE_ADJUST = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::font_size_adjust), ALL_NO_PREFIX);
   ATTR_FILTERUNITS = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::filterunits, nsHtml5Atoms::filterUnits),
+    SVG_DIFFERENT(nsGkAtoms::filterunits, nsGkAtoms::filterUnits),
     ALL_NO_PREFIX);
   ATTR_FONTSIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fontsize), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fontsize_), ALL_NO_PREFIX);
   ATTR_FONT_SIZE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::font_size), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::font_size), ALL_NO_PREFIX);
   ATTR_KEYTIMES = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::keytimes, nsHtml5Atoms::keyTimes),
+    SVG_DIFFERENT(nsGkAtoms::keytimes, nsGkAtoms::keyTimes),
     ALL_NO_PREFIX);
   ATTR_LETTER_SPACING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::letter_spacing), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::letter_spacing), ALL_NO_PREFIX);
   ATTR_LIST = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::list), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::list_), ALL_NO_PREFIX);
   ATTR_MULTIPLE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::multiple), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::multiple), ALL_NO_PREFIX);
   ATTR_RT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rt), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rt), ALL_NO_PREFIX);
   ATTR_ONSTOP = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onstop), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onstop), ALL_NO_PREFIX);
   ATTR_ONSTART = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onstart), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onstart), ALL_NO_PREFIX);
   ATTR_POSTER = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::poster), ALL_NO_PREFIX);
-  ATTR_PATTERNTRANSFORM = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::patterntransform, nsHtml5Atoms::patternTransform), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::poster), ALL_NO_PREFIX);
+  ATTR_PATTERNTRANSFORM = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::patterntransform, nsGkAtoms::patternTransform),
+    ALL_NO_PREFIX);
   ATTR_PATTERN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::pattern), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::pattern), ALL_NO_PREFIX);
   ATTR_PATTERNUNITS = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::patternunits, nsHtml5Atoms::patternUnits),
+    SVG_DIFFERENT(nsGkAtoms::patternunits, nsGkAtoms::patternUnits),
     ALL_NO_PREFIX);
   ATTR_PATTERNCONTENTUNITS =
     new nsHtml5AttributeName(ALL_NO_NS,
-                             SVG_DIFFERENT(nsHtml5Atoms::patterncontentunits,
-                                           nsHtml5Atoms::patternContentUnits),
+                             SVG_DIFFERENT(nsGkAtoms::patterncontentunits,
+                                           nsGkAtoms::patternContentUnits),
                              ALL_NO_PREFIX);
   ATTR_RESTART = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::restart), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::restart), ALL_NO_PREFIX);
   ATTR_STITCHTILES = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::stitchtiles, nsHtml5Atoms::stitchTiles),
+    SVG_DIFFERENT(nsGkAtoms::stitchtiles, nsGkAtoms::stitchTiles),
     ALL_NO_PREFIX);
   ATTR_SYSTEMLANGUAGE = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::systemlanguage, nsHtml5Atoms::systemLanguage),
+    SVG_DIFFERENT(nsGkAtoms::systemlanguage, nsGkAtoms::systemLanguage),
     ALL_NO_PREFIX);
   ATTR_TEXT_RENDERING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::text_rendering), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::text_rendering), ALL_NO_PREFIX);
   ATTR_VERT_ORIGIN_X = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::vert_origin_x), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::vert_origin_x), ALL_NO_PREFIX);
   ATTR_VERT_ADV_Y = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::vert_adv_y), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::vert_adv_y), ALL_NO_PREFIX);
   ATTR_VERT_ORIGIN_Y = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::vert_origin_y), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::vert_origin_y), ALL_NO_PREFIX);
   ATTR_TEXT_DECORATION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::text_decoration), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::text_decoration), ALL_NO_PREFIX);
   ATTR_TEXT_ANCHOR = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::text_anchor), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::text_anchor), ALL_NO_PREFIX);
   ATTR_TEXTLENGTH = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::textlength, nsHtml5Atoms::textLength),
+    SVG_DIFFERENT(nsGkAtoms::textlength, nsGkAtoms::textLength),
     ALL_NO_PREFIX);
   ATTR_TEXT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::text), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::text), ALL_NO_PREFIX);
   ATTR_UNITS_PER_EM = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::units_per_em), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::units_per_em), ALL_NO_PREFIX);
   ATTR_WRITING_MODE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::writing_mode), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::writing_mode), ALL_NO_PREFIX);
   ATTR_WIDTHS = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::widths), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::widths), ALL_NO_PREFIX);
   ATTR_WIDTH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::width), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::width), ALL_NO_PREFIX);
   ATTR_ACCUMULATE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::accumulate), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::accumulate), ALL_NO_PREFIX);
   ATTR_COLUMNSPAN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::columnspan), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::columnspan_), ALL_NO_PREFIX);
   ATTR_COLUMNLINES = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::columnlines), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::columnlines_), ALL_NO_PREFIX);
   ATTR_COLUMNALIGN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::columnalign), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::columnalign_), ALL_NO_PREFIX);
   ATTR_COLUMNSPACING = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::columnspacing), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::columnspacing_), ALL_NO_PREFIX);
   ATTR_COLUMNWIDTH = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::columnwidth), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::columnwidth_), ALL_NO_PREFIX);
   ATTR_GROUPALIGN = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::groupalign), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::groupalign_), ALL_NO_PREFIX);
   ATTR_INPUTMODE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::inputmode), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::inputmode), ALL_NO_PREFIX);
   ATTR_OCCURRENCE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::occurrence), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::occurrence), ALL_NO_PREFIX);
   ATTR_ONSUBMIT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::onsubmit), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::onsubmit), ALL_NO_PREFIX);
   ATTR_ONCUT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::oncut), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::oncut), ALL_NO_PREFIX);
   ATTR_REQUIRED = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::required), ALL_NO_PREFIX);
-  ATTR_REQUIREDFEATURES = new nsHtml5AttributeName(ALL_NO_NS, SVG_DIFFERENT(nsHtml5Atoms::requiredfeatures, nsHtml5Atoms::requiredFeatures), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::required), ALL_NO_PREFIX);
+  ATTR_REQUIREDFEATURES = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::requiredfeatures, nsGkAtoms::requiredFeatures),
+    ALL_NO_PREFIX);
   ATTR_RESULT = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::result), ALL_NO_PREFIX);
-  ATTR_REQUIREDEXTENSIONS =
-    new nsHtml5AttributeName(ALL_NO_NS,
-                             SVG_DIFFERENT(nsHtml5Atoms::requiredextensions,
-                                           nsHtml5Atoms::requiredExtensions),
-                             ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::result), ALL_NO_PREFIX);
+  ATTR_REQUIREDEXTENSIONS = new nsHtml5AttributeName(
+    ALL_NO_NS,
+    SVG_DIFFERENT(nsGkAtoms::requiredextensions, nsGkAtoms::requiredExtensions),
+    ALL_NO_PREFIX);
   ATTR_VALUES = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::values), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::values), ALL_NO_PREFIX);
   ATTR_VALUETYPE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::valuetype), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::valuetype), ALL_NO_PREFIX);
   ATTR_VALUE = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::value), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::value), ALL_NO_PREFIX);
   ATTR_ELEVATION = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::elevation), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::elevation), ALL_NO_PREFIX);
   ATTR_VIEWTARGET = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::viewtarget, nsHtml5Atoms::viewTarget),
+    SVG_DIFFERENT(nsGkAtoms::viewtarget, nsGkAtoms::viewTarget),
     ALL_NO_PREFIX);
   ATTR_VIEWBOX = new nsHtml5AttributeName(
     ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::viewbox, nsHtml5Atoms::viewBox),
+    SVG_DIFFERENT(nsGkAtoms::viewbox, nsGkAtoms::viewBox),
     ALL_NO_PREFIX);
   ATTR_CX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::cx), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::cx), ALL_NO_PREFIX);
   ATTR_DX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::dx), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::dx), ALL_NO_PREFIX);
   ATTR_FX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fx), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fx), ALL_NO_PREFIX);
   ATTR_BBOX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::bbox), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::bbox), ALL_NO_PREFIX);
   ATTR_RX = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::rx), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::rx), ALL_NO_PREFIX);
   ATTR_REFX = new nsHtml5AttributeName(
-    ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::refx, nsHtml5Atoms::refX),
-    ALL_NO_PREFIX);
+    ALL_NO_NS, SVG_DIFFERENT(nsGkAtoms::refx, nsGkAtoms::refX), ALL_NO_PREFIX);
   ATTR_BY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::by), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::by), ALL_NO_PREFIX);
   ATTR_CY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::cy), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::cy), ALL_NO_PREFIX);
   ATTR_DY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::dy), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::dy), ALL_NO_PREFIX);
   ATTR_FY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::fy), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::fy), ALL_NO_PREFIX);
   ATTR_RY = new nsHtml5AttributeName(
-    ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::ry), ALL_NO_PREFIX);
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::ry), ALL_NO_PREFIX);
   ATTR_REFY = new nsHtml5AttributeName(
-    ALL_NO_NS,
-    SVG_DIFFERENT(nsHtml5Atoms::refy, nsHtml5Atoms::refY),
-    ALL_NO_PREFIX);
-  ATTR_VERYTHINMATHSPACE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::verythinmathspace), ALL_NO_PREFIX);
-  ATTR_VERYTHICKMATHSPACE = new nsHtml5AttributeName(ALL_NO_NS, SAME_LOCAL(nsHtml5Atoms::verythickmathspace), 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);
+    ALL_NO_NS, SVG_DIFFERENT(nsGkAtoms::refy, nsGkAtoms::refY), ALL_NO_PREFIX);
+  ATTR_VERYTHINMATHSPACE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::verythinmathspace), ALL_NO_PREFIX);
+  ATTR_VERYTHICKMATHSPACE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::verythickmathspace), ALL_NO_PREFIX);
+  ATTR_VERYVERYTHINMATHSPACE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::veryverythinmathspace), ALL_NO_PREFIX);
+  ATTR_VERYVERYTHICKMATHSPACE = new nsHtml5AttributeName(
+    ALL_NO_NS, SAME_LOCAL(nsGkAtoms::veryverythickmathspace), ALL_NO_PREFIX);
   ATTRIBUTE_NAMES = new nsHtml5AttributeName*[583];
   ATTRIBUTE_NAMES[0] = ATTR_ALT;
   ATTRIBUTE_NAMES[1] = ATTR_DIR;
   ATTRIBUTE_NAMES[2] = ATTR_DUR;
   ATTRIBUTE_NAMES[3] = ATTR_END;
   ATTRIBUTE_NAMES[4] = ATTR_FOR;
   ATTRIBUTE_NAMES[5] = ATTR_IN2;
   ATTRIBUTE_NAMES[6] = ATTR_LOW;
--- a/parser/html/nsHtml5AttributeName.h
+++ b/parser/html/nsHtml5AttributeName.h
@@ -32,17 +32,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 class nsHtml5StreamParser;
 
--- a/parser/html/nsHtml5ElementName.cpp
+++ b/parser/html/nsHtml5ElementName.cpp
@@ -31,17 +31,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 #include "nsHtml5AttributeName.h"
 #include "nsHtml5Tokenizer.h"
@@ -319,687 +319,667 @@ static int32_t const ELEMENT_HASHES_DATA
   2008994116, 2021937364, 2051837468, 2060065124, 2068523853, 2068523856,
   2070023911, 2083120164, 2085266636, 2091479332, 2092255447, 2092557349
 };
 staticJArray<int32_t,int32_t> nsHtml5ElementName::ELEMENT_HASHES = { ELEMENT_HASHES_DATA, MOZ_ARRAY_LENGTH(ELEMENT_HASHES_DATA) };
 void
 nsHtml5ElementName::initializeStatics()
 {
   ELT_ANNOTATION_XML = new nsHtml5ElementName(
-    nsHtml5Atoms::annotation_xml,
-    nsHtml5Atoms::annotation_xml,
+    nsGkAtoms::annotation_xml_,
+    nsGkAtoms::annotation_xml_,
     nsHtml5TreeBuilder::ANNOTATION_XML | SCOPING_AS_MATHML);
-  ELT_ISINDEX = new nsHtml5ElementName(nsHtml5Atoms::isindex,
-                                       nsHtml5Atoms::isindex,
+  ELT_ISINDEX = new nsHtml5ElementName(nsGkAtoms::isindex,
+                                       nsGkAtoms::isindex,
                                        nsHtml5TreeBuilder::ISINDEX | SPECIAL);
   ELT_BIG = new nsHtml5ElementName(
-    nsHtml5Atoms::big,
-    nsHtml5Atoms::big,
+    nsGkAtoms::big,
+    nsGkAtoms::big,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_BDO = new nsHtml5ElementName(
-    nsHtml5Atoms::bdo, nsHtml5Atoms::bdo, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::bdo, nsGkAtoms::bdo, nsHtml5TreeBuilder::OTHER);
   ELT_COL = new nsHtml5ElementName(
-    nsHtml5Atoms::col, nsHtml5Atoms::col, nsHtml5TreeBuilder::COL | SPECIAL);
+    nsGkAtoms::col, nsGkAtoms::col, nsHtml5TreeBuilder::COL | SPECIAL);
   ELT_DEL = new nsHtml5ElementName(
-    nsHtml5Atoms::del, nsHtml5Atoms::del, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::del, nsGkAtoms::del, nsHtml5TreeBuilder::OTHER);
   ELT_DFN = new nsHtml5ElementName(
-    nsHtml5Atoms::dfn, nsHtml5Atoms::dfn, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::dfn, nsGkAtoms::dfn, nsHtml5TreeBuilder::OTHER);
   ELT_DIR = new nsHtml5ElementName(
-    nsHtml5Atoms::dir,
-    nsHtml5Atoms::dir,
+    nsGkAtoms::dir,
+    nsGkAtoms::dir,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_DIV = new nsHtml5ElementName(
-    nsHtml5Atoms::div,
-    nsHtml5Atoms::div,
+    nsGkAtoms::div,
+    nsGkAtoms::div,
     nsHtml5TreeBuilder::DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU | SPECIAL);
   ELT_IMG = new nsHtml5ElementName(
-    nsHtml5Atoms::img, nsHtml5Atoms::img, nsHtml5TreeBuilder::IMG | SPECIAL);
+    nsGkAtoms::img, nsGkAtoms::img, nsHtml5TreeBuilder::IMG | SPECIAL);
   ELT_INS = new nsHtml5ElementName(
-    nsHtml5Atoms::ins, nsHtml5Atoms::ins, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::ins, nsGkAtoms::ins, nsHtml5TreeBuilder::OTHER);
   ELT_KBD = new nsHtml5ElementName(
-    nsHtml5Atoms::kbd, nsHtml5Atoms::kbd, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::kbd, nsGkAtoms::kbd, nsHtml5TreeBuilder::OTHER);
   ELT_MAP = new nsHtml5ElementName(
-    nsHtml5Atoms::map, nsHtml5Atoms::map, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::map, nsGkAtoms::map, nsHtml5TreeBuilder::OTHER);
   ELT_NAV = new nsHtml5ElementName(
-    nsHtml5Atoms::nav,
-    nsHtml5Atoms::nav,
+    nsGkAtoms::nav,
+    nsGkAtoms::nav,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_PRE =
-    new nsHtml5ElementName(nsHtml5Atoms::pre,
-                           nsHtml5Atoms::pre,
+    new nsHtml5ElementName(nsGkAtoms::pre,
+                           nsGkAtoms::pre,
                            nsHtml5TreeBuilder::PRE_OR_LISTING | SPECIAL);
-  ELT_A = new nsHtml5ElementName(
-    nsHtml5Atoms::a, nsHtml5Atoms::a, nsHtml5TreeBuilder::A);
+  ELT_A =
+    new nsHtml5ElementName(nsGkAtoms::a, nsGkAtoms::a, nsHtml5TreeBuilder::A);
   ELT_B = new nsHtml5ElementName(
-    nsHtml5Atoms::b,
-    nsHtml5Atoms::b,
+    nsGkAtoms::b,
+    nsGkAtoms::b,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_RTC =
-    new nsHtml5ElementName(nsHtml5Atoms::rtc,
-                           nsHtml5Atoms::rtc,
+    new nsHtml5ElementName(nsGkAtoms::rtc,
+                           nsGkAtoms::rtc,
                            nsHtml5TreeBuilder::RB_OR_RTC | OPTIONAL_END_TAG);
   ELT_SUB = new nsHtml5ElementName(
-    nsHtml5Atoms::sub,
-    nsHtml5Atoms::sub,
+    nsGkAtoms::sub,
+    nsGkAtoms::sub,
     nsHtml5TreeBuilder::RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR);
   ELT_SVG = new nsHtml5ElementName(
-    nsHtml5Atoms::svg, nsHtml5Atoms::svg, nsHtml5TreeBuilder::SVG);
+    nsGkAtoms::svg, nsGkAtoms::svg, nsHtml5TreeBuilder::SVG);
   ELT_SUP = new nsHtml5ElementName(
-    nsHtml5Atoms::sup,
-    nsHtml5Atoms::sup,
+    nsGkAtoms::sup,
+    nsGkAtoms::sup,
     nsHtml5TreeBuilder::RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR);
   ELT_SET = new nsHtml5ElementName(
-    nsHtml5Atoms::set, nsHtml5Atoms::set, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::set_, nsGkAtoms::set_, nsHtml5TreeBuilder::OTHER);
   ELT_USE = new nsHtml5ElementName(
-    nsHtml5Atoms::use, nsHtml5Atoms::use, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::use, nsGkAtoms::use, nsHtml5TreeBuilder::OTHER);
   ELT_VAR = new nsHtml5ElementName(
-    nsHtml5Atoms::var,
-    nsHtml5Atoms::var,
+    nsGkAtoms::var,
+    nsGkAtoms::var,
     nsHtml5TreeBuilder::RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR);
   ELT_G = new nsHtml5ElementName(
-    nsHtml5Atoms::g, nsHtml5Atoms::g, nsHtml5TreeBuilder::OTHER);
-  ELT_WBR = new nsHtml5ElementName(nsHtml5Atoms::wbr,
-                                   nsHtml5Atoms::wbr,
-                                   nsHtml5TreeBuilder::AREA_OR_WBR | SPECIAL);
+    nsGkAtoms::g, nsGkAtoms::g, nsHtml5TreeBuilder::OTHER);
+  ELT_WBR = new nsHtml5ElementName(
+    nsGkAtoms::wbr, nsGkAtoms::wbr, nsHtml5TreeBuilder::AREA_OR_WBR | SPECIAL);
   ELT_XMP = new nsHtml5ElementName(
-    nsHtml5Atoms::xmp, nsHtml5Atoms::xmp, nsHtml5TreeBuilder::XMP | SPECIAL);
+    nsGkAtoms::xmp, nsGkAtoms::xmp, nsHtml5TreeBuilder::XMP | SPECIAL);
   ELT_I = new nsHtml5ElementName(
-    nsHtml5Atoms::i,
-    nsHtml5Atoms::i,
+    nsGkAtoms::i,
+    nsGkAtoms::i,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_P =
-    new nsHtml5ElementName(nsHtml5Atoms::p,
-                           nsHtml5Atoms::p,
+    new nsHtml5ElementName(nsGkAtoms::p,
+                           nsGkAtoms::p,
                            nsHtml5TreeBuilder::P | SPECIAL | OPTIONAL_END_TAG);
   ELT_Q = new nsHtml5ElementName(
-    nsHtml5Atoms::q, nsHtml5Atoms::q, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::q, nsGkAtoms::q, nsHtml5TreeBuilder::OTHER);
   ELT_S = new nsHtml5ElementName(
-    nsHtml5Atoms::s,
-    nsHtml5Atoms::s,
+    nsGkAtoms::s,
+    nsGkAtoms::s,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_U = new nsHtml5ElementName(
-    nsHtml5Atoms::u,
-    nsHtml5Atoms::u,
+    nsGkAtoms::u,
+    nsGkAtoms::u,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_H1 = new nsHtml5ElementName(
-    nsHtml5Atoms::h1,
-    nsHtml5Atoms::h1,
+    nsGkAtoms::h1,
+    nsGkAtoms::h1,
     nsHtml5TreeBuilder::H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL);
   ELT_H2 = new nsHtml5ElementName(
-    nsHtml5Atoms::h2,
-    nsHtml5Atoms::h2,
+    nsGkAtoms::h2,
+    nsGkAtoms::h2,
     nsHtml5TreeBuilder::H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL);
   ELT_H3 = new nsHtml5ElementName(
-    nsHtml5Atoms::h3,
-    nsHtml5Atoms::h3,
+    nsGkAtoms::h3,
+    nsGkAtoms::h3,
     nsHtml5TreeBuilder::H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL);
   ELT_H4 = new nsHtml5ElementName(
-    nsHtml5Atoms::h4,
-    nsHtml5Atoms::h4,
+    nsGkAtoms::h4,
+    nsGkAtoms::h4,
     nsHtml5TreeBuilder::H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL);
   ELT_H5 = new nsHtml5ElementName(
-    nsHtml5Atoms::h5,
-    nsHtml5Atoms::h5,
+    nsGkAtoms::h5,
+    nsGkAtoms::h5,
     nsHtml5TreeBuilder::H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL);
   ELT_H6 = new nsHtml5ElementName(
-    nsHtml5Atoms::h6,
-    nsHtml5Atoms::h6,
+    nsGkAtoms::h6,
+    nsGkAtoms::h6,
     nsHtml5TreeBuilder::H1_OR_H2_OR_H3_OR_H4_OR_H5_OR_H6 | SPECIAL);
-  ELT_AREA = new nsHtml5ElementName(nsHtml5Atoms::area,
-                                    nsHtml5Atoms::area,
+  ELT_AREA = new nsHtml5ElementName(nsGkAtoms::area,
+                                    nsGkAtoms::area,
                                     nsHtml5TreeBuilder::AREA_OR_WBR | SPECIAL);
   ELT_FEFUNCA = new nsHtml5ElementName(
-    nsHtml5Atoms::fefunca, nsHtml5Atoms::feFuncA, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::fefunca, nsGkAtoms::feFuncA, nsHtml5TreeBuilder::OTHER);
   ELT_METADATA = new nsHtml5ElementName(
-    nsHtml5Atoms::metadata, nsHtml5Atoms::metadata, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::metadata, nsGkAtoms::metadata, nsHtml5TreeBuilder::OTHER);
   ELT_META = new nsHtml5ElementName(
-    nsHtml5Atoms::meta, nsHtml5Atoms::meta, nsHtml5TreeBuilder::META | SPECIAL);
-  ELT_TEXTAREA = new nsHtml5ElementName(nsHtml5Atoms::textarea,
-                                        nsHtml5Atoms::textarea,
+    nsGkAtoms::meta, nsGkAtoms::meta, nsHtml5TreeBuilder::META | SPECIAL);
+  ELT_TEXTAREA = new nsHtml5ElementName(nsGkAtoms::textarea,
+                                        nsGkAtoms::textarea,
                                         nsHtml5TreeBuilder::TEXTAREA | SPECIAL);
   ELT_FEFUNCB = new nsHtml5ElementName(
-    nsHtml5Atoms::fefuncb, nsHtml5Atoms::feFuncB, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::fefuncb, nsGkAtoms::feFuncB, nsHtml5TreeBuilder::OTHER);
   ELT_RB =
-    new nsHtml5ElementName(nsHtml5Atoms::rb,
-                           nsHtml5Atoms::rb,
+    new nsHtml5ElementName(nsGkAtoms::rb,
+                           nsGkAtoms::rb,
                            nsHtml5TreeBuilder::RB_OR_RTC | OPTIONAL_END_TAG);
-  ELT_DESC = new nsHtml5ElementName(nsHtml5Atoms::desc,
-                                    nsHtml5Atoms::desc,
+  ELT_DESC = new nsHtml5ElementName(nsGkAtoms::desc,
+                                    nsGkAtoms::desc,
                                     nsHtml5TreeBuilder::FOREIGNOBJECT_OR_DESC |
                                       SCOPING_AS_SVG);
-  ELT_DD = new nsHtml5ElementName(nsHtml5Atoms::dd,
-                                  nsHtml5Atoms::dd,
+  ELT_DD = new nsHtml5ElementName(nsGkAtoms::dd,
+                                  nsGkAtoms::dd,
                                   nsHtml5TreeBuilder::DD_OR_DT | SPECIAL |
                                     OPTIONAL_END_TAG);
   ELT_BGSOUND = new nsHtml5ElementName(
-    nsHtml5Atoms::bgsound,
-    nsHtml5Atoms::bgsound,
+    nsGkAtoms::bgsound,
+    nsGkAtoms::bgsound,
     nsHtml5TreeBuilder::LINK_OR_BASEFONT_OR_BGSOUND | SPECIAL);
-  ELT_EMBED = new nsHtml5ElementName(nsHtml5Atoms::embed,
-                                     nsHtml5Atoms::embed,
-                                     nsHtml5TreeBuilder::EMBED | SPECIAL);
+  ELT_EMBED = new nsHtml5ElementName(
+    nsGkAtoms::embed, nsGkAtoms::embed, nsHtml5TreeBuilder::EMBED | SPECIAL);
   ELT_FEBLEND = new nsHtml5ElementName(
-    nsHtml5Atoms::feblend, nsHtml5Atoms::feBlend, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::feblend, nsGkAtoms::feBlend, nsHtml5TreeBuilder::OTHER);
   ELT_FEFLOOD = new nsHtml5ElementName(
-    nsHtml5Atoms::feflood, nsHtml5Atoms::feFlood, nsHtml5TreeBuilder::OTHER);
-  ELT_HEAD = new nsHtml5ElementName(nsHtml5Atoms::head,
-                                    nsHtml5Atoms::head,
+    nsGkAtoms::feflood, nsGkAtoms::feFlood, nsHtml5TreeBuilder::OTHER);
+  ELT_HEAD = new nsHtml5ElementName(nsGkAtoms::head,
+                                    nsGkAtoms::head,
                                     nsHtml5TreeBuilder::HEAD | SPECIAL |
                                       OPTIONAL_END_TAG);
   ELT_LEGEND = new nsHtml5ElementName(
-    nsHtml5Atoms::legend, nsHtml5Atoms::legend, nsHtml5TreeBuilder::OTHER);
-  ELT_NOEMBED = new nsHtml5ElementName(nsHtml5Atoms::noembed,
-                                       nsHtml5Atoms::noembed,
+    nsGkAtoms::legend, nsGkAtoms::legend, nsHtml5TreeBuilder::OTHER);
+  ELT_NOEMBED = new nsHtml5ElementName(nsGkAtoms::noembed,
+                                       nsGkAtoms::noembed,
                                        nsHtml5TreeBuilder::NOEMBED | SPECIAL);
-  ELT_TD = new nsHtml5ElementName(nsHtml5Atoms::td,
-                                  nsHtml5Atoms::td,
+  ELT_TD = new nsHtml5ElementName(nsGkAtoms::td,
+                                  nsGkAtoms::td,
                                   nsHtml5TreeBuilder::TD_OR_TH | SPECIAL |
                                     SCOPING | OPTIONAL_END_TAG);
   ELT_THEAD =
-    new nsHtml5ElementName(nsHtml5Atoms::thead,
-                           nsHtml5Atoms::thead,
+    new nsHtml5ElementName(nsGkAtoms::thead,
+                           nsGkAtoms::thead,
                            nsHtml5TreeBuilder::TBODY_OR_THEAD_OR_TFOOT |
                              SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG);
   ELT_ASIDE = new nsHtml5ElementName(
-    nsHtml5Atoms::aside,
-    nsHtml5Atoms::aside,
+    nsGkAtoms::aside,
+    nsGkAtoms::aside,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_ARTICLE = new nsHtml5ElementName(
-    nsHtml5Atoms::article,
-    nsHtml5Atoms::article,
+    nsGkAtoms::article,
+    nsGkAtoms::article,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_ANIMATE = new nsHtml5ElementName(
-    nsHtml5Atoms::animate, nsHtml5Atoms::animate, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::animate, nsGkAtoms::animate, nsHtml5TreeBuilder::OTHER);
   ELT_BASE = new nsHtml5ElementName(
-    nsHtml5Atoms::base, nsHtml5Atoms::base, nsHtml5TreeBuilder::BASE | SPECIAL);
+    nsGkAtoms::base, nsGkAtoms::base, nsHtml5TreeBuilder::BASE | SPECIAL);
   ELT_BLOCKQUOTE = new nsHtml5ElementName(
-    nsHtml5Atoms::blockquote,
-    nsHtml5Atoms::blockquote,
+    nsGkAtoms::blockquote,
+    nsGkAtoms::blockquote,
     nsHtml5TreeBuilder::DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU | SPECIAL);
   ELT_CODE = new nsHtml5ElementName(
-    nsHtml5Atoms::code,
-    nsHtml5Atoms::code,
+    nsGkAtoms::code,
+    nsGkAtoms::code,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_CIRCLE = new nsHtml5ElementName(
-    nsHtml5Atoms::circle, nsHtml5Atoms::circle, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::circle, nsGkAtoms::circle, nsHtml5TreeBuilder::OTHER);
   ELT_CITE = new nsHtml5ElementName(
-    nsHtml5Atoms::cite, nsHtml5Atoms::cite, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::cite, nsGkAtoms::cite, nsHtml5TreeBuilder::OTHER);
   ELT_ELLIPSE = new nsHtml5ElementName(
-    nsHtml5Atoms::ellipse, nsHtml5Atoms::ellipse, nsHtml5TreeBuilder::OTHER);
-  ELT_FETURBULENCE = new nsHtml5ElementName(nsHtml5Atoms::feturbulence,
-                                            nsHtml5Atoms::feTurbulence,
+    nsGkAtoms::ellipse, nsGkAtoms::ellipse, nsHtml5TreeBuilder::OTHER);
+  ELT_FETURBULENCE = new nsHtml5ElementName(nsGkAtoms::feturbulence,
+                                            nsGkAtoms::feTurbulence,
                                             nsHtml5TreeBuilder::OTHER);
-  ELT_FEMERGENODE = new nsHtml5ElementName(nsHtml5Atoms::femergenode,
-                                           nsHtml5Atoms::feMergeNode,
-                                           nsHtml5TreeBuilder::OTHER);
+  ELT_FEMERGENODE = new nsHtml5ElementName(
+    nsGkAtoms::femergenode, nsGkAtoms::feMergeNode, nsHtml5TreeBuilder::OTHER);
   ELT_FEIMAGE = new nsHtml5ElementName(
-    nsHtml5Atoms::feimage, nsHtml5Atoms::feImage, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::feimage, nsGkAtoms::feImage, nsHtml5TreeBuilder::OTHER);
   ELT_FEMERGE = new nsHtml5ElementName(
-    nsHtml5Atoms::femerge, nsHtml5Atoms::feMerge, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::femerge, nsGkAtoms::feMerge, nsHtml5TreeBuilder::OTHER);
   ELT_FETILE = new nsHtml5ElementName(
-    nsHtml5Atoms::fetile, nsHtml5Atoms::feTile, nsHtml5TreeBuilder::OTHER);
-  ELT_FRAME = new nsHtml5ElementName(nsHtml5Atoms::frame,
-                                     nsHtml5Atoms::frame,
-                                     nsHtml5TreeBuilder::FRAME | SPECIAL);
+    nsGkAtoms::fetile, nsGkAtoms::feTile, nsHtml5TreeBuilder::OTHER);
+  ELT_FRAME = new nsHtml5ElementName(
+    nsGkAtoms::frame, nsGkAtoms::frame, nsHtml5TreeBuilder::FRAME | SPECIAL);
   ELT_FIGURE = new nsHtml5ElementName(
-    nsHtml5Atoms::figure,
-    nsHtml5Atoms::figure,
+    nsGkAtoms::figure,
+    nsGkAtoms::figure,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
-  ELT_FECOMPOSITE = new nsHtml5ElementName(nsHtml5Atoms::fecomposite,
-                                           nsHtml5Atoms::feComposite,
-                                           nsHtml5TreeBuilder::OTHER);
+  ELT_FECOMPOSITE = new nsHtml5ElementName(
+    nsGkAtoms::fecomposite, nsGkAtoms::feComposite, nsHtml5TreeBuilder::OTHER);
   ELT_IMAGE = new nsHtml5ElementName(
-    nsHtml5Atoms::image, nsHtml5Atoms::image, nsHtml5TreeBuilder::IMAGE);
-  ELT_IFRAME = new nsHtml5ElementName(nsHtml5Atoms::iframe,
-                                      nsHtml5Atoms::iframe,
-                                      nsHtml5TreeBuilder::IFRAME | SPECIAL);
+    nsGkAtoms::image, nsGkAtoms::image, nsHtml5TreeBuilder::IMAGE);
+  ELT_IFRAME = new nsHtml5ElementName(
+    nsGkAtoms::iframe, nsGkAtoms::iframe, nsHtml5TreeBuilder::IFRAME | SPECIAL);
   ELT_LINE = new nsHtml5ElementName(
-    nsHtml5Atoms::line, nsHtml5Atoms::line, nsHtml5TreeBuilder::OTHER);
-  ELT_MARQUEE = new nsHtml5ElementName(nsHtml5Atoms::marquee,
-                                       nsHtml5Atoms::marquee,
+    nsGkAtoms::line, nsGkAtoms::line, nsHtml5TreeBuilder::OTHER);
+  ELT_MARQUEE = new nsHtml5ElementName(nsGkAtoms::marquee,
+                                       nsGkAtoms::marquee,
                                        nsHtml5TreeBuilder::MARQUEE_OR_APPLET |
                                          SPECIAL | SCOPING);
   ELT_POLYLINE = new nsHtml5ElementName(
-    nsHtml5Atoms::polyline, nsHtml5Atoms::polyline, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::polyline, nsGkAtoms::polyline, nsHtml5TreeBuilder::OTHER);
   ELT_PICTURE = new nsHtml5ElementName(
-    nsHtml5Atoms::picture, nsHtml5Atoms::picture, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::picture, nsGkAtoms::picture, nsHtml5TreeBuilder::OTHER);
   ELT_SOURCE =
-    new nsHtml5ElementName(nsHtml5Atoms::source,
-                           nsHtml5Atoms::source,
+    new nsHtml5ElementName(nsGkAtoms::source,
+                           nsGkAtoms::source,
                            nsHtml5TreeBuilder::PARAM_OR_SOURCE_OR_TRACK);
   ELT_STRIKE = new nsHtml5ElementName(
-    nsHtml5Atoms::strike,
-    nsHtml5Atoms::strike,
+    nsGkAtoms::strike,
+    nsGkAtoms::strike,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
-  ELT_STYLE = new nsHtml5ElementName(nsHtml5Atoms::style,
-                                     nsHtml5Atoms::style,
-                                     nsHtml5TreeBuilder::STYLE | SPECIAL);
-  ELT_TABLE = new nsHtml5ElementName(nsHtml5Atoms::table,
-                                     nsHtml5Atoms::table,
+  ELT_STYLE = new nsHtml5ElementName(
+    nsGkAtoms::style, nsGkAtoms::style, nsHtml5TreeBuilder::STYLE | SPECIAL);
+  ELT_TABLE = new nsHtml5ElementName(nsGkAtoms::table,
+                                     nsGkAtoms::table,
                                      nsHtml5TreeBuilder::TABLE | SPECIAL |
                                        FOSTER_PARENTING | SCOPING);
-  ELT_TITLE = new nsHtml5ElementName(nsHtml5Atoms::title,
-                                     nsHtml5Atoms::title,
+  ELT_TITLE = new nsHtml5ElementName(nsGkAtoms::title,
+                                     nsGkAtoms::title,
                                      nsHtml5TreeBuilder::TITLE | SPECIAL |
                                        SCOPING_AS_SVG);
   ELT_TIME = new nsHtml5ElementName(
-    nsHtml5Atoms::time, nsHtml5Atoms::time, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::time, nsGkAtoms::time, nsHtml5TreeBuilder::OTHER);
   ELT_TEMPLATE =
-    new nsHtml5ElementName(nsHtml5Atoms::template_,
-                           nsHtml5Atoms::template_,
+    new nsHtml5ElementName(nsGkAtoms::_template,
+                           nsGkAtoms::_template,
                            nsHtml5TreeBuilder::TEMPLATE | SPECIAL | SCOPING);
-  ELT_ALTGLYPHDEF = new nsHtml5ElementName(nsHtml5Atoms::altglyphdef,
-                                           nsHtml5Atoms::altGlyphDef,
-                                           nsHtml5TreeBuilder::OTHER);
+  ELT_ALTGLYPHDEF = new nsHtml5ElementName(
+    nsGkAtoms::altglyphdef, nsGkAtoms::altGlyphDef, nsHtml5TreeBuilder::OTHER);
   ELT_GLYPHREF = new nsHtml5ElementName(
-    nsHtml5Atoms::glyphref, nsHtml5Atoms::glyphRef, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::glyphref, nsGkAtoms::glyphRef, nsHtml5TreeBuilder::OTHER);
   ELT_DIALOG = new nsHtml5ElementName(
-    nsHtml5Atoms::dialog,
-    nsHtml5Atoms::dialog,
+    nsGkAtoms::dialog,
+    nsGkAtoms::dialog,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_FEFUNCG = new nsHtml5ElementName(
-    nsHtml5Atoms::fefuncg, nsHtml5Atoms::feFuncG, nsHtml5TreeBuilder::OTHER);
-  ELT_FEDIFFUSELIGHTING =
-    new nsHtml5ElementName(nsHtml5Atoms::fediffuselighting,
-                           nsHtml5Atoms::feDiffuseLighting,
-                           nsHtml5TreeBuilder::OTHER);
-  ELT_FESPECULARLIGHTING =
-    new nsHtml5ElementName(nsHtml5Atoms::fespecularlighting,
-                           nsHtml5Atoms::feSpecularLighting,
-                           nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::fefuncg, nsGkAtoms::feFuncG, nsHtml5TreeBuilder::OTHER);
+  ELT_FEDIFFUSELIGHTING = new nsHtml5ElementName(nsGkAtoms::fediffuselighting,
+                                                 nsGkAtoms::feDiffuseLighting,
+                                                 nsHtml5TreeBuilder::OTHER);
+  ELT_FESPECULARLIGHTING = new nsHtml5ElementName(nsGkAtoms::fespecularlighting,
+                                                  nsGkAtoms::feSpecularLighting,
+                                                  nsHtml5TreeBuilder::OTHER);
   ELT_LISTING =
-    new nsHtml5ElementName(nsHtml5Atoms::listing,
-                           nsHtml5Atoms::listing,
+    new nsHtml5ElementName(nsGkAtoms::listing,
+                           nsGkAtoms::listing,
                            nsHtml5TreeBuilder::PRE_OR_LISTING | SPECIAL);
   ELT_STRONG = new nsHtml5ElementName(
-    nsHtml5Atoms::strong,
-    nsHtml5Atoms::strong,
+    nsGkAtoms::strong,
+    nsGkAtoms::strong,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_ALTGLYPH = new nsHtml5ElementName(
-    nsHtml5Atoms::altglyph, nsHtml5Atoms::altGlyph, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::altglyph, nsGkAtoms::altGlyph, nsHtml5TreeBuilder::OTHER);
   ELT_CLIPPATH = new nsHtml5ElementName(
-    nsHtml5Atoms::clippath, nsHtml5Atoms::clipPath, nsHtml5TreeBuilder::OTHER);
-  ELT_MGLYPH = new nsHtml5ElementName(nsHtml5Atoms::mglyph,
-                                      nsHtml5Atoms::mglyph,
+    nsGkAtoms::clippath, nsGkAtoms::clipPath, nsHtml5TreeBuilder::OTHER);
+  ELT_MGLYPH = new nsHtml5ElementName(nsGkAtoms::mglyph_,
+                                      nsGkAtoms::mglyph_,
                                       nsHtml5TreeBuilder::MGLYPH_OR_MALIGNMARK);
   ELT_MATH = new nsHtml5ElementName(
-    nsHtml5Atoms::math, nsHtml5Atoms::math, nsHtml5TreeBuilder::MATH);
+    nsGkAtoms::math, nsGkAtoms::math, nsHtml5TreeBuilder::MATH);
   ELT_MPATH = new nsHtml5ElementName(
-    nsHtml5Atoms::mpath, nsHtml5Atoms::mpath, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::mpath, nsGkAtoms::mpath, nsHtml5TreeBuilder::OTHER);
   ELT_PATH = new nsHtml5ElementName(
-    nsHtml5Atoms::path, nsHtml5Atoms::path, nsHtml5TreeBuilder::OTHER);
-  ELT_TH = new nsHtml5ElementName(nsHtml5Atoms::th,
-                                  nsHtml5Atoms::th,
+    nsGkAtoms::path, nsGkAtoms::path, nsHtml5TreeBuilder::OTHER);
+  ELT_TH = new nsHtml5ElementName(nsGkAtoms::th,
+                                  nsGkAtoms::th,
                                   nsHtml5TreeBuilder::TD_OR_TH | SPECIAL |
                                     SCOPING | OPTIONAL_END_TAG);
   ELT_SWITCH = new nsHtml5ElementName(
-    nsHtml5Atoms::switch_, nsHtml5Atoms::switch_, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::_switch, nsGkAtoms::_switch, nsHtml5TreeBuilder::OTHER);
   ELT_TEXTPATH = new nsHtml5ElementName(
-    nsHtml5Atoms::textpath, nsHtml5Atoms::textPath, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::textpath, nsGkAtoms::textPath, nsHtml5TreeBuilder::OTHER);
   ELT_LI =
-    new nsHtml5ElementName(nsHtml5Atoms::li,
-                           nsHtml5Atoms::li,
+    new nsHtml5ElementName(nsGkAtoms::li,
+                           nsGkAtoms::li,
                            nsHtml5TreeBuilder::LI | SPECIAL | OPTIONAL_END_TAG);
-  ELT_MI = new nsHtml5ElementName(nsHtml5Atoms::mi,
-                                  nsHtml5Atoms::mi,
+  ELT_MI = new nsHtml5ElementName(nsGkAtoms::mi_,
+                                  nsGkAtoms::mi_,
                                   nsHtml5TreeBuilder::MI_MO_MN_MS_MTEXT |
                                     SCOPING_AS_MATHML);
   ELT_LINK = new nsHtml5ElementName(
-    nsHtml5Atoms::link,
-    nsHtml5Atoms::link,
+    nsGkAtoms::link,
+    nsGkAtoms::link,
     nsHtml5TreeBuilder::LINK_OR_BASEFONT_OR_BGSOUND | SPECIAL);
   ELT_MARK = new nsHtml5ElementName(
-    nsHtml5Atoms::mark, nsHtml5Atoms::mark, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::mark, nsGkAtoms::mark, nsHtml5TreeBuilder::OTHER);
   ELT_MALIGNMARK =
-    new nsHtml5ElementName(nsHtml5Atoms::malignmark,
-                           nsHtml5Atoms::malignmark,
+    new nsHtml5ElementName(nsGkAtoms::malignmark_,
+                           nsGkAtoms::malignmark_,
                            nsHtml5TreeBuilder::MGLYPH_OR_MALIGNMARK);
   ELT_MASK = new nsHtml5ElementName(
-    nsHtml5Atoms::mask, nsHtml5Atoms::mask, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::mask, nsGkAtoms::mask, nsHtml5TreeBuilder::OTHER);
   ELT_TRACK = new nsHtml5ElementName(
-    nsHtml5Atoms::track,
-    nsHtml5Atoms::track,
+    nsGkAtoms::track,
+    nsGkAtoms::track,
     nsHtml5TreeBuilder::PARAM_OR_SOURCE_OR_TRACK | SPECIAL);
-  ELT_DL = new nsHtml5ElementName(nsHtml5Atoms::dl,
-                                  nsHtml5Atoms::dl,
-                                  nsHtml5TreeBuilder::UL_OR_OL_OR_DL | SPECIAL);
-  ELT_HTML = new nsHtml5ElementName(nsHtml5Atoms::html,
-                                    nsHtml5Atoms::html,
+  ELT_DL = new nsHtml5ElementName(
+    nsGkAtoms::dl, nsGkAtoms::dl, nsHtml5TreeBuilder::UL_OR_OL_OR_DL | SPECIAL);
+  ELT_HTML = new nsHtml5ElementName(nsGkAtoms::html,
+                                    nsGkAtoms::html,
                                     nsHtml5TreeBuilder::HTML | SPECIAL |
                                       SCOPING | OPTIONAL_END_TAG);
-  ELT_OL = new nsHtml5ElementName(nsHtml5Atoms::ol,
-                                  nsHtml5Atoms::ol,
-                                  nsHtml5TreeBuilder::UL_OR_OL_OR_DL | SPECIAL);
+  ELT_OL = new nsHtml5ElementName(
+    nsGkAtoms::ol, nsGkAtoms::ol, nsHtml5TreeBuilder::UL_OR_OL_OR_DL | SPECIAL);
   ELT_LABEL = new nsHtml5ElementName(
-    nsHtml5Atoms::label, nsHtml5Atoms::label, nsHtml5TreeBuilder::OTHER);
-  ELT_UL = new nsHtml5ElementName(nsHtml5Atoms::ul,
-                                  nsHtml5Atoms::ul,
-                                  nsHtml5TreeBuilder::UL_OR_OL_OR_DL | SPECIAL);
+    nsGkAtoms::label, nsGkAtoms::label, nsHtml5TreeBuilder::OTHER);
+  ELT_UL = new nsHtml5ElementName(
+    nsGkAtoms::ul, nsGkAtoms::ul, nsHtml5TreeBuilder::UL_OR_OL_OR_DL | SPECIAL);
   ELT_SMALL = new nsHtml5ElementName(
-    nsHtml5Atoms::small_,
-    nsHtml5Atoms::small_,
+    nsGkAtoms::small,
+    nsGkAtoms::small,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_SYMBOL = new nsHtml5ElementName(
-    nsHtml5Atoms::symbol, nsHtml5Atoms::symbol, nsHtml5TreeBuilder::OTHER);
-  ELT_ALTGLYPHITEM = new nsHtml5ElementName(nsHtml5Atoms::altglyphitem,
-                                            nsHtml5Atoms::altGlyphItem,
+    nsGkAtoms::symbol, nsGkAtoms::symbol, nsHtml5TreeBuilder::OTHER);
+  ELT_ALTGLYPHITEM = new nsHtml5ElementName(nsGkAtoms::altglyphitem,
+                                            nsGkAtoms::altGlyphItem,
                                             nsHtml5TreeBuilder::OTHER);
-  ELT_ANIMATETRANSFORM = new nsHtml5ElementName(nsHtml5Atoms::animatetransform,
-                                                nsHtml5Atoms::animateTransform,
+  ELT_ANIMATETRANSFORM = new nsHtml5ElementName(nsGkAtoms::animatetransform,
+                                                nsGkAtoms::animateTransform,
                                                 nsHtml5TreeBuilder::OTHER);
   ELT_ACRONYM = new nsHtml5ElementName(
-    nsHtml5Atoms::acronym, nsHtml5Atoms::acronym, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::acronym, nsGkAtoms::acronym, nsHtml5TreeBuilder::OTHER);
   ELT_EM = new nsHtml5ElementName(
-    nsHtml5Atoms::em,
-    nsHtml5Atoms::em,
+    nsGkAtoms::em,
+    nsGkAtoms::em,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_FORM = new nsHtml5ElementName(
-    nsHtml5Atoms::form, nsHtml5Atoms::form, nsHtml5TreeBuilder::FORM | SPECIAL);
-  ELT_MENUITEM = new nsHtml5ElementName(nsHtml5Atoms::menuitem,
-                                        nsHtml5Atoms::menuitem,
-                                        nsHtml5TreeBuilder::MENUITEM);
+    nsGkAtoms::form, nsGkAtoms::form, nsHtml5TreeBuilder::FORM | SPECIAL);
+  ELT_MENUITEM = new nsHtml5ElementName(
+    nsGkAtoms::menuitem, nsGkAtoms::menuitem, nsHtml5TreeBuilder::MENUITEM);
   ELT_PARAM = new nsHtml5ElementName(
-    nsHtml5Atoms::param,
-    nsHtml5Atoms::param,
+    nsGkAtoms::param,
+    nsGkAtoms::param,
     nsHtml5TreeBuilder::PARAM_OR_SOURCE_OR_TRACK | SPECIAL);
-  ELT_ANIMATEMOTION = new nsHtml5ElementName(nsHtml5Atoms::animatemotion,
-                                             nsHtml5Atoms::animateMotion,
+  ELT_ANIMATEMOTION = new nsHtml5ElementName(nsGkAtoms::animatemotion,
+                                             nsGkAtoms::animateMotion,
                                              nsHtml5TreeBuilder::OTHER);
-  ELT_BUTTON = new nsHtml5ElementName(nsHtml5Atoms::button,
-                                      nsHtml5Atoms::button,
-                                      nsHtml5TreeBuilder::BUTTON | SPECIAL);
+  ELT_BUTTON = new nsHtml5ElementName(
+    nsGkAtoms::button, nsGkAtoms::button, nsHtml5TreeBuilder::BUTTON | SPECIAL);
   ELT_CAPTION =
-    new nsHtml5ElementName(nsHtml5Atoms::caption,
-                           nsHtml5Atoms::caption,
+    new nsHtml5ElementName(nsGkAtoms::caption,
+                           nsGkAtoms::caption,
                            nsHtml5TreeBuilder::CAPTION | SPECIAL | SCOPING);
   ELT_FIGCAPTION = new nsHtml5ElementName(
-    nsHtml5Atoms::figcaption,
-    nsHtml5Atoms::figcaption,
+    nsGkAtoms::figcaption,
+    nsGkAtoms::figcaption,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
-  ELT_MN = new nsHtml5ElementName(nsHtml5Atoms::mn,
-                                  nsHtml5Atoms::mn,
+  ELT_MN = new nsHtml5ElementName(nsGkAtoms::mn_,
+                                  nsGkAtoms::mn_,
                                   nsHtml5TreeBuilder::MI_MO_MN_MS_MTEXT |
                                     SCOPING_AS_MATHML);
   ELT_KEYGEN = new nsHtml5ElementName(
-    nsHtml5Atoms::keygen, nsHtml5Atoms::keygen, nsHtml5TreeBuilder::KEYGEN);
+    nsGkAtoms::keygen, nsGkAtoms::keygen, nsHtml5TreeBuilder::KEYGEN);
   ELT_MAIN = new nsHtml5ElementName(
-    nsHtml5Atoms::main,
-    nsHtml5Atoms::main,
+    nsGkAtoms::main,
+    nsGkAtoms::main,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_OPTION =
-    new nsHtml5ElementName(nsHtml5Atoms::option,
-                           nsHtml5Atoms::option,
+    new nsHtml5ElementName(nsGkAtoms::option,
+                           nsGkAtoms::option,
                            nsHtml5TreeBuilder::OPTION | OPTIONAL_END_TAG);
   ELT_POLYGON = new nsHtml5ElementName(
-    nsHtml5Atoms::polygon, nsHtml5Atoms::polygon, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::polygon, nsGkAtoms::polygon, nsHtml5TreeBuilder::OTHER);
   ELT_PATTERN = new nsHtml5ElementName(
-    nsHtml5Atoms::pattern, nsHtml5Atoms::pattern, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::pattern, nsGkAtoms::pattern, nsHtml5TreeBuilder::OTHER);
   ELT_SPAN = new nsHtml5ElementName(
-    nsHtml5Atoms::span,
-    nsHtml5Atoms::span,
+    nsGkAtoms::span,
+    nsGkAtoms::span,
     nsHtml5TreeBuilder::RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR);
   ELT_SECTION = new nsHtml5ElementName(
-    nsHtml5Atoms::section,
-    nsHtml5Atoms::section,
+    nsGkAtoms::section,
+    nsGkAtoms::section,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_TSPAN = new nsHtml5ElementName(
-    nsHtml5Atoms::tspan, nsHtml5Atoms::tspan, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::tspan, nsGkAtoms::tspan, nsHtml5TreeBuilder::OTHER);
   ELT_AUDIO = new nsHtml5ElementName(
-    nsHtml5Atoms::audio, nsHtml5Atoms::audio, nsHtml5TreeBuilder::OTHER);
-  ELT_MO = new nsHtml5ElementName(nsHtml5Atoms::mo,
-                                  nsHtml5Atoms::mo,
+    nsGkAtoms::audio, nsGkAtoms::audio, nsHtml5TreeBuilder::OTHER);
+  ELT_MO = new nsHtml5ElementName(nsGkAtoms::mo_,
+                                  nsGkAtoms::mo_,
                                   nsHtml5TreeBuilder::MI_MO_MN_MS_MTEXT |
                                     SCOPING_AS_MATHML);
   ELT_VIDEO = new nsHtml5ElementName(
-    nsHtml5Atoms::video, nsHtml5Atoms::video, nsHtml5TreeBuilder::OTHER);
-  ELT_COLGROUP = new nsHtml5ElementName(nsHtml5Atoms::colgroup,
-                                        nsHtml5Atoms::colgroup,
+    nsGkAtoms::video, nsGkAtoms::video, nsHtml5TreeBuilder::OTHER);
+  ELT_COLGROUP = new nsHtml5ElementName(nsGkAtoms::colgroup,
+                                        nsGkAtoms::colgroup,
                                         nsHtml5TreeBuilder::COLGROUP | SPECIAL |
                                           OPTIONAL_END_TAG);
-  ELT_FEDISPLACEMENTMAP =
-    new nsHtml5ElementName(nsHtml5Atoms::fedisplacementmap,
-                           nsHtml5Atoms::feDisplacementMap,
-                           nsHtml5TreeBuilder::OTHER);
+  ELT_FEDISPLACEMENTMAP = new nsHtml5ElementName(nsGkAtoms::fedisplacementmap,
+                                                 nsGkAtoms::feDisplacementMap,
+                                                 nsHtml5TreeBuilder::OTHER);
   ELT_HGROUP = new nsHtml5ElementName(
-    nsHtml5Atoms::hgroup,
-    nsHtml5Atoms::hgroup,
+    nsGkAtoms::hgroup,
+    nsGkAtoms::hgroup,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_RP =
-    new nsHtml5ElementName(nsHtml5Atoms::rp,
-                           nsHtml5Atoms::rp,
+    new nsHtml5ElementName(nsGkAtoms::rp,
+                           nsGkAtoms::rp,
                            nsHtml5TreeBuilder::RT_OR_RP | OPTIONAL_END_TAG);
   ELT_OPTGROUP =
-    new nsHtml5ElementName(nsHtml5Atoms::optgroup,
-                           nsHtml5Atoms::optgroup,
+    new nsHtml5ElementName(nsGkAtoms::optgroup,
+                           nsGkAtoms::optgroup,
                            nsHtml5TreeBuilder::OPTGROUP | OPTIONAL_END_TAG);
   ELT_SAMP = new nsHtml5ElementName(
-    nsHtml5Atoms::samp, nsHtml5Atoms::samp, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::samp, nsGkAtoms::samp, nsHtml5TreeBuilder::OTHER);
   ELT_STOP = new nsHtml5ElementName(
-    nsHtml5Atoms::stop, nsHtml5Atoms::stop, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::stop, nsGkAtoms::stop, nsHtml5TreeBuilder::OTHER);
   ELT_BR = new nsHtml5ElementName(
-    nsHtml5Atoms::br, nsHtml5Atoms::br, nsHtml5TreeBuilder::BR | SPECIAL);
+    nsGkAtoms::br, nsGkAtoms::br, nsHtml5TreeBuilder::BR | SPECIAL);
   ELT_ABBR = new nsHtml5ElementName(
-    nsHtml5Atoms::abbr, nsHtml5Atoms::abbr, nsHtml5TreeBuilder::OTHER);
-  ELT_ANIMATECOLOR = new nsHtml5ElementName(nsHtml5Atoms::animatecolor,
-                                            nsHtml5Atoms::animateColor,
+    nsGkAtoms::abbr, nsGkAtoms::abbr, nsHtml5TreeBuilder::OTHER);
+  ELT_ANIMATECOLOR = new nsHtml5ElementName(nsGkAtoms::animatecolor,
+                                            nsGkAtoms::animateColor,
                                             nsHtml5TreeBuilder::OTHER);
   ELT_CENTER = new nsHtml5ElementName(
-    nsHtml5Atoms::center,
-    nsHtml5Atoms::center,
+    nsGkAtoms::center,
+    nsGkAtoms::center,
     nsHtml5TreeBuilder::DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU | SPECIAL);
   ELT_HR = new nsHtml5ElementName(
-    nsHtml5Atoms::hr, nsHtml5Atoms::hr, nsHtml5TreeBuilder::HR | SPECIAL);
+    nsGkAtoms::hr, nsGkAtoms::hr, nsHtml5TreeBuilder::HR | SPECIAL);
   ELT_FEFUNCR = new nsHtml5ElementName(
-    nsHtml5Atoms::fefuncr, nsHtml5Atoms::feFuncR, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::fefuncr, nsGkAtoms::feFuncR, nsHtml5TreeBuilder::OTHER);
   ELT_FECOMPONENTTRANSFER =
-    new nsHtml5ElementName(nsHtml5Atoms::fecomponenttransfer,
-                           nsHtml5Atoms::feComponentTransfer,
+    new nsHtml5ElementName(nsGkAtoms::fecomponenttransfer,
+                           nsGkAtoms::feComponentTransfer,
                            nsHtml5TreeBuilder::OTHER);
   ELT_FILTER = new nsHtml5ElementName(
-    nsHtml5Atoms::filter, nsHtml5Atoms::filter, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::filter, nsGkAtoms::filter, nsHtml5TreeBuilder::OTHER);
   ELT_FOOTER = new nsHtml5ElementName(
-    nsHtml5Atoms::footer,
-    nsHtml5Atoms::footer,
+    nsGkAtoms::footer,
+    nsGkAtoms::footer,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
-  ELT_FEGAUSSIANBLUR = new nsHtml5ElementName(nsHtml5Atoms::fegaussianblur,
-                                              nsHtml5Atoms::feGaussianBlur,
+  ELT_FEGAUSSIANBLUR = new nsHtml5ElementName(nsGkAtoms::fegaussianblur,
+                                              nsGkAtoms::feGaussianBlur,
                                               nsHtml5TreeBuilder::OTHER);
   ELT_HEADER = new nsHtml5ElementName(
-    nsHtml5Atoms::header,
-    nsHtml5Atoms::header,
+    nsGkAtoms::header,
+    nsGkAtoms::header,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_MARKER = new nsHtml5ElementName(
-    nsHtml5Atoms::marker, nsHtml5Atoms::marker, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::marker, nsGkAtoms::marker, nsHtml5TreeBuilder::OTHER);
   ELT_METER = new nsHtml5ElementName(
-    nsHtml5Atoms::meter, nsHtml5Atoms::meter, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::meter, nsGkAtoms::meter, nsHtml5TreeBuilder::OTHER);
   ELT_NOBR = new nsHtml5ElementName(
-    nsHtml5Atoms::nobr, nsHtml5Atoms::nobr, nsHtml5TreeBuilder::NOBR);
-  ELT_TR = new nsHtml5ElementName(nsHtml5Atoms::tr,
-                                  nsHtml5Atoms::tr,
+    nsGkAtoms::nobr, nsGkAtoms::nobr, nsHtml5TreeBuilder::NOBR);
+  ELT_TR = new nsHtml5ElementName(nsGkAtoms::tr,
+                                  nsGkAtoms::tr,
                                   nsHtml5TreeBuilder::TR | SPECIAL |
                                     FOSTER_PARENTING | OPTIONAL_END_TAG);
   ELT_ADDRESS = new nsHtml5ElementName(
-    nsHtml5Atoms::address,
-    nsHtml5Atoms::address,
+    nsGkAtoms::address,
+    nsGkAtoms::address,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_CANVAS = new nsHtml5ElementName(
-    nsHtml5Atoms::canvas, nsHtml5Atoms::canvas, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::canvas, nsGkAtoms::canvas, nsHtml5TreeBuilder::OTHER);
   ELT_DEFS = new nsHtml5ElementName(
-    nsHtml5Atoms::defs, nsHtml5Atoms::defs, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::defs, nsGkAtoms::defs, nsHtml5TreeBuilder::OTHER);
   ELT_DETAILS = new nsHtml5ElementName(
-    nsHtml5Atoms::details,
-    nsHtml5Atoms::details,
+    nsGkAtoms::details,
+    nsGkAtoms::details,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
-  ELT_MS = new nsHtml5ElementName(nsHtml5Atoms::ms,
-                                  nsHtml5Atoms::ms,
+  ELT_MS = new nsHtml5ElementName(nsGkAtoms::ms_,
+                                  nsGkAtoms::ms_,
                                   nsHtml5TreeBuilder::MI_MO_MN_MS_MTEXT |
                                     SCOPING_AS_MATHML);
-  ELT_NOFRAMES = new nsHtml5ElementName(nsHtml5Atoms::noframes,
-                                        nsHtml5Atoms::noframes,
+  ELT_NOFRAMES = new nsHtml5ElementName(nsGkAtoms::noframes,
+                                        nsGkAtoms::noframes,
                                         nsHtml5TreeBuilder::NOFRAMES | SPECIAL);
   ELT_PROGRESS = new nsHtml5ElementName(
-    nsHtml5Atoms::progress, nsHtml5Atoms::progress, nsHtml5TreeBuilder::OTHER);
-  ELT_DT = new nsHtml5ElementName(nsHtml5Atoms::dt,
-                                  nsHtml5Atoms::dt,
+    nsGkAtoms::progress, nsGkAtoms::progress, nsHtml5TreeBuilder::OTHER);
+  ELT_DT = new nsHtml5ElementName(nsGkAtoms::dt,
+                                  nsGkAtoms::dt,
                                   nsHtml5TreeBuilder::DD_OR_DT | SPECIAL |
                                     OPTIONAL_END_TAG);
-  ELT_APPLET = new nsHtml5ElementName(nsHtml5Atoms::applet,
-                                      nsHtml5Atoms::applet,
+  ELT_APPLET = new nsHtml5ElementName(nsGkAtoms::applet,
+                                      nsGkAtoms::applet,
                                       nsHtml5TreeBuilder::MARQUEE_OR_APPLET |
                                         SPECIAL | SCOPING);
   ELT_BASEFONT = new nsHtml5ElementName(
-    nsHtml5Atoms::basefont,
-    nsHtml5Atoms::basefont,
+    nsGkAtoms::basefont,
+    nsGkAtoms::basefont,
     nsHtml5TreeBuilder::LINK_OR_BASEFONT_OR_BGSOUND | SPECIAL);
   ELT_FOREIGNOBJECT = new nsHtml5ElementName(
-    nsHtml5Atoms::foreignobject,
-    nsHtml5Atoms::foreignObject,
+    nsGkAtoms::foreignobject,
+    nsGkAtoms::foreignObject,
     nsHtml5TreeBuilder::FOREIGNOBJECT_OR_DESC | SCOPING_AS_SVG);
-  ELT_FIELDSET = new nsHtml5ElementName(nsHtml5Atoms::fieldset,
-                                        nsHtml5Atoms::fieldset,
+  ELT_FIELDSET = new nsHtml5ElementName(nsGkAtoms::fieldset,
+                                        nsGkAtoms::fieldset,
                                         nsHtml5TreeBuilder::FIELDSET | SPECIAL);
-  ELT_FRAMESET = new nsHtml5ElementName(nsHtml5Atoms::frameset,
-                                        nsHtml5Atoms::frameset,
+  ELT_FRAMESET = new nsHtml5ElementName(nsGkAtoms::frameset,
+                                        nsGkAtoms::frameset,
                                         nsHtml5TreeBuilder::FRAMESET | SPECIAL);
   ELT_FEOFFSET = new nsHtml5ElementName(
-    nsHtml5Atoms::feoffset, nsHtml5Atoms::feOffset, nsHtml5TreeBuilder::OTHER);
-  ELT_FESPOTLIGHT = new nsHtml5ElementName(nsHtml5Atoms::fespotlight,
-                                           nsHtml5Atoms::feSpotLight,
-                                           nsHtml5TreeBuilder::OTHER);
-  ELT_FEPOINTLIGHT = new nsHtml5ElementName(nsHtml5Atoms::fepointlight,
-                                            nsHtml5Atoms::fePointLight,
+    nsGkAtoms::feoffset, nsGkAtoms::feOffset, nsHtml5TreeBuilder::OTHER);
+  ELT_FESPOTLIGHT = new nsHtml5ElementName(
+    nsGkAtoms::fespotlight, nsGkAtoms::feSpotLight, nsHtml5TreeBuilder::OTHER);
+  ELT_FEPOINTLIGHT = new nsHtml5ElementName(nsGkAtoms::fepointlight,
+                                            nsGkAtoms::fePointLight,
                                             nsHtml5TreeBuilder::OTHER);
-  ELT_FEDISTANTLIGHT = new nsHtml5ElementName(nsHtml5Atoms::fedistantlight,
-                                              nsHtml5Atoms::feDistantLight,
+  ELT_FEDISTANTLIGHT = new nsHtml5ElementName(nsGkAtoms::fedistantlight,
+                                              nsGkAtoms::feDistantLight,
                                               nsHtml5TreeBuilder::OTHER);
   ELT_FONT = new nsHtml5ElementName(
-    nsHtml5Atoms::font, nsHtml5Atoms::font, nsHtml5TreeBuilder::FONT);
-  ELT_INPUT = new nsHtml5ElementName(nsHtml5Atoms::input,
-                                     nsHtml5Atoms::input,
-                                     nsHtml5TreeBuilder::INPUT | SPECIAL);
-  ELT_LINEARGRADIENT = new nsHtml5ElementName(nsHtml5Atoms::lineargradient,
-                                              nsHtml5Atoms::linearGradient,
+    nsGkAtoms::font, nsGkAtoms::font, nsHtml5TreeBuilder::FONT);
+  ELT_INPUT = new nsHtml5ElementName(
+    nsGkAtoms::input, nsGkAtoms::input, nsHtml5TreeBuilder::INPUT | SPECIAL);
+  ELT_LINEARGRADIENT = new nsHtml5ElementName(nsGkAtoms::lineargradient,
+                                              nsGkAtoms::linearGradient,
                                               nsHtml5TreeBuilder::OTHER);
-  ELT_MTEXT = new nsHtml5ElementName(nsHtml5Atoms::mtext,
-                                     nsHtml5Atoms::mtext,
+  ELT_MTEXT = new nsHtml5ElementName(nsGkAtoms::mtext_,
+                                     nsGkAtoms::mtext_,
                                      nsHtml5TreeBuilder::MI_MO_MN_MS_MTEXT |
                                        SCOPING_AS_MATHML);
-  ELT_NOSCRIPT = new nsHtml5ElementName(nsHtml5Atoms::noscript,
-                                        nsHtml5Atoms::noscript,
+  ELT_NOSCRIPT = new nsHtml5ElementName(nsGkAtoms::noscript,
+                                        nsGkAtoms::noscript,
                                         nsHtml5TreeBuilder::NOSCRIPT | SPECIAL);
   ELT_RT =
-    new nsHtml5ElementName(nsHtml5Atoms::rt,
-                           nsHtml5Atoms::rt,
+    new nsHtml5ElementName(nsGkAtoms::rt,
+                           nsGkAtoms::rt,
                            nsHtml5TreeBuilder::RT_OR_RP | OPTIONAL_END_TAG);
   ELT_OBJECT =
-    new nsHtml5ElementName(nsHtml5Atoms::object,
-                           nsHtml5Atoms::object,
+    new nsHtml5ElementName(nsGkAtoms::object,
+                           nsGkAtoms::object,
                            nsHtml5TreeBuilder::OBJECT | SPECIAL | SCOPING);
   ELT_OUTPUT = new nsHtml5ElementName(
-    nsHtml5Atoms::output, nsHtml5Atoms::output, nsHtml5TreeBuilder::OUTPUT);
+    nsGkAtoms::output, nsGkAtoms::output, nsHtml5TreeBuilder::OUTPUT);
   ELT_PLAINTEXT =
-    new nsHtml5ElementName(nsHtml5Atoms::plaintext,
-                           nsHtml5Atoms::plaintext,
+    new nsHtml5ElementName(nsGkAtoms::plaintext,
+                           nsGkAtoms::plaintext,
                            nsHtml5TreeBuilder::PLAINTEXT | SPECIAL);
   ELT_TT = new nsHtml5ElementName(
-    nsHtml5Atoms::tt,
-    nsHtml5Atoms::tt,
+    nsGkAtoms::tt,
+    nsGkAtoms::tt,
     nsHtml5TreeBuilder::
       B_OR_BIG_OR_CODE_OR_EM_OR_I_OR_S_OR_SMALL_OR_STRIKE_OR_STRONG_OR_TT_OR_U);
   ELT_RECT = new nsHtml5ElementName(
-    nsHtml5Atoms::rect, nsHtml5Atoms::rect, nsHtml5TreeBuilder::OTHER);
-  ELT_RADIALGRADIENT = new nsHtml5ElementName(nsHtml5Atoms::radialgradient,
-                                              nsHtml5Atoms::radialGradient,
+    nsGkAtoms::rect, nsGkAtoms::rect, nsHtml5TreeBuilder::OTHER);
+  ELT_RADIALGRADIENT = new nsHtml5ElementName(nsGkAtoms::radialgradient,
+                                              nsGkAtoms::radialGradient,
                                               nsHtml5TreeBuilder::OTHER);
-  ELT_SELECT = new nsHtml5ElementName(nsHtml5Atoms::select,
-                                      nsHtml5Atoms::select,
-                                      nsHtml5TreeBuilder::SELECT | SPECIAL);
-  ELT_SCRIPT = new nsHtml5ElementName(nsHtml5Atoms::script,
-                                      nsHtml5Atoms::script,
-                                      nsHtml5TreeBuilder::SCRIPT | SPECIAL);
+  ELT_SELECT = new nsHtml5ElementName(
+    nsGkAtoms::select, nsGkAtoms::select, nsHtml5TreeBuilder::SELECT | SPECIAL);
+  ELT_SCRIPT = new nsHtml5ElementName(
+    nsGkAtoms::script, nsGkAtoms::script, nsHtml5TreeBuilder::SCRIPT | SPECIAL);
   ELT_TFOOT =
-    new nsHtml5ElementName(nsHtml5Atoms::tfoot,
-                           nsHtml5Atoms::tfoot,
+    new nsHtml5ElementName(nsGkAtoms::tfoot,
+                           nsGkAtoms::tfoot,
                            nsHtml5TreeBuilder::TBODY_OR_THEAD_OR_TFOOT |
                              SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG);
   ELT_TEXT = new nsHtml5ElementName(
-    nsHtml5Atoms::text, nsHtml5Atoms::text, nsHtml5TreeBuilder::OTHER);
+    nsGkAtoms::text, nsGkAtoms::text, nsHtml5TreeBuilder::OTHER);
   ELT_MENU = new nsHtml5ElementName(
-    nsHtml5Atoms::menu,
-    nsHtml5Atoms::menu,
+    nsGkAtoms::menu,
+    nsGkAtoms::menu,
     nsHtml5TreeBuilder::DIV_OR_BLOCKQUOTE_OR_CENTER_OR_MENU | SPECIAL);
-  ELT_FEDROPSHADOW = new nsHtml5ElementName(nsHtml5Atoms::fedropshadow,
-                                            nsHtml5Atoms::feDropShadow,
+  ELT_FEDROPSHADOW = new nsHtml5ElementName(nsGkAtoms::fedropshadow,
+                                            nsGkAtoms::feDropShadow,
                                             nsHtml5TreeBuilder::OTHER);
   ELT_VIEW = new nsHtml5ElementName(
-    nsHtml5Atoms::view, nsHtml5Atoms::view, nsHtml5TreeBuilder::OTHER);
-  ELT_FECOLORMATRIX = new nsHtml5ElementName(nsHtml5Atoms::fecolormatrix,
-                                             nsHtml5Atoms::feColorMatrix,
+    nsGkAtoms::view, nsGkAtoms::view, nsHtml5TreeBuilder::OTHER);
+  ELT_FECOLORMATRIX = new nsHtml5ElementName(nsGkAtoms::fecolormatrix,
+                                             nsGkAtoms::feColorMatrix,
                                              nsHtml5TreeBuilder::OTHER);
-  ELT_FECONVOLVEMATRIX = new nsHtml5ElementName(nsHtml5Atoms::feconvolvematrix,
-                                                nsHtml5Atoms::feConvolveMatrix,
+  ELT_FECONVOLVEMATRIX = new nsHtml5ElementName(nsGkAtoms::feconvolvematrix,
+                                                nsGkAtoms::feConvolveMatrix,
                                                 nsHtml5TreeBuilder::OTHER);
-  ELT_BODY = new nsHtml5ElementName(nsHtml5Atoms::body,
-                                    nsHtml5Atoms::body,
+  ELT_BODY = new nsHtml5ElementName(nsGkAtoms::body,
+                                    nsGkAtoms::body,
                                     nsHtml5TreeBuilder::BODY | SPECIAL |
                                       OPTIONAL_END_TAG);
-  ELT_FEMORPHOLOGY = new nsHtml5ElementName(nsHtml5Atoms::femorphology,
-                                            nsHtml5Atoms::feMorphology,
+  ELT_FEMORPHOLOGY = new nsHtml5ElementName(nsGkAtoms::femorphology,
+                                            nsGkAtoms::feMorphology,
                                             nsHtml5TreeBuilder::OTHER);
   ELT_RUBY = new nsHtml5ElementName(
-    nsHtml5Atoms::ruby,
-    nsHtml5Atoms::ruby,
+    nsGkAtoms::ruby,
+    nsGkAtoms::ruby,
     nsHtml5TreeBuilder::RUBY_OR_SPAN_OR_SUB_OR_SUP_OR_VAR);
   ELT_SUMMARY = new nsHtml5ElementName(
-    nsHtml5Atoms::summary,
-    nsHtml5Atoms::summary,
+    nsGkAtoms::summary,
+    nsGkAtoms::summary,
     nsHtml5TreeBuilder::
         ADDRESS_OR_ARTICLE_OR_ASIDE_OR_DETAILS_OR_DIALOG_OR_DIR_OR_FIGCAPTION_OR_FIGURE_OR_FOOTER_OR_HEADER_OR_HGROUP_OR_MAIN_OR_NAV_OR_SECTION_OR_SUMMARY |
       SPECIAL);
   ELT_TBODY =
-    new nsHtml5ElementName(nsHtml5Atoms::tbody,
-                           nsHtml5Atoms::tbody,
+    new nsHtml5ElementName(nsGkAtoms::tbody,
+                           nsGkAtoms::tbody,
                            nsHtml5TreeBuilder::TBODY_OR_THEAD_OR_TFOOT |
                              SPECIAL | FOSTER_PARENTING | OPTIONAL_END_TAG);
   ELEMENT_NAMES = new nsHtml5ElementName*[204];
   ELEMENT_NAMES[0] = ELT_BIG;
   ELEMENT_NAMES[1] = ELT_BDO;
   ELEMENT_NAMES[2] = ELT_COL;
   ELEMENT_NAMES[3] = ELT_DEL;
   ELEMENT_NAMES[4] = ELT_DFN;
--- a/parser/html/nsHtml5ElementName.h
+++ b/parser/html/nsHtml5ElementName.h
@@ -32,17 +32,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 class nsHtml5StreamParser;
 
@@ -109,47 +109,47 @@ public:
       nsHtml5ElementName* elementName =
         nsHtml5ElementName::ELEMENT_NAMES[index];
       nsIAtom* name = elementName->name;
       if (!nsHtml5Portability::localEqualsBuffer(name, buf, offset, length)) {
         return nullptr;
       }
       return elementName;
     }
-  }
+    }
 
-private:
-  inline static uint32_t bufToHash(char16_t* buf, int32_t length)
-  {
-    uint32_t len = length;
-    uint32_t first = buf[0];
-    first <<= 19;
-    uint32_t second = 1 << 23;
-    uint32_t third = 0;
-    uint32_t fourth = 0;
-    uint32_t fifth = 0;
-    if (length >= 4) {
-      second = buf[length - 4];
-      second <<= 4;
-      third = buf[length - 3];
-      third <<= 9;
-      fourth = buf[length - 2];
-      fourth <<= 14;
-      fifth = buf[length - 1];
-      fifth <<= 24;
-    } else if (length == 3) {
-      second = buf[1];
-      second <<= 4;
-      third = buf[2];
-      third <<= 9;
-    } else if (length == 2) {
-      second = buf[1];
-      second <<= 24;
-    }
-    return len + first + second + third + fourth + fifth;
+  private:
+    inline static uint32_t bufToHash(char16_t* buf, int32_t length)
+    {
+      uint32_t len = length;
+      uint32_t first = buf[0];
+      first <<= 19;
+      uint32_t second = 1 << 23;
+      uint32_t third = 0;
+      uint32_t fourth = 0;
+      uint32_t fifth = 0;
+      if (length >= 4) {
+        second = buf[length - 4];
+        second <<= 4;
+        third = buf[length - 3];
+        third <<= 9;
+        fourth = buf[length - 2];
+        fourth <<= 14;
+        fifth = buf[length - 1];
+        fifth <<= 24;
+      } else if (length == 3) {
+        second = buf[1];
+        second <<= 4;
+        third = buf[2];
+        third <<= 9;
+      } else if (length == 2) {
+        second = buf[1];
+        second <<= 24;
+      }
+      return len + first + second + third + fourth + fifth;
     }
 
     nsHtml5ElementName(nsIAtom* name, nsIAtom* camelCaseName, int32_t flags);
   public:
     nsHtml5ElementName();
     ~nsHtml5ElementName();
     inline void setNameForNonInterned(nsIAtom* name)
     {
--- a/parser/html/nsHtml5Highlighter.cpp
+++ b/parser/html/nsHtml5Highlighter.cpp
@@ -43,30 +43,31 @@ char16_t nsHtml5Highlighter::sAttributeV
 
 char16_t nsHtml5Highlighter::sDoctype[] =
   { 'd', 'o', 'c', 't', 'y', 'p', 'e', 0 };
 
 char16_t nsHtml5Highlighter::sPi[] =
   { 'p', 'i', 0 };
 
 nsHtml5Highlighter::nsHtml5Highlighter(nsAHtml5TreeOpSink* aOpSink)
- : mState(nsHtml5Tokenizer::DATA)
- , mCStart(INT32_MAX)
- , mPos(0)
- , mLineNumber(1)
- , mInlinesOpen(0)
- , mInCharacters(false)
- , mBuffer(nullptr)
- , mOpSink(aOpSink)
- , mCurrentRun(nullptr)
- , mAmpersand(nullptr)
- , mSlash(nullptr)
- , mHandles(MakeUnique<nsIContent*[]>(NS_HTML5_HIGHLIGHTER_HANDLE_ARRAY_LENGTH))
- , mHandlesUsed(0)
- , mSeenBase(false)
+  : mState(nsHtml5Tokenizer::DATA)
+  , mCStart(INT32_MAX)
+  , mPos(0)
+  , mLineNumber(1)
+  , mInlinesOpen(0)
+  , mInCharacters(false)
+  , mBuffer(nullptr)
+  , mOpSink(aOpSink)
+  , mCurrentRun(nullptr)
+  , mAmpersand(nullptr)
+  , mSlash(nullptr)
+  , mHandles(
+      MakeUnique<nsIContent* []>(NS_HTML5_HIGHLIGHTER_HANDLE_ARRAY_LENGTH))
+  , mHandlesUsed(0)
+  , mSeenBase(false)
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 }
 
 nsHtml5Highlighter::~nsHtml5Highlighter()
 {
   NS_ASSERTION(NS_IsMainThread(), "Wrong thread!");
 }
@@ -74,17 +75,17 @@ nsHtml5Highlighter::~nsHtml5Highlighter(
 void
 nsHtml5Highlighter::Start(const nsAutoString& aTitle)
 {
   // Doctype
   mOpQueue.AppendElement()->Init(nsGkAtoms::html, EmptyString(), EmptyString());
 
   mOpQueue.AppendElement()->Init(STANDARDS_MODE);
 
-  nsIContent** root = CreateElement(nsHtml5Atoms::html, nullptr, nullptr);
+  nsIContent** root = CreateElement(nsGkAtoms::html, nullptr, nullptr);
   mOpQueue.AppendElement()->Init(eTreeOpAppendToDocument, root);
   mStack.AppendElement(root);
 
   Push(nsGkAtoms::head, nullptr);
 
   Push(nsGkAtoms::title, nullptr);
   // XUL will add the "Source of: " prefix.
   uint32_t length = aTitle.Length();
@@ -285,18 +286,18 @@ nsHtml5Highlighter::Transition(int32_t a
     case nsHtml5Tokenizer::COMMENT_START_DASH:
     case nsHtml5Tokenizer::BOGUS_COMMENT:
     case nsHtml5Tokenizer::BOGUS_COMMENT_HYPHEN:
       if (aState == nsHtml5Tokenizer::DATA) {
         AddClass(sComment);
         FinishTag();
       }
       break;
-      // most cdata states are omitted, because they don't matter to
-      // highlighting
+    // most cdata states are omitted, because they don't matter to
+    // highlighting
     case nsHtml5Tokenizer::CDATA_RSQB_RSQB:
       if (aState == nsHtml5Tokenizer::DATA) {
         AddClass(sCdata);
         FinishTag();
       }
       break;
     case nsHtml5Tokenizer::CONSUME_CHARACTER_REFERENCE:
       EndSpanOrA(); // the span for the ampersand
@@ -387,19 +388,19 @@ nsHtml5Highlighter::Transition(int32_t a
       break;
     case nsHtml5Tokenizer::SCRIPT_DATA_ESCAPED_DASH_DASH:
     case nsHtml5Tokenizer::SCRIPT_DATA_ESCAPED:
     case nsHtml5Tokenizer::SCRIPT_DATA_ESCAPED_DASH:
       if (aState == nsHtml5Tokenizer::SCRIPT_DATA_ESCAPED_LESS_THAN_SIGN) {
         EndCharactersAndStartMarkupRun();
       }
       break;
-      // Lots of double escape states omitted, because they don't highlight.
-      // Likewise, only doctype states that can emit the doctype are of
-      // interest. Otherwise, the transition out of bogus comment deals.
+    // Lots of double escape states omitted, because they don't highlight.
+    // Likewise, only doctype states that can emit the doctype are of
+    // interest. Otherwise, the transition out of bogus comment deals.
     case nsHtml5Tokenizer::BEFORE_DOCTYPE_NAME:
     case nsHtml5Tokenizer::DOCTYPE_NAME:
     case nsHtml5Tokenizer::AFTER_DOCTYPE_NAME:
     case nsHtml5Tokenizer::AFTER_DOCTYPE_PUBLIC_KEYWORD:
     case nsHtml5Tokenizer::BEFORE_DOCTYPE_PUBLIC_IDENTIFIER:
     case nsHtml5Tokenizer::DOCTYPE_PUBLIC_IDENTIFIER_DOUBLE_QUOTED:
     case nsHtml5Tokenizer::AFTER_DOCTYPE_PUBLIC_IDENTIFIER:
     case nsHtml5Tokenizer::BETWEEN_DOCTYPE_PUBLIC_AND_SYSTEM_IDENTIFIERS:
--- a/parser/html/nsHtml5HtmlAttributes.cpp
+++ b/parser/html/nsHtml5HtmlAttributes.cpp
@@ -27,17 +27,16 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 
 #include "nsHtml5Tokenizer.h"
 #include "nsHtml5TreeBuilder.h"
 #include "nsHtml5MetaScanner.h"
--- a/parser/html/nsHtml5HtmlAttributes.h
+++ b/parser/html/nsHtml5HtmlAttributes.h
@@ -28,17 +28,16 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsTArray.h"
 #include "nsHtml5AttributeEntry.h"
 
 class nsHtml5StreamParser;
--- a/parser/html/nsHtml5MetaScanner.cpp
+++ b/parser/html/nsHtml5MetaScanner.cpp
@@ -32,17 +32,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 #include "nsHtml5AttributeName.h"
 #include "nsHtml5ElementName.h"
--- a/parser/html/nsHtml5MetaScanner.h
+++ b/parser/html/nsHtml5MetaScanner.h
@@ -33,17 +33,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 class nsHtml5StreamParser;
 
--- a/parser/html/nsHtml5Portability.h
+++ b/parser/html/nsHtml5Portability.h
@@ -32,17 +32,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 
 class nsHtml5StreamParser;
 
 class nsHtml5AttributeName;
--- a/parser/html/nsHtml5StackNode.cpp
+++ b/parser/html/nsHtml5StackNode.cpp
@@ -32,17 +32,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 #include "nsHtml5AttributeName.h"
 #include "nsHtml5ElementName.h"
--- a/parser/html/nsHtml5StackNode.h
+++ b/parser/html/nsHtml5StackNode.h
@@ -33,17 +33,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 class nsHtml5StreamParser;
 
--- a/parser/html/nsHtml5StateSnapshot.cpp
+++ b/parser/html/nsHtml5StateSnapshot.cpp
@@ -31,17 +31,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 #include "nsHtml5AttributeName.h"
 #include "nsHtml5ElementName.h"
--- a/parser/html/nsHtml5StateSnapshot.h
+++ b/parser/html/nsHtml5StateSnapshot.h
@@ -32,17 +32,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 class nsHtml5StreamParser;
 
--- a/parser/html/nsHtml5Tokenizer.cpp
+++ b/parser/html/nsHtml5Tokenizer.cpp
@@ -35,17 +35,17 @@
 #include "nsHtml5String.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5DocumentMode.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsHtml5NamedCharacters.h"
 #include "nsHtml5NamedCharactersAccel.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsAHtml5TreeBuilderState.h"
 #include "nsHtml5Macros.h"
 #include "nsHtml5Highlighter.h"
 #include "nsHtml5TokenizerLoopPolicies.h"
 
 #include "nsHtml5AttributeName.h"
 #include "nsHtml5ElementName.h"
 #include "nsHtml5TreeBuilder.h"
@@ -4037,17 +4037,17 @@ nsHtml5Tokenizer::stateLoop(int32_t stat
   returnStateSave = returnState;
   return pos;
 }
 
 void 
 nsHtml5Tokenizer::initDoctypeFields()
 {
   clearStrBufAfterUse();
-  doctypeName = nsHtml5Atoms::emptystring;
+  doctypeName = nsGkAtoms::_empty;
   if (systemIdentifier) {
     systemIdentifier.Release();
     systemIdentifier = nullptr;
   }
   if (publicIdentifier) {
     publicIdentifier.Release();
     publicIdentifier = nullptr;
   }
@@ -4203,17 +4203,17 @@ nsHtml5Tokenizer::eof()
         NS_HTML5_BREAK(eofloop);
       }
       case MARKUP_DECLARATION_OCTYPE: {
         if (index < 6) {
           errBogusComment();
           emitComment(0, 0);
         } else {
           errEofInDoctype();
-          doctypeName = nsHtml5Atoms::emptystring;
+          doctypeName = nsGkAtoms::_empty;
           if (systemIdentifier) {
             systemIdentifier.Release();
             systemIdentifier = nullptr;
           }
           if (publicIdentifier) {
             publicIdentifier.Release();
             publicIdentifier = nullptr;
           }
--- a/parser/html/nsHtml5Tokenizer.h
+++ b/parser/html/nsHtml5Tokenizer.h
@@ -36,17 +36,17 @@
 #include "nsHtml5String.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5DocumentMode.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsHtml5NamedCharacters.h"
 #include "nsHtml5NamedCharactersAccel.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsAHtml5TreeBuilderState.h"
 #include "nsHtml5Macros.h"
 #include "nsHtml5Highlighter.h"
 #include "nsHtml5TokenizerLoopPolicies.h"
 
 class nsHtml5StreamParser;
 
 class nsHtml5AttributeName;
--- a/parser/html/nsHtml5TreeBuilder.cpp
+++ b/parser/html/nsHtml5TreeBuilder.cpp
@@ -37,17 +37,17 @@
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5DocumentMode.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsHtml5Parser.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsHtml5StateSnapshot.h"
 #include "nsHtml5StackNode.h"
 #include "nsHtml5TreeOpExecutor.h"
 #include "nsHtml5StreamParser.h"
 #include "nsAHtml5TreeBuilderState.h"
 #include "nsHtml5Highlighter.h"
 #include "nsHtml5PlainTextUtils.h"
@@ -93,89 +93,104 @@ nsHtml5TreeBuilder::startTokenization(ns
     nsIContentHandle* elt;
     if (contextNode) {
       elt = contextNode;
     } else {
       elt = createHtmlElementSetAsRoot(tokenizer->emptyAttributes());
     }
     if (contextNamespace == kNameSpaceID_SVG) {
       nsHtml5ElementName* elementName = nsHtml5ElementName::ELT_SVG;
-      if (nsHtml5Atoms::title == contextName || nsHtml5Atoms::desc == contextName || nsHtml5Atoms::foreignObject == contextName) {
+      if (nsGkAtoms::title == contextName || nsGkAtoms::desc == contextName ||
+          nsGkAtoms::foreignObject == contextName) {
         elementName = nsHtml5ElementName::ELT_FOREIGNOBJECT;
       }
       nsHtml5StackNode* node =
         new nsHtml5StackNode(elementName, elementName->getCamelCaseName(), elt);
       currentPtr++;
       stack[currentPtr] = node;
       tokenizer->setStateAndEndTagExpectation(nsHtml5Tokenizer::DATA,
                                               contextName);
       mode = FRAMESET_OK;
     } else if (contextNamespace == kNameSpaceID_MathML) {
       nsHtml5ElementName* elementName = nsHtml5ElementName::ELT_MATH;
-      if (nsHtml5Atoms::mi == contextName || nsHtml5Atoms::mo == contextName || nsHtml5Atoms::mn == contextName || nsHtml5Atoms::ms == contextName || nsHtml5Atoms::mtext == contextName) {
+      if (nsGkAtoms::mi_ == contextName || nsGkAtoms::mo_ == contextName ||
+          nsGkAtoms::mn_ == contextName || nsGkAtoms::ms_ == contextName ||
+          nsGkAtoms::mtext_ == contextName) {
         elementName = nsHtml5ElementName::ELT_MTEXT;
-      } else if (nsHtml5Atoms::annotation_xml == contextName) {
+      } else if (nsGkAtoms::annotation_xml_ == contextName) {
         elementName = nsHtml5ElementName::ELT_ANNOTATION_XML;
       }
       nsHtml5StackNode* node =
         new nsHtml5StackNode(elementName, elt, elementName->getName(), false);
       currentPtr++;
       stack[currentPtr] = node;
       tokenizer->setStateAndEndTagExpectation(nsHtml5Tokenizer::DATA,
                                               contextName);
       mode = FRAMESET_OK;
     } else {
       nsHtml5StackNode* node = new nsHtml5StackNode(nsHtml5ElementName::ELT_HTML, elt);
       currentPtr++;
       stack[currentPtr] = node;
-      if (nsHtml5Atoms::template_ == contextName) {
+      if (nsGkAtoms::_template == contextName) {
         pushTemplateMode(IN_TEMPLATE);
       }
       resetTheInsertionMode();
       formPointer = getFormPointerForContext(contextNode);
-      if (nsHtml5Atoms::title == contextName || nsHtml5Atoms::textarea == contextName) {
+      if (nsGkAtoms::title == contextName ||
+          nsGkAtoms::textarea == contextName) {
         tokenizer->setStateAndEndTagExpectation(nsHtml5Tokenizer::RCDATA,
                                                 contextName);
-      } else if (nsHtml5Atoms::style == contextName || nsHtml5Atoms::xmp == contextName || nsHtml5Atoms::iframe == contextName || nsHtml5Atoms::noembed == contextName || nsHtml5Atoms::noframes == contextName || (scriptingEnabled && nsHtml5Atoms::noscript == contextName)) {
+      } else if (nsGkAtoms::style == contextName ||
+                 nsGkAtoms::xmp == contextName ||
+                 nsGkAtoms::iframe == contextName ||
+                 nsGkAtoms::noembed == contextName ||
+                 nsGkAtoms::noframes == contextName ||
+                 (scriptingEnabled && nsGkAtoms::noscript == contextName)) {
         tokenizer->setStateAndEndTagExpectation(nsHtml5Tokenizer::RAWTEXT,
                                                 contextName);
-      } else if (nsHtml5Atoms::plaintext == contextName) {
+      } else if (nsGkAtoms::plaintext == contextName) {
         tokenizer->setStateAndEndTagExpectation(nsHtml5Tokenizer::PLAINTEXT,
                                                 contextName);
-      } else if (nsHtml5Atoms::script == contextName) {
+      } else if (nsGkAtoms::script == contextName) {
         tokenizer->setStateAndEndTagExpectation(nsHtml5Tokenizer::SCRIPT_DATA,
                                                 contextName);
       } else {
         tokenizer->setStateAndEndTagExpectation(nsHtml5Tokenizer::DATA,
                                                 contextName);
       }
     }
     contextName = nullptr;
     contextNode = nullptr;
   } else {
     mode = INITIAL;
     if (tokenizer->isViewingXmlSource()) {
-      nsIContentHandle* elt = createElement(kNameSpaceID_SVG, nsHtml5Atoms::svg, tokenizer->emptyAttributes(), nullptr);
-      nsHtml5StackNode* node = new nsHtml5StackNode(nsHtml5ElementName::ELT_SVG, nsHtml5Atoms::svg, elt);
+      nsIContentHandle* elt = createElement(kNameSpaceID_SVG,
+                                            nsGkAtoms::svg,
+                                            tokenizer->emptyAttributes(),
+                                            nullptr);
+      nsHtml5StackNode* node =
+        new nsHtml5StackNode(nsHtml5ElementName::ELT_SVG, nsGkAtoms::svg, elt);
       currentPtr++;
       stack[currentPtr] = node;
     }
   }
 }
 
 void
 nsHtml5TreeBuilder::doctype(nsIAtom* name,
                             nsHtml5String publicIdentifier,
                             nsHtml5String systemIdentifier,
                             bool forceQuirks)
 {
   needToDropLF = false;
   if (!isInForeign() && mode == INITIAL) {
     nsHtml5String emptyString = nsHtml5Portability::newEmptyString();
-    appendDoctypeToDocument(!name ? nsHtml5Atoms::emptystring : name, !publicIdentifier ? emptyString : publicIdentifier, !systemIdentifier ? emptyString : systemIdentifier);
+    appendDoctypeToDocument(!name ? nsGkAtoms::_empty : name,
+                            !publicIdentifier ? emptyString : publicIdentifier,
+                            !systemIdentifier ? emptyString : systemIdentifier);
     emptyString.Release();
     if (isQuirky(name, publicIdentifier, systemIdentifier, forceQuirks)) {
       errQuirkyDoctype();
       documentModeInternal(QUIRKS_MODE, publicIdentifier, systemIdentifier, false);
     } else if (isAlmostStandards(publicIdentifier, systemIdentifier)) {
       errAlmostStandardsDoctype();
       documentModeInternal(ALMOST_STANDARDS_MODE, publicIdentifier, systemIdentifier, false);
     } else {
@@ -534,23 +549,23 @@ nsHtml5TreeBuilder::eof()
       case IN_CAPTION:
       case IN_CELL:
       case IN_BODY: {
         if (isTemplateModeStackEmpty()) {
           NS_HTML5_BREAK(eofloop);
         }
       }
       case IN_TEMPLATE: {
-        int32_t eltPos = findLast(nsHtml5Atoms::template_);
+        int32_t eltPos = findLast(nsGkAtoms::_template);
         if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
           MOZ_ASSERT(fragment);
           NS_HTML5_BREAK(eofloop);
         }
         if (MOZ_UNLIKELY(mViewSource)) {
-          errUnclosedElements(eltPos, nsHtml5Atoms::template_);
+          errUnclosedElements(eltPos, nsGkAtoms::_template);
         }
         while (currentPtr >= eltPos) {
           pop();
         }
         clearTheListOfActiveFormattingElementsUpToTheLastMarker();
         popTemplateMode();
         resetTheInsertionMode();
         continue;
@@ -869,17 +884,17 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
             case TABLE: {
               errTableSeenWhileTableOpen();
               eltPos = findLastInTableScope(name);
               if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
                 MOZ_ASSERT(fragment || isTemplateContents());
                 NS_HTML5_BREAK(starttagloop);
               }
               generateImpliedEndTags();
-              if (!!MOZ_UNLIKELY(mViewSource) && !isCurrent(nsHtml5Atoms::table)) {
+              if (!!MOZ_UNLIKELY(mViewSource) && !isCurrent(nsGkAtoms::table)) {
                 errNoCheckUnclosedElementsOnStack();
               }
               while (currentPtr >= eltPos) {
                 pop();
               }
               resetTheInsertionMode();
               NS_HTML5_CONTINUE(starttagloop);
             }
@@ -934,17 +949,17 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
         switch(group) {
           case CAPTION:
           case COL:
           case COLGROUP:
           case TBODY_OR_THEAD_OR_TFOOT:
           case TR:
           case TD_OR_TH: {
             errStrayStartTag(name);
-            eltPos = findLastInTableScope(nsHtml5Atoms::caption);
+            eltPos = findLastInTableScope(nsGkAtoms::caption);
             if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
               NS_HTML5_BREAK(starttagloop);
             }
             generateImpliedEndTags();
             if (!!MOZ_UNLIKELY(mViewSource) && currentPtr != eltPos) {
               errNoCheckUnclosedElementsOnStack();
             }
             while (currentPtr >= eltPos) {
@@ -1125,17 +1140,21 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
                   generateImpliedEndTagsExceptFor(node->name);
                   if (!!MOZ_UNLIKELY(mViewSource) && eltPos != currentPtr) {
                     errUnclosedElementsImplied(eltPos, name);
                   }
                   while (currentPtr >= eltPos) {
                     pop();
                   }
                   break;
-                } else if (!eltPos || (node->isSpecial() && (node->ns != kNameSpaceID_XHTML || (node->name != nsHtml5Atoms::p && node->name != nsHtml5Atoms::address && node->name != nsHtml5Atoms::div)))) {
+                } else if (!eltPos || (node->isSpecial() &&
+                                       (node->ns != kNameSpaceID_XHTML ||
+                                        (node->name != nsGkAtoms::p &&
+                                         node->name != nsGkAtoms::address &&
+                                         node->name != nsGkAtoms::div)))) {
                   break;
                 }
                 eltPos--;
               }
               implicitlyCloseP();
               appendToCurrentNodeAndPushElementMayFoster(elementName, attributes);
               attributes = nullptr;
               NS_HTML5_BREAK(starttagloop);
@@ -1144,22 +1163,24 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
               implicitlyCloseP();
               appendToCurrentNodeAndPushElementMayFoster(elementName, attributes);
               tokenizer->setStateAndEndTagExpectation(
                 nsHtml5Tokenizer::PLAINTEXT, elementName);
               attributes = nullptr;
               NS_HTML5_BREAK(starttagloop);
             }
             case A: {
-              int32_t activeAPos = findInListOfActiveFormattingElementsContainsBetweenEndAndLastMarker(nsHtml5Atoms::a);
+              int32_t activeAPos =
+                findInListOfActiveFormattingElementsContainsBetweenEndAndLastMarker(
+                  nsGkAtoms::a);
               if (activeAPos != -1) {
                 errFooSeenWhenFooOpen(name);
                 nsHtml5StackNode* activeA = listOfActiveFormattingElements[activeAPos];
                 activeA->retain();
-                adoptionAgencyEndTag(nsHtml5Atoms::a);
+                adoptionAgencyEndTag(nsGkAtoms::a);
                 removeFromStack(activeA);
                 activeAPos = findInListOfActiveFormattingElements(activeA);
                 if (activeAPos != -1) {
                   removeFromListOfActiveFormattingElements(activeAPos);
                 }
                 activeA->release();
               }
               reconstructTheActiveFormattingElements();
@@ -1174,19 +1195,19 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
                 elementName->getName(), attributes);
               appendToCurrentNodeAndPushFormattingElementMayFoster(elementName, attributes);
               attributes = nullptr;
               NS_HTML5_BREAK(starttagloop);
             }
             case NOBR: {
               reconstructTheActiveFormattingElements();
               if (nsHtml5TreeBuilder::NOT_FOUND_ON_STACK !=
-                  findLastInScope(nsHtml5Atoms::nobr)) {
+                  findLastInScope(nsGkAtoms::nobr)) {
                 errFooSeenWhenFooOpen(name);
-                adoptionAgencyEndTag(nsHtml5Atoms::nobr);
+                adoptionAgencyEndTag(nsGkAtoms::nobr);
                 reconstructTheActiveFormattingElements();
               }
               appendToCurrentNodeAndPushFormattingElementMayFoster(elementName, attributes);
               attributes = nullptr;
               NS_HTML5_BREAK(starttagloop);
             }
             case BUTTON: {
               eltPos = findLastInScope(name);
@@ -1286,28 +1307,29 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
               } else {
                 appendIsindexPrompt(stack[currentPtr]->node);
               }
               nsHtml5HtmlAttributes* inputAttributes = new nsHtml5HtmlAttributes(0);
               inputAttributes->addAttribute(nsHtml5AttributeName::ATTR_NAME, nsHtml5Portability::newStringFromLiteral("isindex"), tokenizer->getLineNumber());
               for (int32_t i = 0; i < attributes->getLength(); i++) {
                 nsIAtom* attributeQName =
                   attributes->getLocalNameNoBoundsCheck(i);
-                if (nsHtml5Atoms::name == attributeQName ||
-                    nsHtml5Atoms::prompt == attributeQName) {
+                if (nsGkAtoms::name == attributeQName ||
+                    nsGkAtoms::prompt == attributeQName) {
                   attributes->releaseValue(i);
-                } else if (nsHtml5Atoms::action != attributeQName) {
+                } else if (nsGkAtoms::action != attributeQName) {
                   inputAttributes->AddAttributeWithLocal(
                     attributeQName,
                     attributes->getValueNoBoundsCheck(i),
                     attributes->getLineNoBoundsCheck(i));
                 }
               }
               attributes->clearWithoutReleasingContents();
-              appendVoidElementToCurrentMayFoster(nsHtml5Atoms::input, inputAttributes, formPointer);
+              appendVoidElementToCurrentMayFoster(
+                nsGkAtoms::input, inputAttributes, formPointer);
               pop();
               appendVoidElementToCurrentMayFoster(nsHtml5ElementName::ELT_HR, nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES);
               pop();
               if (!isTemplateContents()) {
                 formPointer = nullptr;
               }
               selfClosing = false;
               NS_HTML5_BREAK(starttagloop);
@@ -1367,47 +1389,47 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
                   break;
                 }
               }
               attributes = nullptr;
               NS_HTML5_BREAK(starttagloop);
             }
             case OPTGROUP:
             case OPTION: {
-              if (isCurrent(nsHtml5Atoms::option)) {
+              if (isCurrent(nsGkAtoms::option)) {
                 pop();
               }
               reconstructTheActiveFormattingElements();
               appendToCurrentNodeAndPushElementMayFoster(elementName, attributes);
               attributes = nullptr;
               NS_HTML5_BREAK(starttagloop);
             }
             case RB_OR_RTC: {
-              eltPos = findLastInScope(nsHtml5Atoms::ruby);
+              eltPos = findLastInScope(nsGkAtoms::ruby);
               if (eltPos != NOT_FOUND_ON_STACK) {
                 generateImpliedEndTags();
               }
               if (eltPos != currentPtr) {
                 if (eltPos == NOT_FOUND_ON_STACK) {
                   errStartTagSeenWithoutRuby(name);
                 } else {
                   errUnclosedChildrenInRuby();
                 }
               }
               appendToCurrentNodeAndPushElementMayFoster(elementName, attributes);
               attributes = nullptr;
               NS_HTML5_BREAK(starttagloop);
             }
             case RT_OR_RP: {
-              eltPos = findLastInScope(nsHtml5Atoms::ruby);
+              eltPos = findLastInScope(nsGkAtoms::ruby);
               if (eltPos != NOT_FOUND_ON_STACK) {
-                generateImpliedEndTagsExceptFor(nsHtml5Atoms::rtc);
+                generateImpliedEndTagsExceptFor(nsGkAtoms::rtc);
               }
               if (eltPos != currentPtr) {
-                if (!isCurrent(nsHtml5Atoms::rtc)) {
+                if (!isCurrent(nsGkAtoms::rtc)) {
                   if (eltPos == NOT_FOUND_ON_STACK) {
                     errStartTagSeenWithoutRuby(name);
                   } else {
                     errUnclosedChildrenInRuby();
                   }
                 }
               }
               appendToCurrentNodeAndPushElementMayFoster(elementName, attributes);
@@ -1620,17 +1642,17 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
       case IN_SELECT_IN_TABLE: {
         switch(group) {
           case CAPTION:
           case TBODY_OR_THEAD_OR_TFOOT:
           case TR:
           case TD_OR_TH:
           case TABLE: {
             errStartTagWithSelectOpen(name);
-            eltPos = findLastInTableScope(nsHtml5Atoms::select);
+            eltPos = findLastInTableScope(nsGkAtoms::select);
             if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
               MOZ_ASSERT(fragment);
               NS_HTML5_BREAK(starttagloop);
             }
             while (currentPtr >= eltPos) {
               pop();
             }
             resetTheInsertionMode();
@@ -1646,28 +1668,28 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
             errStrayStartTag(name);
             if (!fragment) {
               addAttributesToHtml(attributes);
               attributes = nullptr;
             }
             NS_HTML5_BREAK(starttagloop);
           }
           case OPTION: {
-            if (isCurrent(nsHtml5Atoms::option)) {
+            if (isCurrent(nsGkAtoms::option)) {
               pop();
             }
             appendToCurrentNodeAndPushElement(elementName, attributes);
             attributes = nullptr;
             NS_HTML5_BREAK(starttagloop);
           }
           case OPTGROUP: {
-            if (isCurrent(nsHtml5Atoms::option)) {
+            if (isCurrent(nsGkAtoms::option)) {
               pop();
             }
-            if (isCurrent(nsHtml5Atoms::optgroup)) {
+            if (isCurrent(nsGkAtoms::optgroup)) {
               pop();
             }
             appendToCurrentNodeAndPushElement(elementName, attributes);
             attributes = nullptr;
             NS_HTML5_BREAK(starttagloop);
           }
           case SELECT: {
             errStartSelectWhereEndSelectExpected();
@@ -1683,17 +1705,17 @@ nsHtml5TreeBuilder::startTag(nsHtml5Elem
               resetTheInsertionMode();
               NS_HTML5_BREAK(starttagloop);
             }
           }
           case INPUT:
           case TEXTAREA:
           case KEYGEN: {
             errStartTagWithSelectOpen(name);
-            eltPos = findLastInTableScope(nsHtml5Atoms::select);
+            eltPos = findLastInTableScope(nsGkAtoms::select);
             if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
               MOZ_ASSERT(fragment);
               NS_HTML5_BREAK(starttagloop);
             }
             while (currentPtr >= eltPos) {
               pop();
             }
             resetTheInsertionMode();
@@ -2017,17 +2039,17 @@ nsHtml5TreeBuilder::startTagTemplateInHe
   mode = IN_TEMPLATE;
   pushTemplateMode(IN_TEMPLATE);
 }
 
 bool 
 nsHtml5TreeBuilder::isTemplateContents()
 {
   return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK !=
-         findLast(nsHtml5Atoms::template_);
+         findLast(nsGkAtoms::_template);
 }
 
 bool 
 nsHtml5TreeBuilder::isTemplateModeStackEmpty()
 {
   return templateModePtr == -1;
 }
 
@@ -2405,17 +2427,17 @@ nsHtml5TreeBuilder::endTag(nsHtml5Elemen
           }
           default:
             ; // fall through
         }
       }
       case IN_TABLE: {
         switch(group) {
           case TABLE: {
-            eltPos = findLast(nsHtml5Atoms::table);
+            eltPos = findLast(nsGkAtoms::table);
             if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
               MOZ_ASSERT(fragment || isTemplateContents());
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
             while (currentPtr >= eltPos) {
               pop();
             }
@@ -2439,34 +2461,34 @@ nsHtml5TreeBuilder::endTag(nsHtml5Elemen
           default: {
             errStrayEndTag(name);
           }
         }
       }
       case IN_CAPTION: {
         switch(group) {
           case CAPTION: {
-            eltPos = findLastInTableScope(nsHtml5Atoms::caption);
+            eltPos = findLastInTableScope(nsGkAtoms::caption);
             if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
               NS_HTML5_BREAK(endtagloop);
             }
             generateImpliedEndTags();
             if (!!MOZ_UNLIKELY(mViewSource) && currentPtr != eltPos) {
               errUnclosedElements(eltPos, name);
             }
             while (currentPtr >= eltPos) {
               pop();
             }
             clearTheListOfActiveFormattingElementsUpToTheLastMarker();
             mode = IN_TABLE;
             NS_HTML5_BREAK(endtagloop);
           }
           case TABLE: {
             errTableClosedWhileCaptionOpen();
-            eltPos = findLastInTableScope(nsHtml5Atoms::caption);
+            eltPos = findLastInTableScope(nsGkAtoms::caption);
             if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
               NS_HTML5_BREAK(endtagloop);
             }
             generateImpliedEndTags();
             if (!!MOZ_UNLIKELY(mViewSource) && currentPtr != eltPos) {
               errUnclosedElements(eltPos, name);
             }
             while (currentPtr >= eltPos) {
@@ -2509,17 +2531,19 @@ nsHtml5TreeBuilder::endTag(nsHtml5Elemen
             mode = IN_ROW;
             NS_HTML5_BREAK(endtagloop);
           }
           case TABLE:
           case TBODY_OR_THEAD_OR_TFOOT:
           case TR: {
             if (findLastInTableScope(name) ==
                 nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
-              MOZ_ASSERT(name == nsHtml5Atoms::tbody || name == nsHtml5Atoms::tfoot || name == nsHtml5Atoms::thead || fragment || isTemplateContents());
+              MOZ_ASSERT(name == nsGkAtoms::tbody || name == nsGkAtoms::tfoot ||
+                         name == nsGkAtoms::thead || fragment ||
+                         isTemplateContents());
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
             closeTheCell(findLastInTableScopeTdTh());
             continue;
           }
           case BODY:
           case CAPTION:
@@ -2649,29 +2673,29 @@ nsHtml5TreeBuilder::endTag(nsHtml5Elemen
               }
               while (currentPtr >= eltPos) {
                 pop();
               }
               NS_HTML5_BREAK(endtagloop);
             }
           }
           case P: {
-            eltPos = findLastInButtonScope(nsHtml5Atoms::p);
+            eltPos = findLastInButtonScope(nsGkAtoms::p);
             if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
-              errNoElementToCloseButEndTagSeen(nsHtml5Atoms::p);
+              errNoElementToCloseButEndTagSeen(nsGkAtoms::p);
               if (isInForeign()) {
                 errHtmlStartTagInForeignContext(name);
                 while (currentPtr >= 0 && stack[currentPtr]->ns != kNameSpaceID_XHTML) {
                   pop();
                 }
               }
               appendVoidElementToCurrentMayFoster(elementName, nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES);
               NS_HTML5_BREAK(endtagloop);
             }
-            generateImpliedEndTagsExceptFor(nsHtml5Atoms::p);
+            generateImpliedEndTagsExceptFor(nsGkAtoms::p);
             MOZ_ASSERT(eltPos != nsHtml5TreeBuilder::NOT_FOUND_ON_STACK);
             if (!!MOZ_UNLIKELY(mViewSource) && eltPos != currentPtr) {
               errUnclosedElements(eltPos, name);
             }
             while (currentPtr >= eltPos) {
               pop();
             }
             NS_HTML5_BREAK(endtagloop);
@@ -2897,17 +2921,17 @@ nsHtml5TreeBuilder::endTag(nsHtml5Elemen
           case CAPTION:
           case TABLE:
           case TBODY_OR_THEAD_OR_TFOOT:
           case TR:
           case TD_OR_TH: {
             errEndTagSeenWithSelectOpen(name);
             if (findLastInTableScope(name) !=
                 nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
-              eltPos = findLastInTableScope(nsHtml5Atoms::select);
+              eltPos = findLastInTableScope(nsGkAtoms::select);
               if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
                 MOZ_ASSERT(fragment);
                 NS_HTML5_BREAK(endtagloop);
               }
               while (currentPtr >= eltPos) {
                 pop();
               }
               resetTheInsertionMode();
@@ -2918,37 +2942,38 @@ nsHtml5TreeBuilder::endTag(nsHtml5Elemen
           }
           default:
             ; // fall through
         }
       }
       case IN_SELECT: {
         switch(group) {
           case OPTION: {
-            if (isCurrent(nsHtml5Atoms::option)) {
+            if (isCurrent(nsGkAtoms::option)) {
               pop();
               NS_HTML5_BREAK(endtagloop);
             } else {
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
           }
           case OPTGROUP: {
-            if (isCurrent(nsHtml5Atoms::option) && nsHtml5Atoms::optgroup == stack[currentPtr - 1]->name) {
+            if (isCurrent(nsGkAtoms::option) &&
+                nsGkAtoms::optgroup == stack[currentPtr - 1]->name) {
               pop();
             }
-            if (isCurrent(nsHtml5Atoms::optgroup)) {
+            if (isCurrent(nsGkAtoms::optgroup)) {
               pop();
             } else {
               errStrayEndTag(name);
             }
             NS_HTML5_BREAK(endtagloop);
           }
           case SELECT: {
-            eltPos = findLastInTableScope(nsHtml5Atoms::select);
+            eltPos = findLastInTableScope(nsGkAtoms::select);
             if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
               MOZ_ASSERT(fragment);
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
             while (currentPtr >= eltPos) {
               pop();
             }
@@ -2987,17 +3012,17 @@ nsHtml5TreeBuilder::endTag(nsHtml5Elemen
         switch(group) {
           case FRAMESET: {
             if (!currentPtr) {
               MOZ_ASSERT(fragment);
               errStrayEndTag(name);
               NS_HTML5_BREAK(endtagloop);
             }
             pop();
-            if ((!fragment) && !isCurrent(nsHtml5Atoms::frameset)) {
+            if ((!fragment) && !isCurrent(nsGkAtoms::frameset)) {
               mode = AFTER_FRAMESET;
             }
             NS_HTML5_BREAK(endtagloop);
           }
           default: {
             errStrayEndTag(name);
             NS_HTML5_BREAK(endtagloop);
           }
@@ -3092,24 +3117,24 @@ nsHtml5TreeBuilder::endTag(nsHtml5Elemen
     }
   }
   endtagloop_end: ;
 }
 
 void 
 nsHtml5TreeBuilder::endTagTemplateInHead()
 {
-  int32_t eltPos = findLast(nsHtml5Atoms::template_);
+  int32_t eltPos = findLast(nsGkAtoms::_template);
   if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
-    errStrayEndTag(nsHtml5Atoms::template_);
+    errStrayEndTag(nsGkAtoms::_template);
     return;
   }
   generateImpliedEndTags();
-  if (!!MOZ_UNLIKELY(mViewSource) && !isCurrent(nsHtml5Atoms::template_)) {
-    errUnclosedElements(eltPos, nsHtml5Atoms::template_);
+  if (!!MOZ_UNLIKELY(mViewSource) && !isCurrent(nsGkAtoms::_template)) {
+    errUnclosedElements(eltPos, nsGkAtoms::_template);
   }
   while (currentPtr >= eltPos) {
     pop();
   }
   clearTheListOfActiveFormattingElementsUpToTheLastMarker();
   popTemplateMode();
   resetTheInsertionMode();
 }
@@ -3139,32 +3164,33 @@ nsHtml5TreeBuilder::findLast(nsIAtom* na
 
 int32_t 
 nsHtml5TreeBuilder::findLastInTableScope(nsIAtom* name)
 {
   for (int32_t i = currentPtr; i > 0; i--) {
     if (stack[i]->ns == kNameSpaceID_XHTML) {
       if (stack[i]->name == name) {
         return i;
-      } else if (stack[i]->name == nsHtml5Atoms::table || stack[i]->name == nsHtml5Atoms::template_) {
+      } else if (stack[i]->name == nsGkAtoms::table ||
+                 stack[i]->name == nsGkAtoms::_template) {
         return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
       }
     }
   }
   return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
 }
 
 int32_t 
 nsHtml5TreeBuilder::findLastInButtonScope(nsIAtom* name)
 {
   for (int32_t i = currentPtr; i > 0; i--) {
     if (stack[i]->ns == kNameSpaceID_XHTML) {
       if (stack[i]->name == name) {
         return i;
-      } else if (stack[i]->name == nsHtml5Atoms::button) {
+      } else if (stack[i]->name == nsGkAtoms::button) {
         return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
       }
     }
     if (stack[i]->isScoping()) {
       return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
     }
   }
   return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
@@ -3185,17 +3211,18 @@ nsHtml5TreeBuilder::findLastInScope(nsIA
 
 int32_t 
 nsHtml5TreeBuilder::findLastInListScope(nsIAtom* name)
 {
   for (int32_t i = currentPtr; i > 0; i--) {
     if (stack[i]->ns == kNameSpaceID_XHTML) {
       if (stack[i]->name == name) {
         return i;
-      } else if (stack[i]->name == nsHtml5Atoms::ul || stack[i]->name == nsHtml5Atoms::ol) {
+      } else if (stack[i]->name == nsGkAtoms::ul ||
+                 stack[i]->name == nsGkAtoms::ol) {
         return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
       }
     }
     if (stack[i]->isScoping()) {
       return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
     }
   }
   return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
@@ -3310,17 +3337,17 @@ bool
 nsHtml5TreeBuilder::isQuirky(nsIAtom* name,
                              nsHtml5String publicIdentifier,
                              nsHtml5String systemIdentifier,
                              bool forceQuirks)
 {
   if (forceQuirks) {
     return true;
   }
-  if (name != nsHtml5Atoms::html) {
+  if (name != nsGkAtoms::html) {
     return true;
   }
   if (publicIdentifier) {
     for (int32_t i = 0; i < nsHtml5TreeBuilder::QUIRKY_PUBLIC_IDS.length; i++) {
       if (nsHtml5Portability::lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(nsHtml5TreeBuilder::QUIRKY_PUBLIC_IDS[i], publicIdentifier)) {
         return true;
       }
     }
@@ -3356,19 +3383,19 @@ nsHtml5TreeBuilder::closeTheCell(int32_t
 }
 
 int32_t 
 nsHtml5TreeBuilder::findLastInTableScopeTdTh()
 {
   for (int32_t i = currentPtr; i > 0; i--) {
     nsIAtom* name = stack[i]->name;
     if (stack[i]->ns == kNameSpaceID_XHTML) {
-      if (nsHtml5Atoms::td == name || nsHtml5Atoms::th == name) {
+      if (nsGkAtoms::td == name || nsGkAtoms::th == name) {
         return i;
-      } else if (name == nsHtml5Atoms::table || name == nsHtml5Atoms::template_) {
+      } else if (name == nsGkAtoms::table || name == nsGkAtoms::_template) {
         return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
       }
     }
   }
   return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK;
 }
 
 void 
@@ -3392,104 +3419,106 @@ nsHtml5TreeBuilder::resetTheInsertionMod
   nsHtml5StackNode* node;
   nsIAtom* name;
   int32_t ns;
   for (int32_t i = currentPtr; i >= 0; i--) {
     node = stack[i];
     name = node->name;
     ns = node->ns;
     if (!i) {
-      if (!(contextNamespace == kNameSpaceID_XHTML && (contextName == nsHtml5Atoms::td || contextName == nsHtml5Atoms::th))) {
+      if (!(contextNamespace == kNameSpaceID_XHTML &&
+            (contextName == nsGkAtoms::td || contextName == nsGkAtoms::th))) {
         if (fragment) {
           name = contextName;
           ns = contextNamespace;
         }
       } else {
         mode = framesetOk ? FRAMESET_OK : IN_BODY;
         return;
       }
     }
-    if (nsHtml5Atoms::select == name) {
+    if (nsGkAtoms::select == name) {
       int32_t ancestorIndex = i;
       while (ancestorIndex > 0) {
         nsHtml5StackNode* ancestor = stack[ancestorIndex--];
         if (kNameSpaceID_XHTML == ancestor->ns) {
-          if (nsHtml5Atoms::template_ == ancestor->name) {
+          if (nsGkAtoms::_template == ancestor->name) {
             break;
           }
-          if (nsHtml5Atoms::table == ancestor->name) {
+          if (nsGkAtoms::table == ancestor->name) {
             mode = IN_SELECT_IN_TABLE;
             return;
           }
         }
       }
       mode = IN_SELECT;
       return;
-    } else if (nsHtml5Atoms::td == name || nsHtml5Atoms::th == name) {
+    } else if (nsGkAtoms::td == name || nsGkAtoms::th == name) {
       mode = IN_CELL;
       return;
-    } else if (nsHtml5Atoms::tr == name) {
+    } else if (nsGkAtoms::tr == name) {
       mode = IN_ROW;
       return;
-    } else if (nsHtml5Atoms::tbody == name || nsHtml5Atoms::thead == name || nsHtml5Atoms::tfoot == name) {
+    } else if (nsGkAtoms::tbody == name || nsGkAtoms::thead == name ||
+               nsGkAtoms::tfoot == name) {
       mode = IN_TABLE_BODY;
       return;
-    } else if (nsHtml5Atoms::caption == name) {
+    } else if (nsGkAtoms::caption == name) {
       mode = IN_CAPTION;
       return;
-    } else if (nsHtml5Atoms::colgroup == name) {
+    } else if (nsGkAtoms::colgroup == name) {
       mode = IN_COLUMN_GROUP;
       return;
-    } else if (nsHtml5Atoms::table == name) {
+    } else if (nsGkAtoms::table == name) {
       mode = IN_TABLE;
       return;
     } else if (kNameSpaceID_XHTML != ns) {
       mode = framesetOk ? FRAMESET_OK : IN_BODY;
       return;
-    } else if (nsHtml5Atoms::template_ == name) {
+    } else if (nsGkAtoms::_template == name) {
       MOZ_ASSERT(templateModePtr >= 0);
       mode = templateModeStack[templateModePtr];
       return;
-    } else if (nsHtml5Atoms::head == name) {
+    } else if (nsGkAtoms::head == name) {
       if (name == contextName) {
         mode = framesetOk ? FRAMESET_OK : IN_BODY;
       } else {
         mode = IN_HEAD;
       }
       return;
-    } else if (nsHtml5Atoms::body == name) {
+    } else if (nsGkAtoms::body == name) {
       mode = framesetOk ? FRAMESET_OK : IN_BODY;
       return;
-    } else if (nsHtml5Atoms::frameset == name) {
+    } else if (nsGkAtoms::frameset == name) {
       mode = IN_FRAMESET;
       return;
-    } else if (nsHtml5Atoms::html == name) {
+    } else if (nsGkAtoms::html == name) {
       if (!headPointer) {
         mode = BEFORE_HEAD;
       } else {
         mode = AFTER_HEAD;
       }
       return;
     } else if (!i) {
       mode = framesetOk ? FRAMESET_OK : IN_BODY;
       return;
     }
   }
 }
 
 void 
 nsHtml5TreeBuilder::implicitlyCloseP()
 {
-  int32_t eltPos = findLastInButtonScope(nsHtml5Atoms::p);
+  int32_t eltPos = findLastInButtonScope(nsGkAtoms::p);
   if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
     return;
   }
-  generateImpliedEndTagsExceptFor(nsHtml5Atoms::p);
+  generateImpliedEndTagsExceptFor(nsGkAtoms::p);
   if (!!MOZ_UNLIKELY(mViewSource) && eltPos != currentPtr) {
-    errUnclosedElementsImplied(eltPos, nsHtml5Atoms::p);
+    errUnclosedElementsImplied(eltPos, nsGkAtoms::p);
   }
   while (currentPtr >= eltPos) {
     pop();
   }
 }
 
 bool 
 nsHtml5TreeBuilder::debugOnlyClearLastStackSlot()
@@ -4008,17 +4037,18 @@ nsHtml5TreeBuilder::appendHtmlElementToD
 {
   appendHtmlElementToDocumentAndPush(tokenizer->emptyAttributes());
 }
 
 void 
 nsHtml5TreeBuilder::appendToCurrentNodeAndPushHeadElement(nsHtml5HtmlAttributes* attributes)
 {
   nsIContentHandle* currentNode = stack[currentPtr]->node;
-  nsIContentHandle* elt = createElement(kNameSpaceID_XHTML, nsHtml5Atoms::head, attributes, currentNode);
+  nsIContentHandle* elt =
+    createElement(kNameSpaceID_XHTML, nsGkAtoms::head, attributes, currentNode);
   appendElement(elt, currentNode);
   headPointer = elt;
   nsHtml5StackNode* node = new nsHtml5StackNode(nsHtml5ElementName::ELT_HEAD, elt);
   push(node);
 }
 
 void 
 nsHtml5TreeBuilder::appendToCurrentNodeAndPushBodyElement(nsHtml5HtmlAttributes* attributes)
@@ -4034,19 +4064,21 @@ nsHtml5TreeBuilder::appendToCurrentNodeA
 
 void 
 nsHtml5TreeBuilder::appendToCurrentNodeAndPushFormElementMayFoster(nsHtml5HtmlAttributes* attributes)
 {
   nsIContentHandle* elt;
   nsHtml5StackNode* current = stack[currentPtr];
   if (current->isFosterParenting()) {
 
-    elt = createAndInsertFosterParentedElement(kNameSpaceID_XHTML, nsHtml5Atoms::form, attributes);
+    elt = createAndInsertFosterParentedElement(
+      kNameSpaceID_XHTML, nsGkAtoms::form, attributes);
   } else {
-    elt = createElement(kNameSpaceID_XHTML, nsHtml5Atoms::form, attributes, current->node);
+    elt = createElement(
+      kNameSpaceID_XHTML, nsGkAtoms::form, attributes, current->node);
     appendElement(elt, current->node);
   }
   if (!isTemplateContents()) {
     formPointer = elt;
   }
   nsHtml5StackNode* node = new nsHtml5StackNode(nsHtml5ElementName::ELT_FORM, elt);
   push(node);
 }
@@ -4251,21 +4283,22 @@ nsHtml5TreeBuilder::appendVoidElementToC
   elementPushed(kNameSpaceID_XHTML, name, elt);
   elementPopped(kNameSpaceID_XHTML, name, elt);
 }
 
 void 
 nsHtml5TreeBuilder::appendVoidFormToCurrent(nsHtml5HtmlAttributes* attributes)
 {
   nsIContentHandle* currentNode = stack[currentPtr]->node;
-  nsIContentHandle* elt = createElement(kNameSpaceID_XHTML, nsHtml5Atoms::form, attributes, currentNode);
+  nsIContentHandle* elt =
+    createElement(kNameSpaceID_XHTML, nsGkAtoms::form, attributes, currentNode);
   formPointer = elt;
   appendElement(elt, currentNode);
-  elementPushed(kNameSpaceID_XHTML, nsHtml5Atoms::form, elt);
-  elementPopped(kNameSpaceID_XHTML, nsHtml5Atoms::form, elt);
+  elementPushed(kNameSpaceID_XHTML, nsGkAtoms::form, elt);
+  elementPopped(kNameSpaceID_XHTML, nsGkAtoms::form, elt);
 }
 
 void 
 nsHtml5TreeBuilder::requestSuspension()
 {
   tokenizer->requestSuspension();
 }
 
--- a/parser/html/nsHtml5TreeBuilder.h
+++ b/parser/html/nsHtml5TreeBuilder.h
@@ -38,17 +38,17 @@
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5DocumentMode.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsHtml5Parser.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5TreeOperation.h"
 #include "nsHtml5StateSnapshot.h"
 #include "nsHtml5StackNode.h"
 #include "nsHtml5TreeOpExecutor.h"
 #include "nsHtml5StreamParser.h"
 #include "nsAHtml5TreeBuilderState.h"
 #include "nsHtml5Highlighter.h"
 #include "nsHtml5PlainTextUtils.h"
@@ -67,17 +67,16 @@ class nsHtml5UTF16Buffer;
 class nsHtml5StateSnapshot;
 class nsHtml5Portability;
 
 
 class nsHtml5TreeBuilder : public nsAHtml5TreeBuilderState
 {
   private:
     static char16_t REPLACEMENT_CHARACTER[];
-
   public:
     static const int32_t OTHER = 0;
 
     static const int32_t A = 1;
 
     static const int32_t BASE = 2;
 
     static const int32_t BODY = 3;
--- a/parser/html/nsHtml5TreeBuilderCppSupplement.h
+++ b/parser/html/nsHtml5TreeBuilderCppSupplement.h
@@ -117,46 +117,46 @@ nsHtml5TreeBuilder::createElement(int32_
   // mSpeculativeLoadStage is non-null only in the off-the-main-thread
   // tree builder, which handles the network stream
 
   // Start wall of code for speculative loading and line numbers
 
   if (mSpeculativeLoadStage) {
     switch (aNamespace) {
       case kNameSpaceID_XHTML:
-        if (nsHtml5Atoms::img == aName) {
+        if (nsGkAtoms::img == aName) {
           nsHtml5String url =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_SRC);
           nsHtml5String srcset =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_SRCSET);
           nsHtml5String crossOrigin =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_CROSSORIGIN);
           nsHtml5String referrerPolicy =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_REFERRERPOLICY);
           nsHtml5String sizes =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_SIZES);
           mSpeculativeLoadQueue.AppendElement()->InitImage(
             url, crossOrigin, referrerPolicy, srcset, sizes);
-        } else if (nsHtml5Atoms::source == aName) {
+        } else if (nsGkAtoms::source == aName) {
           nsHtml5String srcset =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_SRCSET);
           // Sources without srcset cannot be selected. The source could also be
           // for a media element, but in that context doesn't use srcset.  See
           // comments in nsHtml5SpeculativeLoad.h about <picture> preloading
           if (srcset) {
             nsHtml5String sizes =
               aAttributes->getValue(nsHtml5AttributeName::ATTR_SIZES);
             nsHtml5String type =
               aAttributes->getValue(nsHtml5AttributeName::ATTR_TYPE);
             nsHtml5String media =
               aAttributes->getValue(nsHtml5AttributeName::ATTR_MEDIA);
             mSpeculativeLoadQueue.AppendElement()->InitPictureSource(
               srcset, sizes, type, media);
           }
-        } else if (nsHtml5Atoms::script == aName) {
+        } else if (nsGkAtoms::script == aName) {
           nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
           NS_ASSERTION(treeOp, "Tree op allocation failed.");
           treeOp->Init(eTreeOpSetScriptLineNumberAndFreeze, content, tokenizer->getLineNumber());
 
           nsHtml5String url =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_SRC);
           if (url) {
             nsHtml5String charset =
@@ -173,17 +173,17 @@ nsHtml5TreeBuilder::createElement(int32_
               type,
               crossOrigin,
               integrity,
               mode == nsHtml5TreeBuilder::IN_HEAD);
             mCurrentHtmlScriptIsAsyncOrDefer =
               aAttributes->contains(nsHtml5AttributeName::ATTR_ASYNC) ||
               aAttributes->contains(nsHtml5AttributeName::ATTR_DEFER);
           }
-        } else if (nsHtml5Atoms::link == aName) {
+        } else if (nsGkAtoms::link == aName) {
           nsHtml5String rel =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_REL);
           // Not splitting on space here is bogus but the old parser didn't even
           // do a case-insensitive check.
           if (rel) {
             if (rel.LowerCaseEqualsASCII("stylesheet")) {
               nsHtml5String url =
                 aAttributes->getValue(nsHtml5AttributeName::ATTR_HREF);
@@ -203,38 +203,38 @@ nsHtml5TreeBuilder::createElement(int32_
               if (url) {
                 nsHtml5String crossOrigin =
                   aAttributes->getValue(nsHtml5AttributeName::ATTR_CROSSORIGIN);
                 mSpeculativeLoadQueue.AppendElement()->InitPreconnect(
                   url, crossOrigin);
               }
             }
           }
-        } else if (nsHtml5Atoms::video == aName) {
+        } else if (nsGkAtoms::video == aName) {
           nsHtml5String url =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_POSTER);
           if (url) {
             mSpeculativeLoadQueue.AppendElement()->InitImage(
               url, nullptr, nullptr, nullptr, nullptr);
           }
-        } else if (nsHtml5Atoms::style == aName) {
+        } else if (nsGkAtoms::style == aName) {
           nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
           NS_ASSERTION(treeOp, "Tree op allocation failed.");
           treeOp->Init(eTreeOpSetStyleLineNumber, content, tokenizer->getLineNumber());
-        } else if (nsHtml5Atoms::html == aName) {
+        } else if (nsGkAtoms::html == aName) {
           nsHtml5String url =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_MANIFEST);
           mSpeculativeLoadQueue.AppendElement()->InitManifest(url);
-        } else if (nsHtml5Atoms::base == aName) {
+        } else if (nsGkAtoms::base == aName) {
           nsHtml5String url =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_HREF);
           if (url) {
             mSpeculativeLoadQueue.AppendElement()->InitBase(url);
           }
-        } else if (nsHtml5Atoms::meta == aName) {
+        } else if (nsGkAtoms::meta == aName) {
           if (nsHtml5Portability::lowerCaseLiteralEqualsIgnoreAsciiCaseString(
                       "content-security-policy",
                       aAttributes->getValue(nsHtml5AttributeName::ATTR_HTTP_EQUIV))) {
             nsHtml5String csp =
               aAttributes->getValue(nsHtml5AttributeName::ATTR_CONTENT);
             if (csp) {
               mSpeculativeLoadQueue.AppendElement()->InitMetaCSP(csp);
             }
@@ -247,24 +247,24 @@ nsHtml5TreeBuilder::createElement(int32_
             if (referrerPolicy) {
               mSpeculativeLoadQueue.AppendElement()->InitMetaReferrerPolicy(
                 referrerPolicy);
             }
           }
         }
         break;
       case kNameSpaceID_SVG:
-        if (nsHtml5Atoms::image == aName) {
+        if (nsGkAtoms::image == aName) {
           nsHtml5String url =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_XLINK_HREF);
           if (url) {
             mSpeculativeLoadQueue.AppendElement()->InitImage(
               url, nullptr, nullptr, nullptr, nullptr);
           }
-        } else if (nsHtml5Atoms::script == aName) {
+        } else if (nsGkAtoms::script == aName) {
           nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
           NS_ASSERTION(treeOp, "Tree op allocation failed.");
           treeOp->Init(eTreeOpSetScriptLineNumberAndFreeze, content, tokenizer->getLineNumber());
 
           nsHtml5String url =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_XLINK_HREF);
           if (url) {
             nsHtml5String type =
@@ -276,17 +276,17 @@ nsHtml5TreeBuilder::createElement(int32_
             mSpeculativeLoadQueue.AppendElement()->InitScript(
               url,
               nullptr,
               type,
               crossOrigin,
               integrity,
               mode == nsHtml5TreeBuilder::IN_HEAD);
           }
-        } else if (nsHtml5Atoms::style == aName) {
+        } else if (nsGkAtoms::style == aName) {
           nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
           NS_ASSERTION(treeOp, "Tree op allocation failed.");
           treeOp->Init(eTreeOpSetStyleLineNumber, content, tokenizer->getLineNumber());
 
           nsHtml5String url =
             aAttributes->getValue(nsHtml5AttributeName::ATTR_XLINK_HREF);
           if (url) {
             nsHtml5String crossOrigin =
@@ -296,45 +296,45 @@ nsHtml5TreeBuilder::createElement(int32_
             mSpeculativeLoadQueue.AppendElement()->InitStyle(
               url, nullptr, crossOrigin, integrity);
           }
         }
         break;
     }
   } else if (aNamespace != kNameSpaceID_MathML) {
     // No speculative loader--just line numbers and defer/async check
-    if (nsHtml5Atoms::style == aName) {
+    if (nsGkAtoms::style == aName) {
       nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
       NS_ASSERTION(treeOp, "Tree op allocation failed.");
       treeOp->Init(eTreeOpSetStyleLineNumber, content, tokenizer->getLineNumber());
-    } else if (nsHtml5Atoms::script == aName) {
+    } else if (nsGkAtoms::script == aName) {
       nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
       NS_ASSERTION(treeOp, "Tree op allocation failed.");
       treeOp->Init(eTreeOpSetScriptLineNumberAndFreeze, content, tokenizer->getLineNumber());
       if (aNamespace == kNameSpaceID_XHTML) {
         mCurrentHtmlScriptIsAsyncOrDefer = 
           aAttributes->contains(nsHtml5AttributeName::ATTR_SRC) &&
           (aAttributes->contains(nsHtml5AttributeName::ATTR_ASYNC) ||
            aAttributes->contains(nsHtml5AttributeName::ATTR_DEFER));
       }
     } else if (aNamespace == kNameSpaceID_XHTML) {
-      if (nsHtml5Atoms::html == aName) {
+      if (nsGkAtoms::html == aName) {
         nsHtml5String url =
           aAttributes->getValue(nsHtml5AttributeName::ATTR_MANIFEST);
         nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
         NS_ASSERTION(treeOp, "Tree op allocation failed.");
         if (url) {
           nsString
             urlString; // Not Auto, because using it to hold nsStringBuffer*
           url.ToString(urlString);
           treeOp->Init(eTreeOpProcessOfflineManifest, urlString);
         } else {
           treeOp->Init(eTreeOpProcessOfflineManifest, EmptyString());
         }
-      } else if (nsHtml5Atoms::base == aName && mViewSource) {
+      } else if (nsGkAtoms::base == aName && mViewSource) {
         nsHtml5String url =
           aAttributes->getValue(nsHtml5AttributeName::ATTR_HREF);
         if (url) {
           mViewSource->AddBase(url);
         } 
       }
     }
   }
@@ -363,20 +363,18 @@ nsHtml5TreeBuilder::createElement(int32_
     }
   }
   return content;
 }
 
 nsIContentHandle*
 nsHtml5TreeBuilder::createHtmlElementSetAsRoot(nsHtml5HtmlAttributes* aAttributes)
 {
-  nsIContentHandle* content = createElement(kNameSpaceID_XHTML,
-                                            nsHtml5Atoms::html,
-                                            aAttributes,
-                                            nullptr);
+  nsIContentHandle* content =
+    createElement(kNameSpaceID_XHTML, nsGkAtoms::html, aAttributes, nullptr);
   if (mBuilder) {
     nsresult rv = nsHtml5TreeOperation::AppendToDocument(static_cast<nsIContent*>(content),
                                                          mBuilder);
     if (NS_FAILED(rv)) {
       MarkAsBrokenAndRequestSuspension(rv);
     }
   } else {
     nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
@@ -792,59 +790,53 @@ nsHtml5TreeBuilder::elementPushed(int32_
    * reached and element and comment nodes aren't appended to the DOM at all.
    *
    * However, for security reasons, non-child descendant text nodes inside an
    * SVG script or style element should not become children. Also, non-cell
    * table elements shouldn't be used as surrogate parents for user experience
    * reasons.
    */
   if (!deepTreeSurrogateParent && currentPtr >= MAX_REFLOW_DEPTH &&
-      !(aName == nsHtml5Atoms::script ||
-        aName == nsHtml5Atoms::table ||
-        aName == nsHtml5Atoms::thead ||
-        aName == nsHtml5Atoms::tfoot ||
-        aName == nsHtml5Atoms::tbody ||
-        aName == nsHtml5Atoms::tr ||
-        aName == nsHtml5Atoms::colgroup ||
-        aName == nsHtml5Atoms::style)) {
+      !(aName == nsGkAtoms::script || aName == nsGkAtoms::table ||
+        aName == nsGkAtoms::thead || aName == nsGkAtoms::tfoot ||
+        aName == nsGkAtoms::tbody || aName == nsGkAtoms::tr ||
+        aName == nsGkAtoms::colgroup || aName == nsGkAtoms::style)) {
     deepTreeSurrogateParent = aElement;
   }
   if (aNamespace != kNameSpaceID_XHTML) {
     return;
   }
-  if (aName == nsHtml5Atoms::body || aName == nsHtml5Atoms::frameset) {
+  if (aName == nsGkAtoms::body || aName == nsGkAtoms::frameset) {
     if (mBuilder) {
       // InnerHTML and DOMParser shouldn't start layout anyway
       return;
     }
     nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
     NS_ASSERTION(treeOp, "Tree op allocation failed.");
     treeOp->Init(eTreeOpStartLayout);
     return;
   }
-  if (aName == nsHtml5Atoms::input ||
-      aName == nsHtml5Atoms::button) {
+  if (aName == nsGkAtoms::input || aName == nsGkAtoms::button) {
     if (mBuilder) {
       nsHtml5TreeOperation::DoneCreatingElement(static_cast<nsIContent*>(aElement));
     } else {
       mOpQueue.AppendElement()->Init(eTreeOpDoneCreatingElement, aElement);
     }
     return;
   }
-  if (aName == nsHtml5Atoms::audio ||
-      aName == nsHtml5Atoms::video ||
-      aName == nsHtml5Atoms::menuitem) {
+  if (aName == nsGkAtoms::audio || aName == nsGkAtoms::video ||
+      aName == nsGkAtoms::menuitem) {
     if (mBuilder) {
       nsHtml5TreeOperation::DoneCreatingElement(static_cast<nsIContent*>(aElement));
     } else {
       mOpQueue.AppendElement()->Init(eTreeOpDoneCreatingElement, aElement);
     }
     return;
   }
-  if (mSpeculativeLoadStage && aName == nsHtml5Atoms::picture) {
+  if (mSpeculativeLoadStage && aName == nsGkAtoms::picture) {
     // mSpeculativeLoadStage is non-null only in the off-the-main-thread
     // tree builder, which handles the network stream
     //
     // See comments in nsHtml5SpeculativeLoad.h about <picture> preloading
     mSpeculativeLoadQueue.AppendElement()->InitOpenPicture();
   }
 }
 
@@ -856,17 +848,17 @@ nsHtml5TreeBuilder::elementPopped(int32_
   NS_ASSERTION(aElement, "No element!");
   if (deepTreeSurrogateParent && currentPtr <= MAX_REFLOW_DEPTH) {
     deepTreeSurrogateParent = nullptr;
   }
   if (aNamespace == kNameSpaceID_MathML) {
     return;
   }
   // we now have only SVG and HTML
-  if (aName == nsHtml5Atoms::script) {
+  if (aName == nsGkAtoms::script) {
     if (mPreventScriptExecution) {
       if (mBuilder) {
         nsHtml5TreeOperation::PreventScriptExecution(static_cast<nsIContent*>(aElement));
         return;
       }
       mOpQueue.AppendElement()->Init(eTreeOpPreventScriptExecution, aElement);
       return;
     }
@@ -883,75 +875,74 @@ nsHtml5TreeBuilder::elementPopped(int32_
       return;
     }
     requestSuspension();
     nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
     NS_ASSERTION(treeOp, "Tree op allocation failed.");
     treeOp->InitScript(aElement);
     return;
   }
-  if (aName == nsHtml5Atoms::title) {
+  if (aName == nsGkAtoms::title) {
     if (mBuilder) {
       nsHtml5TreeOperation::DoneAddingChildren(static_cast<nsIContent*>(aElement));
       return;
     }
     nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
     NS_ASSERTION(treeOp, "Tree op allocation failed.");
     treeOp->Init(eTreeOpDoneAddingChildren, aElement);
     return;
   }
-  if (aName == nsHtml5Atoms::style || (aNamespace == kNameSpaceID_XHTML && aName == nsHtml5Atoms::link)) {
+  if (aName == nsGkAtoms::style ||
+      (aNamespace == kNameSpaceID_XHTML && aName == nsGkAtoms::link)) {
     if (mBuilder) {
       MOZ_ASSERT(!nsContentUtils::IsSafeToRunScript(),
         "Scripts must be blocked.");
       mBuilder->UpdateStyleSheet(static_cast<nsIContent*>(aElement));
       return;
     }
     nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
     NS_ASSERTION(treeOp, "Tree op allocation failed.");
     treeOp->Init(eTreeOpUpdateStyleSheet, aElement);
     return;
   }
   if (aNamespace == kNameSpaceID_SVG) {
-    if (aName == nsHtml5Atoms::svg) {
+    if (aName == nsGkAtoms::svg) {
       if (mBuilder) {
         nsHtml5TreeOperation::SvgLoad(static_cast<nsIContent*>(aElement));
         return;
       }
       nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
       NS_ASSERTION(treeOp, "Tree op allocation failed.");
       treeOp->Init(eTreeOpSvgLoad, aElement);
     }
     return;
   }
   // we now have only HTML
   // Some HTML nodes need DoneAddingChildren() called to initialize
   // properly (e.g. form state restoration).
   // XXX expose ElementName group here and do switch
-  if (aName == nsHtml5Atoms::object ||
-      aName == nsHtml5Atoms::applet ||
-      aName == nsHtml5Atoms::select || 
-      aName == nsHtml5Atoms::textarea ||
-      aName == nsHtml5Atoms::output) {
+  if (aName == nsGkAtoms::object || aName == nsGkAtoms::applet ||
+      aName == nsGkAtoms::select || aName == nsGkAtoms::textarea ||
+      aName == nsGkAtoms::output) {
     if (mBuilder) {
       nsHtml5TreeOperation::DoneAddingChildren(static_cast<nsIContent*>(aElement));
       return;
     }
     nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
     NS_ASSERTION(treeOp, "Tree op allocation failed.");
     treeOp->Init(eTreeOpDoneAddingChildren, aElement);
     return;
   }
-  if (aName == nsHtml5Atoms::meta && !fragment && !mBuilder) {
+  if (aName == nsGkAtoms::meta && !fragment && !mBuilder) {
     nsHtml5TreeOperation* treeOp = mOpQueue.AppendElement();
     NS_ASSERTION(treeOp, "Tree op allocation failed.");
     treeOp->Init(eTreeOpProcessMeta, aElement);
     return;
   }
-  if (mSpeculativeLoadStage && aName == nsHtml5Atoms::picture) {
+  if (mSpeculativeLoadStage && aName == nsGkAtoms::picture) {
     // mSpeculativeLoadStage is non-null only in the off-the-main-thread
     // tree builder, which handles the network stream
     //
     // See comments in nsHtml5SpeculativeLoad.h about <picture> preloading
     mSpeculativeLoadQueue.AppendElement()->InitEndPicture();
   }
   return;
 }
--- a/parser/html/nsHtml5TreeOperation.cpp
+++ b/parser/html/nsHtml5TreeOperation.cpp
@@ -333,34 +333,34 @@ nsHtml5TreeOperation::AddAttributes(nsIC
 nsIContent*
 nsHtml5TreeOperation::CreateElement(int32_t aNs,
                                     nsIAtom* aName,
                                     nsHtml5HtmlAttributes* aAttributes,
                                     mozilla::dom::FromParser aFromParser,
                                     nsNodeInfoManager* aNodeInfoManager,
                                     nsHtml5DocumentBuilder* aBuilder)
 {
-  bool isKeygen = (aName == nsHtml5Atoms::keygen && aNs == kNameSpaceID_XHTML);
+  bool isKeygen = (aName == nsGkAtoms::keygen && aNs == kNameSpaceID_XHTML);
   if (MOZ_UNLIKELY(isKeygen)) {
-    aName = nsHtml5Atoms::select;
+    aName = nsGkAtoms::select;
   }
 
   nsCOMPtr<dom::Element> newElement;
   RefPtr<dom::NodeInfo> nodeInfo = aNodeInfoManager->
     GetNodeInfo(aName, nullptr, aNs, nsIDOMNode::ELEMENT_NODE);
   NS_ASSERTION(nodeInfo, "Got null nodeinfo.");
   NS_NewElement(getter_AddRefs(newElement),
                 nodeInfo.forget(),
                 aFromParser);
   NS_ASSERTION(newElement, "Element creation created null pointer.");
 
   dom::Element* newContent = newElement;
   aBuilder->HoldElement(newElement.forget());
 
-  if (MOZ_UNLIKELY(aName == nsHtml5Atoms::style || aName == nsHtml5Atoms::link)) {
+  if (MOZ_UNLIKELY(aName == nsGkAtoms::style || aName == nsGkAtoms::link)) {
     nsCOMPtr<nsIStyleSheetLinkingElement> ssle(do_QueryInterface(newContent));
     if (ssle) {
       ssle->InitStyleLinkElement(false);
       ssle->SetEnableUpdates(false);
     }
   } else if (MOZ_UNLIKELY(isKeygen)) {
     // Adapted from CNavDTD
     nsresult rv;
@@ -378,21 +378,18 @@ nsHtml5TreeOperation::CreateElement(int3
                                             theAttribute);
 
     newContent->SetAttr(kNameSpaceID_None,
                         nsGkAtoms::moztype,
                         nullptr,
                         theAttribute,
                         false);
 
-    RefPtr<dom::NodeInfo> optionNodeInfo =
-      aNodeInfoManager->GetNodeInfo(nsHtml5Atoms::option,
-                                    nullptr,
-                                    kNameSpaceID_XHTML,
-                                    nsIDOMNode::ELEMENT_NODE);
+    RefPtr<dom::NodeInfo> optionNodeInfo = aNodeInfoManager->GetNodeInfo(
+      nsGkAtoms::option, nullptr, kNameSpaceID_XHTML, nsIDOMNode::ELEMENT_NODE);
 
     for (uint32_t i = 0; i < theContent.Length(); ++i) {
       nsCOMPtr<dom::Element> optionElt;
       RefPtr<dom::NodeInfo> ni = optionNodeInfo;
       NS_NewElement(getter_AddRefs(optionElt),
                     ni.forget(),
                     aFromParser);
       RefPtr<nsTextNode> optionText = new nsTextNode(aNodeInfoManager);
@@ -414,19 +411,18 @@ nsHtml5TreeOperation::CreateElement(int3
     // local name is never null
     nsCOMPtr<nsIAtom> localName =
       Reget(aAttributes->getLocalNameNoBoundsCheck(i));
     nsCOMPtr<nsIAtom> prefix = aAttributes->getPrefixNoBoundsCheck(i);
     int32_t nsuri = aAttributes->getURINoBoundsCheck(i);
 
     nsString value; // Not Auto, because using it to hold nsStringBuffer*
     aAttributes->getValueNoBoundsCheck(i).ToString(value);
-    if (aNs == kNameSpaceID_XHTML &&
-        nsHtml5Atoms::a == aName &&
-        nsHtml5Atoms::name == localName) {
+    if (aNs == kNameSpaceID_XHTML && nsGkAtoms::a == aName &&
+        nsGkAtoms::name == localName) {
       // This is an HTML5-incompliant Geckoism.
       // Remove when fixing bug 582361
       NS_ConvertUTF16toUTF8 cname(value);
       NS_ConvertUTF8toUTF16 uv(nsUnescape(cname.BeginWriting()));
       newContent->SetAttr(nsuri,
                           localName,
                           prefix,
                           uv,
--- a/parser/html/nsHtml5UTF16Buffer.cpp
+++ b/parser/html/nsHtml5UTF16Buffer.cpp
@@ -31,17 +31,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 #include "nsHtml5AttributeName.h"
 #include "nsHtml5ElementName.h"
--- a/parser/html/nsHtml5UTF16Buffer.h
+++ b/parser/html/nsHtml5UTF16Buffer.h
@@ -32,17 +32,17 @@
 #include "nsHtml5AtomTable.h"
 #include "nsHtml5String.h"
 #include "nsNameSpaceManager.h"
 #include "nsIContent.h"
 #include "nsTraceRefcnt.h"
 #include "jArray.h"
 #include "nsHtml5ArrayCopy.h"
 #include "nsAHtml5TreeBuilderState.h"
-#include "nsHtml5Atoms.h"
+#include "nsGkAtoms.h"
 #include "nsHtml5ByteReadable.h"
 #include "nsIUnicodeDecoder.h"
 #include "nsHtml5Macros.h"
 #include "nsIContentHandle.h"
 #include "nsHtml5Portability.h"
 
 class nsHtml5StreamParser;