Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 12:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1269490 - Merge nsHtml5Atoms into nsGkAtoms. r=wchen

Browse Source 
MozReview-Commit-ID: EcfnXkFuJy3

--HG--
extra : rebase_source : eb4ba2c1b95a9ccabdcdecf65f3b757691f033b8
This commit is contained in:
Henri Sivonen 2017-04-20 11:47:02 +03:00
parent e5ec578150
commit c18a3863eb
31 changed files with 1698 additions and 2180 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

444
dom/base/nsGkAtomList.h
View File

@ -2394,3 +2394,447 @@ 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

6
dom/events/EventListenerManager.cpp
View File

@ -42,7 +42,6 @@
#include "nsDOMCID.h"
#include "nsError.h"
#include "nsGkAtoms.h"
#include "nsHtml5Atoms.h"
#include "nsIContent.h"
#include "nsIContentSecurityPolicy.h"
#include "nsIDocument.h"
@ -1794,9 +1793,8 @@ EventListenerManager::IsApzAwareListener(Listener* aListener)
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;
}

1
layout/base/nsLayoutUtils.cpp
View File

@ -30,7 +30,6 @@
#include "nsIDOMHTMLElement.h"
#include "nsFrameList.h"
#include "nsGkAtoms.h"
#include "nsHtml5Atoms.h"
#include "nsIAtom.h"
#include "nsCaret.h"
#include "nsCSSPseudoElements.h"

2
layout/build/nsLayoutStatics.cpp
View File

@ -51,7 +51,6 @@
#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
@ -158,7 +157,6 @@ nsLayoutStatics::Initialize()
nsCSSProps::AddRefTable();
nsColorNames::AddRefTable();
nsGkAtoms::AddRefAtoms();
nsHtml5Atoms::AddRefAtoms();
nsTextServicesDocument::RegisterAtoms();
nsHTMLTags::RegisterAtoms();
nsRDFAtoms::RegisterAtoms();

1
layout/generic/nsFrame.cpp
View File

@ -51,7 +51,6 @@
#include "nsISelectionPrivate.h"
#include "nsFrameSelection.h"
#include "nsGkAtoms.h"
#include "nsHtml5Atoms.h"
#include "nsCSSAnonBoxes.h"
#include "nsFrameTraversal.h"

3
parser/html/moz.build
View File

@ -16,8 +16,6 @@ EXPORTS += [
'nsAHtml5TreeBuilderState.h',
'nsAHtml5TreeOpSink.h',
'nsHtml5ArrayCopy.h',
'nsHtml5AtomList.h',
'nsHtml5Atoms.h',
'nsHtml5AtomTable.h',
'nsHtml5AttributeEntry.h',
'nsHtml5AttributeName.h',
@ -57,7 +55,6 @@ EXPORTS += [
UNIFIED_SOURCES += [
'nsHtml5Atom.cpp',
'nsHtml5Atoms.cpp',
'nsHtml5AtomTable.cpp',
'nsHtml5AttributeName.cpp',
'nsHtml5DependentUTF16Buffer.cpp',

890
parser/html/nsHtml5AtomList.h
View File

@ -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, "")

36
parser/html/nsHtml5Atoms.cpp
View File

@ -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);
}

30
parser/html/nsHtml5Atoms.h
View File

@ -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 */

1329
parser/html/nsHtml5AttributeName.cpp
View File

File diff suppressed because it is too large Load Diff

2
parser/html/nsHtml5AttributeName.h
View File

@ -37,7 +37,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

700
parser/html/nsHtml5ElementName.cpp
View File

File diff suppressed because it is too large Load Diff

62
parser/html/nsHtml5ElementName.h
View File

@ -37,7 +37,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"
@ -114,37 +114,37 @@ public:
}
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);

41
parser/html/nsHtml5Highlighter.cpp
View File

@ -48,20 +48,21 @@ 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!");
}
@ -79,7 +80,7 @@ nsHtml5Highlighter::Start(const nsAutoString& aTitle)
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);
@ -290,8 +291,8 @@ nsHtml5Highlighter::Transition(int32_t aState, bool aReconsume, int32_t aPos)
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);
@ -392,9 +393,9 @@ nsHtml5Highlighter::Transition(int32_t aState, bool aReconsume, int32_t aPos)
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:

1
parser/html/nsHtml5HtmlAttributes.cpp
View File

@ -32,7 +32,6 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

1
parser/html/nsHtml5HtmlAttributes.h
View File

@ -33,7 +33,6 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

2
parser/html/nsHtml5MetaScanner.cpp
View File

@ -37,7 +37,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

2
parser/html/nsHtml5MetaScanner.h
View File

@ -38,7 +38,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

2
parser/html/nsHtml5Portability.h
View File

@ -37,7 +37,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

2
parser/html/nsHtml5StackNode.cpp
View File

@ -37,7 +37,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

2
parser/html/nsHtml5StackNode.h
View File

@ -38,7 +38,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

2
parser/html/nsHtml5StateSnapshot.cpp
View File

@ -36,7 +36,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

2
parser/html/nsHtml5StateSnapshot.h
View File

@ -37,7 +37,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

6
parser/html/nsHtml5Tokenizer.cpp
View File

@ -40,7 +40,7 @@
#include "nsHtml5ArrayCopy.h"
#include "nsHtml5NamedCharacters.h"
#include "nsHtml5NamedCharactersAccel.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Macros.h"
#include "nsHtml5Highlighter.h"
@ -4042,7 +4042,7 @@ void
nsHtml5Tokenizer::initDoctypeFields()
{
clearStrBufAfterUse();
doctypeName = nsHtml5Atoms::emptystring;
doctypeName = nsGkAtoms::_empty;
if (systemIdentifier) {
systemIdentifier.Release();
systemIdentifier = nullptr;
@ -4208,7 +4208,7 @@ nsHtml5Tokenizer::eof()
emitComment(0, 0);
} else {
errEofInDoctype();
doctypeName = nsHtml5Atoms::emptystring;
doctypeName = nsGkAtoms::_empty;
if (systemIdentifier) {
systemIdentifier.Release();
systemIdentifier = nullptr;

2
parser/html/nsHtml5Tokenizer.h
View File

@ -41,7 +41,7 @@
#include "nsHtml5ArrayCopy.h"
#include "nsHtml5NamedCharacters.h"
#include "nsHtml5NamedCharactersAccel.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Macros.h"
#include "nsHtml5Highlighter.h"

199
parser/html/nsHtml5TreeBuilder.cpp
View File

@ -42,7 +42,7 @@
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
#include "nsHtml5Parser.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5TreeOperation.h"
#include "nsHtml5StateSnapshot.h"
#include "nsHtml5StackNode.h"
@ -98,7 +98,8 @@ nsHtml5TreeBuilder::startTokenization(nsHtml5Tokenizer* self)
}
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 =
@ -110,9 +111,11 @@ nsHtml5TreeBuilder::startTokenization(nsHtml5Tokenizer* self)
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 =
@ -126,21 +129,27 @@ nsHtml5TreeBuilder::startTokenization(nsHtml5Tokenizer* self)
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 {
@ -153,8 +162,12 @@ nsHtml5TreeBuilder::startTokenization(nsHtml5Tokenizer* self)
} 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;
}
@ -170,7 +183,9 @@ nsHtml5TreeBuilder::doctype(nsIAtom* name,
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();
@ -539,13 +554,13 @@ nsHtml5TreeBuilder::eof()
}
}
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();
@ -874,7 +889,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
NS_HTML5_BREAK(starttagloop);
}
generateImpliedEndTags();
if (!!MOZ_UNLIKELY(mViewSource) && !isCurrent(nsHtml5Atoms::table)) {
if (!!MOZ_UNLIKELY(mViewSource) && !isCurrent(nsGkAtoms::table)) {
errNoCheckUnclosedElementsOnStack();
}
while (currentPtr >= eltPos) {
@ -939,7 +954,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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);
}
@ -1130,7 +1145,11 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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--;
@ -1149,12 +1168,14 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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) {
@ -1179,9 +1200,9 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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);
@ -1291,10 +1312,10 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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),
@ -1302,7 +1323,8 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
}
}
attributes->clearWithoutReleasingContents();
appendVoidElementToCurrentMayFoster(nsHtml5Atoms::input, inputAttributes, formPointer);
appendVoidElementToCurrentMayFoster(
nsGkAtoms::input, inputAttributes, formPointer);
pop();
appendVoidElementToCurrentMayFoster(nsHtml5ElementName::ELT_HR, nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES);
pop();
@ -1372,7 +1394,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
}
case OPTGROUP:
case OPTION: {
if (isCurrent(nsHtml5Atoms::option)) {
if (isCurrent(nsGkAtoms::option)) {
pop();
}
reconstructTheActiveFormattingElements();
@ -1381,7 +1403,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
NS_HTML5_BREAK(starttagloop);
}
case RB_OR_RTC: {
eltPos = findLastInScope(nsHtml5Atoms::ruby);
eltPos = findLastInScope(nsGkAtoms::ruby);
if (eltPos != NOT_FOUND_ON_STACK) {
generateImpliedEndTags();
}
@ -1397,12 +1419,12 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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 {
@ -1625,7 +1647,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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);
@ -1651,7 +1673,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
NS_HTML5_BREAK(starttagloop);
}
case OPTION: {
if (isCurrent(nsHtml5Atoms::option)) {
if (isCurrent(nsGkAtoms::option)) {
pop();
}
appendToCurrentNodeAndPushElement(elementName, attributes);
@ -1659,10 +1681,10 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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);
@ -1688,7 +1710,7 @@ nsHtml5TreeBuilder::startTag(nsHtml5ElementName* elementName, nsHtml5HtmlAttribu
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);
@ -2022,7 +2044,7 @@ bool
nsHtml5TreeBuilder::isTemplateContents()
{
return nsHtml5TreeBuilder::NOT_FOUND_ON_STACK !=
findLast(nsHtml5Atoms::template_);
findLast(nsGkAtoms::_template);
}
bool
@ -2410,7 +2432,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
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);
@ -2444,7 +2466,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
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);
}
@ -2461,7 +2483,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
case TABLE: {
errTableClosedWhileCaptionOpen();
eltPos = findLastInTableScope(nsHtml5Atoms::caption);
eltPos = findLastInTableScope(nsGkAtoms::caption);
if (eltPos == nsHtml5TreeBuilder::NOT_FOUND_ON_STACK) {
NS_HTML5_BREAK(endtagloop);
}
@ -2514,7 +2536,9 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
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);
}
@ -2654,9 +2678,9 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
}
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) {
@ -2666,7 +2690,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
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);
@ -2902,7 +2926,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
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);
@ -2923,7 +2947,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
case IN_SELECT: {
switch(group) {
case OPTION: {
if (isCurrent(nsHtml5Atoms::option)) {
if (isCurrent(nsGkAtoms::option)) {
pop();
NS_HTML5_BREAK(endtagloop);
} else {
@ -2932,10 +2956,11 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
}
}
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);
@ -2943,7 +2968,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
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);
@ -2992,7 +3017,7 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
NS_HTML5_BREAK(endtagloop);
}
pop();
if ((!fragment) && !isCurrent(nsHtml5Atoms::frameset)) {
if ((!fragment) && !isCurrent(nsGkAtoms::frameset)) {
mode = AFTER_FRAMESET;
}
NS_HTML5_BREAK(endtagloop);
@ -3097,14 +3122,14 @@ nsHtml5TreeBuilder::endTag(nsHtml5ElementName* elementName)
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();
@ -3144,7 +3169,8 @@ nsHtml5TreeBuilder::findLastInTableScope(nsIAtom* name)
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;
}
}
@ -3159,7 +3185,7 @@ nsHtml5TreeBuilder::findLastInButtonScope(nsIAtom* name)
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;
}
}
@ -3190,7 +3216,8 @@ nsHtml5TreeBuilder::findLastInListScope(nsIAtom* name)
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;
}
}
@ -3315,7 +3342,7 @@ nsHtml5TreeBuilder::isQuirky(nsIAtom* name,
if (forceQuirks) {
return true;
}
if (name != nsHtml5Atoms::html) {
if (name != nsGkAtoms::html) {
return true;
}
if (publicIdentifier) {
@ -3361,9 +3388,9 @@ 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;
}
}
@ -3397,7 +3424,8 @@ nsHtml5TreeBuilder::resetTheInsertionMode()
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;
@ -3407,15 +3435,15 @@ nsHtml5TreeBuilder::resetTheInsertionMode()
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;
}
@ -3423,45 +3451,46 @@ nsHtml5TreeBuilder::resetTheInsertionMode()
}
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 {
@ -3478,13 +3507,13 @@ nsHtml5TreeBuilder::resetTheInsertionMode()
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();
@ -4013,7 +4042,8 @@ 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);
@ -4039,9 +4069,11 @@ nsHtml5TreeBuilder::appendToCurrentNodeAndPushFormElementMayFoster(nsHtml5HtmlAt
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()) {
@ -4256,11 +4288,12 @@ 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

3
parser/html/nsHtml5TreeBuilder.h
View File

@ -43,7 +43,7 @@
#include "nsHtml5DocumentMode.h"
#include "nsHtml5ArrayCopy.h"
#include "nsHtml5Parser.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5TreeOperation.h"
#include "nsHtml5StateSnapshot.h"
#include "nsHtml5StackNode.h"
@ -72,7 +72,6 @@ class nsHtml5TreeBuilder : public nsAHtml5TreeBuilderState
{
private:
static char16_t REPLACEMENT_CHARACTER[];
public:
static const int32_t OTHER = 0;

83
parser/html/nsHtml5TreeBuilderCppSupplement.h
View File

@ -122,7 +122,7 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
if (mSpeculativeLoadStage) {
switch (aNamespace) {
case kNameSpaceID_XHTML:
if (nsHtml5Atoms::img == aName) {
if (nsGkAtoms::img == aName) {
nsHtml5String url =
aAttributes->getValue(nsHtml5AttributeName::ATTR_SRC);
nsHtml5String srcset =
@ -135,7 +135,7 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
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
@ -151,7 +151,7 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
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());
@ -178,7 +178,7 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
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
@ -208,28 +208,28 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
}
}
}
} 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))) {
@ -252,14 +252,14 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
}
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());
@ -281,7 +281,7 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
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());
@ -301,11 +301,11 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
}
} 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());
@ -316,7 +316,7 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
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();
@ -329,7 +329,7 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
} 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) {
@ -368,10 +368,8 @@ nsHtml5TreeBuilder::createElement(int32_t aNamespace, nsIAtom* aName,
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);
@ -797,20 +795,16 @@ nsHtml5TreeBuilder::elementPushed(int32_t aNamespace, nsIAtom* aName, nsIContent
* 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;
@ -820,8 +814,7 @@ nsHtml5TreeBuilder::elementPushed(int32_t aNamespace, nsIAtom* aName, nsIContent
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 {
@ -829,9 +822,8 @@ nsHtml5TreeBuilder::elementPushed(int32_t aNamespace, nsIAtom* aName, nsIContent
}
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 {
@ -839,7 +831,7 @@ nsHtml5TreeBuilder::elementPushed(int32_t aNamespace, nsIAtom* aName, nsIContent
}
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
//
@ -861,7 +853,7 @@ nsHtml5TreeBuilder::elementPopped(int32_t aNamespace, nsIAtom* aName, nsIContent
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));
@ -888,7 +880,7 @@ nsHtml5TreeBuilder::elementPopped(int32_t aNamespace, nsIAtom* aName, nsIContent
treeOp->InitScript(aElement);
return;
}
if (aName == nsHtml5Atoms::title) {
if (aName == nsGkAtoms::title) {
if (mBuilder) {
nsHtml5TreeOperation::DoneAddingChildren(static_cast<nsIContent*>(aElement));
return;
@ -898,7 +890,8 @@ nsHtml5TreeBuilder::elementPopped(int32_t aNamespace, nsIAtom* aName, nsIContent
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.");
@ -911,7 +904,7 @@ nsHtml5TreeBuilder::elementPopped(int32_t aNamespace, nsIAtom* aName, nsIContent
return;
}
if (aNamespace == kNameSpaceID_SVG) {
if (aName == nsHtml5Atoms::svg) {
if (aName == nsGkAtoms::svg) {
if (mBuilder) {
nsHtml5TreeOperation::SvgLoad(static_cast<nsIContent*>(aElement));
return;
@ -926,11 +919,9 @@ nsHtml5TreeBuilder::elementPopped(int32_t aNamespace, nsIAtom* aName, nsIContent
// 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;
@ -940,13 +931,13 @@ nsHtml5TreeBuilder::elementPopped(int32_t aNamespace, nsIAtom* aName, nsIContent
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
//

18
parser/html/nsHtml5TreeOperation.cpp
View File

@ -338,9 +338,9 @@ nsHtml5TreeOperation::CreateElement(int32_t aNs,
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;
@ -355,7 +355,7 @@ nsHtml5TreeOperation::CreateElement(int32_t aNs,
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);
@ -383,11 +383,8 @@ nsHtml5TreeOperation::CreateElement(int32_t aNs,
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;
@ -419,9 +416,8 @@ nsHtml5TreeOperation::CreateElement(int32_t aNs,
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);

2
parser/html/nsHtml5UTF16Buffer.cpp
View File

@ -36,7 +36,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"

2
parser/html/nsHtml5UTF16Buffer.h
View File

@ -37,7 +37,7 @@
#include "jArray.h"
#include "nsHtml5ArrayCopy.h"
#include "nsAHtml5TreeBuilderState.h"
#include "nsHtml5Atoms.h"
#include "nsGkAtoms.h"
#include "nsHtml5ByteReadable.h"
#include "nsIUnicodeDecoder.h"
#include "nsHtml5Macros.h"