--- a/dom/base/nsGkAtomList.h
+++ b/dom/base/nsGkAtomList.h
@@ -121,17 +121,16 @@ GK_ATOM(aural, "aural")
GK_ATOM(_auto, "auto")
GK_ATOM(autocheck, "autocheck")
GK_ATOM(autocomplete, "autocomplete")
GK_ATOM(autofocus, "autofocus")
GK_ATOM(autoplay, "autoplay")
GK_ATOM(autorepeatbutton, "autorepeatbutton")
GK_ATOM(axis, "axis")
GK_ATOM(b, "b")
-GK_ATOM(backdropFrame, "BackdropFrame")
GK_ATOM(background, "background")
GK_ATOM(base, "base")
GK_ATOM(basefont, "basefont")
GK_ATOM(baseline, "baseline")
GK_ATOM(bdi, "bdi")
GK_ATOM(bdo, "bdo")
GK_ATOM(before, "before")
GK_ATOM(before_end, "before_end")
@@ -1973,111 +1972,21 @@ GK_ATOM(cdataTagName, "#cdata-section")
GK_ATOM(commentTagName, "#comment")
GK_ATOM(documentNodeName, "#document")
GK_ATOM(documentFragmentNodeName, "#document-fragment")
GK_ATOM(documentTypeNodeName, "#document-type")
GK_ATOM(processingInstructionTagName, "#processing-instruction")
GK_ATOM(textTagName, "#text")
// Frame types
-GK_ATOM(bcTableCellFrame, "BCTableCellFrame") // table cell in border collapsing model
-GK_ATOM(blockFrame, "BlockFrame")
-GK_ATOM(boxFrame, "BoxFrame")
-GK_ATOM(brFrame, "BRFrame")
-GK_ATOM(bulletFrame, "BulletFrame")
-GK_ATOM(colorControlFrame, "colorControlFrame")
-GK_ATOM(columnSetFrame, "ColumnSetFrame")
-GK_ATOM(comboboxControlFrame, "ComboboxControlFrame")
-GK_ATOM(comboboxDisplayFrame, "ComboboxDisplayFrame")
-GK_ATOM(dateTimeControlFrame, "DateTimeControlFrame")
-GK_ATOM(deckFrame, "DeckFrame")
-GK_ATOM(detailsFrame, "DetailsFrame")
-GK_ATOM(fieldSetFrame, "FieldSetFrame")
-GK_ATOM(flexContainerFrame, "FlexContainerFrame")
-GK_ATOM(formControlFrame, "FormControlFrame") // radio or checkbox
-GK_ATOM(frameSetFrame, "FrameSetFrame")
-GK_ATOM(gfxButtonControlFrame, "gfxButtonControlFrame")
-GK_ATOM(gridContainerFrame, "GridContainerFrame")
-GK_ATOM(HTMLButtonControlFrame, "HTMLButtonControlFrame")
-GK_ATOM(HTMLCanvasFrame, "HTMLCanvasFrame")
-GK_ATOM(subDocumentFrame, "subDocumentFrame")
-GK_ATOM(imageBoxFrame, "ImageBoxFrame")
-GK_ATOM(imageFrame, "ImageFrame")
-GK_ATOM(imageControlFrame, "ImageControlFrame")
-GK_ATOM(inlineFrame, "InlineFrame")
-GK_ATOM(leafBoxFrame, "LeafBoxFrame")
-GK_ATOM(legendFrame, "LegendFrame")
-GK_ATOM(letterFrame, "LetterFrame")
-GK_ATOM(lineFrame, "LineFrame")
-GK_ATOM(listControlFrame,"ListControlFrame")
-GK_ATOM(menuFrame,"MenuFrame")
-GK_ATOM(meterFrame, "MeterFrame")
-GK_ATOM(menuPopupFrame,"MenuPopupFrame")
-GK_ATOM(numberControlFrame, "NumberControlFrame")
-GK_ATOM(objectFrame, "ObjectFrame")
-GK_ATOM(pageFrame, "PageFrame")
-GK_ATOM(pageBreakFrame, "PageBreakFrame")
-GK_ATOM(pageContentFrame, "PageContentFrame")
+//
+// TODO(emilio): Rename this? This is only used now to mark the style context of
+// the placeholder with a dummy pseudo.
GK_ATOM(placeholderFrame, "PlaceholderFrame")
-GK_ATOM(popupSetFrame, "PopupSetFrame")
-GK_ATOM(progressFrame, "ProgressFrame")
-GK_ATOM(canvasFrame, "CanvasFrame")
-GK_ATOM(rangeFrame, "RangeFrame")
-GK_ATOM(rootFrame, "RootFrame")
-GK_ATOM(rubyBaseContainerFrame, "RubyBaseContainerFrame")
-GK_ATOM(rubyBaseFrame, "RubyBaseFrame")
-GK_ATOM(rubyFrame, "RubyFrame")
-GK_ATOM(rubyTextContainerFrame, "RubyTextContainerFrame")
-GK_ATOM(rubyTextFrame, "RubyTextFrame")
-GK_ATOM(scrollFrame, "ScrollFrame")
-GK_ATOM(scrollbarFrame, "ScrollbarFrame")
-GK_ATOM(sequenceFrame, "SequenceFrame")
-GK_ATOM(sliderFrame, "sliderFrame")
-GK_ATOM(tableCellFrame, "TableCellFrame")
-GK_ATOM(tableColFrame, "TableColFrame")
-GK_ATOM(tableColGroupFrame, "TableColGroupFrame")
-GK_ATOM(tableFrame, "TableFrame")
-GK_ATOM(tableWrapperFrame, "TableWrapperFrame")
-GK_ATOM(tableRowGroupFrame, "TableRowGroupFrame")
-GK_ATOM(tableRowFrame, "TableRowFrame")
-GK_ATOM(textInputFrame,"TextInputFrame")
-GK_ATOM(textFrame, "TextFrame")
-GK_ATOM(viewportFrame, "ViewportFrame")
-#ifdef MOZ_XUL
-GK_ATOM(XULLabelFrame, "XULLabelFrame")
-#endif
-GK_ATOM(svgAFrame, "SVGAFrame")
-GK_ATOM(svgClipPathFrame, "SVGClipPathFrame")
-GK_ATOM(svgDefsFrame, "SVGDefsFrame")
-GK_ATOM(svgFEContainerFrame, "SVGFEContainerFrame")
-GK_ATOM(svgFEImageFrame, "SVGFEImageFrame")
-GK_ATOM(svgFELeafFrame, "SVGFELeafFrame")
-GK_ATOM(svgFEUnstyledLeafFrame, "SVGFEUnstyledLeafFrame")
-GK_ATOM(svgFilterFrame, "SVGFilterFrame")
-GK_ATOM(svgForeignObjectFrame, "SVGForeignObjectFrame")
-GK_ATOM(svgGenericContainerFrame, "SVGGenericContainerFrame")
-GK_ATOM(svgGeometryFrame, "SVGGeometryFrame")
-GK_ATOM(svgGFrame, "SVGGFrame")
-GK_ATOM(svgGradientFrame, "SVGGradientFrame")
-GK_ATOM(svgImageFrame, "SVGImageFrame")
-GK_ATOM(svgInnerSVGFrame, "SVGInnerSVGFrame")
-GK_ATOM(svgLinearGradientFrame, "SVGLinearGradientFrame")
-GK_ATOM(svgMarkerFrame, "SVGMarkerFrame")
-GK_ATOM(svgMarkerAnonChildFrame, "SVGMarkerAnonChildFrame")
-GK_ATOM(svgMaskFrame, "SVGMaskFrame")
-GK_ATOM(svgOuterSVGFrame, "SVGOuterSVGFrame")
-GK_ATOM(svgOuterSVGAnonChildFrame, "SVGOuterSVGAnonChildFrame")
-GK_ATOM(svgPatternFrame, "SVGPatternFrame")
-GK_ATOM(svgRadialGradientFrame, "SVGRadialGradientFrame")
-GK_ATOM(svgStopFrame, "SVGStopFrame")
-GK_ATOM(svgSwitchFrame, "SVGSwitchFrame")
-GK_ATOM(svgTextFrame, "SVGTextFrame")
-GK_ATOM(svgUseFrame, "SVGUseFrame")
-GK_ATOM(svgViewFrame, "SVGViewFrame")
-GK_ATOM(HTMLVideoFrame, "VideoFrame")
+
GK_ATOM(onloadend, "onloadend")
GK_ATOM(onloadstart, "onloadstart")
GK_ATOM(onprogress, "onprogress")
GK_ATOM(onsuspend, "onsuspend")
GK_ATOM(onemptied, "onemptied")
GK_ATOM(onstalled, "onstalled")
GK_ATOM(onplay, "onplay")
GK_ATOM(onpause, "onpause")
@@ -2362,17 +2271,16 @@ GK_ATOM(aria_rowcount, "aria-rowcount")
GK_ATOM(aria_rowindex, "aria-rowindex")
GK_ATOM(aria_selected, "aria-selected")
GK_ATOM(aria_setsize, "aria-setsize")
GK_ATOM(aria_sort, "aria-sort")
GK_ATOM(aria_valuenow, "aria-valuenow")
GK_ATOM(aria_valuemin, "aria-valuemin")
GK_ATOM(aria_valuemax, "aria-valuemax")
GK_ATOM(aria_valuetext, "aria-valuetext")
-GK_ATOM(AreaFrame, "AreaFrame")
GK_ATOM(auto_generated, "auto-generated")
GK_ATOM(banner, "banner")
GK_ATOM(checkable, "checkable")
GK_ATOM(choices, "choices")
GK_ATOM(columnheader, "columnheader")
GK_ATOM(complementary, "complementary")
GK_ATOM(containerAtomic, "container-atomic")
GK_ATOM(containerBusy, "container-busy")
@@ -2383,17 +2291,16 @@ GK_ATOM(contentinfo, "contentinfo")
GK_ATOM(cycles, "cycles")
GK_ATOM(datatable, "datatable")
GK_ATOM(eventFromInput, "event-from-input")
GK_ATOM(feed, "feed")
GK_ATOM(grammar, "grammar")
GK_ATOM(gridcell, "gridcell")
GK_ATOM(heading, "heading")
GK_ATOM(hitregion, "hitregion")
-GK_ATOM(InlineBlockFrame, "InlineBlockFrame")
GK_ATOM(inlinevalue, "inline")
GK_ATOM(invalid, "invalid")
GK_ATOM(item, "item")
GK_ATOM(itemset, "itemset")
GK_ATOM(lineNumber, "line-number")
GK_ATOM(linkedPanel, "linkedpanel")
GK_ATOM(live, "live")
GK_ATOM(menuitemcheckbox, "menuitemcheckbox")
--- a/layout/generic/FrameTypeList.h
+++ b/layout/generic/FrameTypeList.h
@@ -2,101 +2,101 @@
/* 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 file contains the list of frame types in order to be processed via
* macros.
*/
-FRAME_TYPE(Backdrop, nsGkAtoms::backdropFrame)
-FRAME_TYPE(Block, nsGkAtoms::blockFrame)
-FRAME_TYPE(Box, nsGkAtoms::boxFrame)
-FRAME_TYPE(Br, nsGkAtoms::brFrame)
-FRAME_TYPE(Bullet, nsGkAtoms::bulletFrame)
-FRAME_TYPE(BCTableCell, nsGkAtoms::bcTableCellFrame)
-FRAME_TYPE(Canvas, nsGkAtoms::canvasFrame)
-FRAME_TYPE(ColorControl, nsGkAtoms::colorControlFrame)
-FRAME_TYPE(ColumnSet, nsGkAtoms::columnSetFrame)
-FRAME_TYPE(ComboboxControl, nsGkAtoms::comboboxControlFrame)
-FRAME_TYPE(ComboboxDisplay, nsGkAtoms::comboboxDisplayFrame)
-FRAME_TYPE(Deck, nsGkAtoms::deckFrame)
-FRAME_TYPE(DateTimeControl, nsGkAtoms::dateTimeControlFrame)
-FRAME_TYPE(Details, nsGkAtoms::detailsFrame)
-FRAME_TYPE(FieldSet, nsGkAtoms::fieldSetFrame)
-FRAME_TYPE(FlexContainer, nsGkAtoms::flexContainerFrame)
-FRAME_TYPE(FrameSet, nsGkAtoms::frameSetFrame)
-FRAME_TYPE(FormControl, nsGkAtoms::formControlFrame)
-FRAME_TYPE(GfxButtonControl, nsGkAtoms::gfxButtonControlFrame)
-FRAME_TYPE(GridContainer, nsGkAtoms::gridContainerFrame)
-FRAME_TYPE(HTMLButtonControl, nsGkAtoms::HTMLButtonControlFrame)
-FRAME_TYPE(HTMLCanvas, nsGkAtoms::HTMLCanvasFrame)
-FRAME_TYPE(HTMLVideo, nsGkAtoms::HTMLVideoFrame)
-FRAME_TYPE(Image, nsGkAtoms::imageFrame)
-FRAME_TYPE(ImageBox, nsGkAtoms::imageBoxFrame)
-FRAME_TYPE(ImageControl, nsGkAtoms::imageControlFrame)
-FRAME_TYPE(Inline, nsGkAtoms::inlineFrame)
-FRAME_TYPE(LeafBox, nsGkAtoms::leafBoxFrame)
-FRAME_TYPE(Legend, nsGkAtoms::legendFrame)
-FRAME_TYPE(Letter, nsGkAtoms::letterFrame)
-FRAME_TYPE(Line, nsGkAtoms::lineFrame)
-FRAME_TYPE(ListControl, nsGkAtoms::listControlFrame)
-FRAME_TYPE(Menu, nsGkAtoms::menuFrame)
-FRAME_TYPE(MenuPopup, nsGkAtoms::menuPopupFrame)
-FRAME_TYPE(Meter, nsGkAtoms::meterFrame)
-FRAME_TYPE(None, nullptr)
-FRAME_TYPE(NumberControl, nsGkAtoms::numberControlFrame)
-FRAME_TYPE(Object, nsGkAtoms::objectFrame)
-FRAME_TYPE(Page, nsGkAtoms::pageFrame)
-FRAME_TYPE(PageBreak, nsGkAtoms::pageBreakFrame)
-FRAME_TYPE(PageContent, nsGkAtoms::pageContentFrame)
-FRAME_TYPE(Placeholder, nsGkAtoms::placeholderFrame)
-FRAME_TYPE(Progress, nsGkAtoms::progressFrame)
-FRAME_TYPE(PopupSet, nsGkAtoms::popupSetFrame)
-FRAME_TYPE(Range, nsGkAtoms::rangeFrame)
-FRAME_TYPE(Root, nsGkAtoms::rootFrame)
-FRAME_TYPE(Ruby, nsGkAtoms::rubyFrame)
-FRAME_TYPE(RubyBase, nsGkAtoms::rubyBaseFrame)
-FRAME_TYPE(RubyBaseContainer, nsGkAtoms::rubyBaseContainerFrame)
-FRAME_TYPE(RubyText, nsGkAtoms::rubyTextFrame)
-FRAME_TYPE(RubyTextContainer, nsGkAtoms::rubyTextContainerFrame)
-FRAME_TYPE(Scroll, nsGkAtoms::scrollFrame)
-FRAME_TYPE(Scrollbar, nsGkAtoms::scrollbarFrame)
-FRAME_TYPE(Sequence, nsGkAtoms::sequenceFrame)
-FRAME_TYPE(Slider, nsGkAtoms::sliderFrame)
-FRAME_TYPE(SubDocument, nsGkAtoms::subDocumentFrame)
-FRAME_TYPE(SVGA, nsGkAtoms::svgAFrame)
-FRAME_TYPE(SVGClipPath, nsGkAtoms::svgClipPathFrame)
-FRAME_TYPE(SVGFilter, nsGkAtoms::svgFilterFrame)
-FRAME_TYPE(SVGForeignObject, nsGkAtoms::svgForeignObjectFrame)
-FRAME_TYPE(SVGFEContainer, nsGkAtoms::svgFEContainerFrame)
-FRAME_TYPE(SVGFELeaf, nsGkAtoms::svgFELeafFrame)
-FRAME_TYPE(SVGFEImage, nsGkAtoms::svgFEImageFrame)
-FRAME_TYPE(SVGFEUnstyledLeaf, nsGkAtoms::svgFEUnstyledLeafFrame)
-FRAME_TYPE(SVGG, nsGkAtoms::svgGFrame)
-FRAME_TYPE(SVGGenericContainer, nsGkAtoms::svgGenericContainerFrame)
-FRAME_TYPE(SVGGeometry, nsGkAtoms::svgGeometryFrame)
-FRAME_TYPE(SVGImage, nsGkAtoms::svgImageFrame)
-FRAME_TYPE(SVGInnerSVG, nsGkAtoms::svgInnerSVGFrame)
-FRAME_TYPE(SVGLinearGradient, nsGkAtoms::svgLinearGradientFrame)
-FRAME_TYPE(SVGMask, nsGkAtoms::svgMaskFrame)
-FRAME_TYPE(SVGMarker, nsGkAtoms::svgMarkerFrame)
-FRAME_TYPE(SVGMarkerAnonChild, nsGkAtoms::svgMarkerAnonChildFrame)
-FRAME_TYPE(SVGOuterSVG, nsGkAtoms::svgOuterSVGFrame)
-FRAME_TYPE(SVGOuterSVGAnonChild, nsGkAtoms::svgOuterSVGAnonChildFrame)
-FRAME_TYPE(SVGPattern, nsGkAtoms::svgPatternFrame)
-FRAME_TYPE(SVGRadialGradient, nsGkAtoms::svgRadialGradientFrame)
-FRAME_TYPE(SVGStop, nsGkAtoms::svgStopFrame)
-FRAME_TYPE(SVGSwitch, nsGkAtoms::svgSwitchFrame)
-FRAME_TYPE(SVGText, nsGkAtoms::svgTextFrame)
-FRAME_TYPE(SVGUse, nsGkAtoms::svgUseFrame)
-FRAME_TYPE(SVGView, nsGkAtoms::svgViewFrame)
-FRAME_TYPE(Table, nsGkAtoms::tableFrame)
-FRAME_TYPE(TableCell, nsGkAtoms::tableCellFrame)
-FRAME_TYPE(TableCol, nsGkAtoms::tableColFrame)
-FRAME_TYPE(TableColGroup, nsGkAtoms::tableColGroupFrame)
-FRAME_TYPE(TableRow, nsGkAtoms::tableRowFrame)
-FRAME_TYPE(TableRowGroup, nsGkAtoms::tableRowGroupFrame)
-FRAME_TYPE(TableWrapper, nsGkAtoms::tableWrapperFrame)
-FRAME_TYPE(Text, nsGkAtoms::textFrame)
-FRAME_TYPE(TextInput, nsGkAtoms::textInputFrame)
-FRAME_TYPE(Viewport, nsGkAtoms::viewportFrame)
-FRAME_TYPE(XULLabel, nsGkAtoms::XULLabelFrame)
+FRAME_TYPE(Backdrop)
+FRAME_TYPE(Block)
+FRAME_TYPE(Box)
+FRAME_TYPE(Br)
+FRAME_TYPE(Bullet)
+FRAME_TYPE(BCTableCell)
+FRAME_TYPE(Canvas)
+FRAME_TYPE(ColorControl)
+FRAME_TYPE(ColumnSet)
+FRAME_TYPE(ComboboxControl)
+FRAME_TYPE(ComboboxDisplay)
+FRAME_TYPE(Deck)
+FRAME_TYPE(DateTimeControl)
+FRAME_TYPE(Details)
+FRAME_TYPE(FieldSet)
+FRAME_TYPE(FlexContainer)
+FRAME_TYPE(FrameSet)
+FRAME_TYPE(FormControl)
+FRAME_TYPE(GfxButtonControl)
+FRAME_TYPE(GridContainer)
+FRAME_TYPE(HTMLButtonControl)
+FRAME_TYPE(HTMLCanvas)
+FRAME_TYPE(HTMLVideo)
+FRAME_TYPE(Image)
+FRAME_TYPE(ImageBox)
+FRAME_TYPE(ImageControl)
+FRAME_TYPE(Inline)
+FRAME_TYPE(LeafBox)
+FRAME_TYPE(Legend)
+FRAME_TYPE(Letter)
+FRAME_TYPE(Line)
+FRAME_TYPE(ListControl)
+FRAME_TYPE(Menu)
+FRAME_TYPE(MenuPopup)
+FRAME_TYPE(Meter)
+FRAME_TYPE(None)
+FRAME_TYPE(NumberControl)
+FRAME_TYPE(Object)
+FRAME_TYPE(Page)
+FRAME_TYPE(PageBreak)
+FRAME_TYPE(PageContent)
+FRAME_TYPE(Placeholder)
+FRAME_TYPE(Progress)
+FRAME_TYPE(PopupSet)
+FRAME_TYPE(Range)
+FRAME_TYPE(Root)
+FRAME_TYPE(Ruby)
+FRAME_TYPE(RubyBase)
+FRAME_TYPE(RubyBaseContainer)
+FRAME_TYPE(RubyText)
+FRAME_TYPE(RubyTextContainer)
+FRAME_TYPE(Scroll)
+FRAME_TYPE(Scrollbar)
+FRAME_TYPE(Sequence)
+FRAME_TYPE(Slider)
+FRAME_TYPE(SubDocument)
+FRAME_TYPE(SVGA)
+FRAME_TYPE(SVGClipPath)
+FRAME_TYPE(SVGFilter)
+FRAME_TYPE(SVGForeignObject)
+FRAME_TYPE(SVGFEContainer)
+FRAME_TYPE(SVGFELeaf)
+FRAME_TYPE(SVGFEImage)
+FRAME_TYPE(SVGFEUnstyledLeaf)
+FRAME_TYPE(SVGG)
+FRAME_TYPE(SVGGenericContainer)
+FRAME_TYPE(SVGGeometry)
+FRAME_TYPE(SVGImage)
+FRAME_TYPE(SVGInnerSVG)
+FRAME_TYPE(SVGLinearGradient)
+FRAME_TYPE(SVGMask)
+FRAME_TYPE(SVGMarker)
+FRAME_TYPE(SVGMarkerAnonChild)
+FRAME_TYPE(SVGOuterSVG)
+FRAME_TYPE(SVGOuterSVGAnonChild)
+FRAME_TYPE(SVGPattern)
+FRAME_TYPE(SVGRadialGradient)
+FRAME_TYPE(SVGStop)
+FRAME_TYPE(SVGSwitch)
+FRAME_TYPE(SVGText)
+FRAME_TYPE(SVGUse)
+FRAME_TYPE(SVGView)
+FRAME_TYPE(Table)
+FRAME_TYPE(TableCell)
+FRAME_TYPE(TableCol)
+FRAME_TYPE(TableColGroup)
+FRAME_TYPE(TableRow)
+FRAME_TYPE(TableRowGroup)
+FRAME_TYPE(TableWrapper)
+FRAME_TYPE(Text)
+FRAME_TYPE(TextInput)
+FRAME_TYPE(Viewport)
+FRAME_TYPE(XULLabel)