Commit b93ad032 authored by Cosmin Sabou's avatar Cosmin Sabou
Browse files

Backed out 3 changesets (bug 1553731) for build bustages on nsIFrame.h CLOSED TREE 

Backed out changeset 90ed9808e1c0 (bug 1553731)
Backed out changeset b8669aa5a820 (bug 1553731)
Backed out changeset 0d0bf5d84a3c (bug 1553731)

--HG--
rename : layout/generic/FrameIdList.h => layout/generic/nsFrameIdList.h
parent 4ea9edb0

dom/base/nsWindowMemoryReporter.cpp

+2 −2
Original line number Diff line number Diff line
@@ -448,7 +448,7 @@ static void CollectWindowReports(nsGlobalWindowInner* aWindow, 
    aWindowTotalSizes->mArenaSizes.NS_ARENA_SIZES_FIELD(classname) += size; \

  }

#define ABSTRACT_FRAME_ID(...)

#include "mozilla/FrameIdList.h"

#include "nsFrameIdList.h"

#undef FRAME_ID

#undef ABSTRACT_FRAME_ID
@@ -657,7 +657,7 @@ nsWindowMemoryReporter::CollectReports(nsIHandleReportCallback* aHandleReport, 
#define FRAME_ID(classname, ...) \

  frameTotal += windowTotalSizes.mArenaSizes.NS_ARENA_SIZES_FIELD(classname);

#define ABSTRACT_FRAME_ID(...)

#include "mozilla/FrameIdList.h"

#include "nsFrameIdList.h"

#undef FRAME_ID

#undef ABSTRACT_FRAME_ID

dom/base/nsWindowSizes.h

+4 −4
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ struct nsArenaSizes { 
      : FOR_EACH_SIZE(ZERO_SIZE)

#define FRAME_ID(classname, ...) NS_ARENA_SIZES_FIELD(classname)(0),

#define ABSTRACT_FRAME_ID(...)

#include "mozilla/FrameIdList.h"

#include "nsFrameIdList.h"

#undef FRAME_ID

#undef ABSTRACT_FRAME_ID
@@ -109,7 +109,7 @@ struct nsArenaSizes { 
#define FRAME_ID(classname, ...) \

  aSizes->add(nsTabSizes::Other, NS_ARENA_SIZES_FIELD(classname));

#define ABSTRACT_FRAME_ID(...)

#include "mozilla/FrameIdList.h"

#include "nsFrameIdList.h"

#undef FRAME_ID

#undef ABSTRACT_FRAME_ID

  }
@@ -121,7 +121,7 @@ struct nsArenaSizes { 


#define FRAME_ID(classname, ...) total += NS_ARENA_SIZES_FIELD(classname);

#define ABSTRACT_FRAME_ID(...)

#include "mozilla/FrameIdList.h"

#include "nsFrameIdList.h"

#undef FRAME_ID

#undef ABSTRACT_FRAME_ID
@@ -132,7 +132,7 @@ struct nsArenaSizes { 


#define FRAME_ID(classname, ...) size_t NS_ARENA_SIZES_FIELD(classname);

#define ABSTRACT_FRAME_ID(...)

#include "mozilla/FrameIdList.h"

#include "nsFrameIdList.h"

#undef FRAME_ID

#undef ABSTRACT_FRAME_ID

layout/base/nsPresArena.cpp

+1 −1
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ void nsPresArena<ArenaSize>::AddSizeOfExcludingThis( 
    aSizes.mArenaSizes.NS_ARENA_SIZES_FIELD(classname) += totalSize; \

    break;

#define ABSTRACT_FRAME_ID(...)

#include "mozilla/FrameIdList.h"

#include "nsFrameIdList.h"

#undef FRAME_ID

#undef ABSTRACT_FRAME_ID

      case eArenaObjectID_nsLineBox:

layout/generic/FrameClass.py

deleted100644 → 0
+0 −28
Original line number Diff line number Diff line 
# 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/.





# Leaf constants to pass to Frame's leafness argument.

LEAF = "Leaf"

NOT_LEAF = "NotLeaf"

DYNAMIC_LEAF = "DynamicLeaf"





class FrameClass():

    def __init__(self, cls):

        self.cls = cls





class Frame(FrameClass):

    def __init__(self, cls, ty, leafness):

        FrameClass.__init__(self, cls)

        self.ty = ty

        self.leafness = leafness

        self.is_concrete = True





class AbstractFrame(FrameClass):

    def __init__(self, cls):

        FrameClass.__init__(self, cls)

        self.is_concrete = False

layout/generic/FrameClasses.py

deleted100644 → 0
+0 −183
Original line number Diff line number Diff line 
# 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/.

# Frame class definitions, used to generate FrameIdList.h and FrameTypeList.h



from FrameClass import Frame, AbstractFrame, LEAF, NOT_LEAF, DYNAMIC_LEAF



FRAME_CLASSES = [

    Frame("BRFrame", "Br", LEAF),

    Frame("DetailsFrame", "Details", NOT_LEAF),

    Frame("nsBCTableCellFrame", "BCTableCell", NOT_LEAF),

    Frame("nsBackdropFrame", "Backdrop", LEAF),

    Frame("nsBlockFrame", "Block", NOT_LEAF),

    Frame("nsBox", "None", NOT_LEAF),

    Frame("nsBoxFrame", "Box", NOT_LEAF),

    Frame("nsBulletFrame", "Bullet", LEAF),

    Frame("nsButtonBoxFrame", "Box", NOT_LEAF),

    Frame("nsCanvasFrame", "Canvas", NOT_LEAF),

    Frame("nsCheckboxRadioFrame", "CheckboxRadio", LEAF),

    Frame("nsColorControlFrame", "ColorControl", LEAF),

    Frame("nsColumnSetFrame", "ColumnSet", NOT_LEAF),

    Frame("ColumnSetWrapperFrame", "ColumnSetWrapper", NOT_LEAF),

    Frame("nsComboboxControlFrame", "ComboboxControl", NOT_LEAF),

    Frame("nsComboboxDisplayFrame", "ComboboxDisplay", NOT_LEAF),

    Frame("nsContinuingTextFrame", "Text", LEAF),

    Frame("nsDateTimeControlFrame", "DateTimeControl", NOT_LEAF),

    Frame("nsDeckFrame", "Deck", NOT_LEAF),

    Frame("nsDocElementBoxFrame", "DocElementBox", NOT_LEAF),

    Frame("nsFieldSetFrame", "FieldSet", NOT_LEAF),

    Frame("nsFileControlFrame", "Block", LEAF),

    Frame("nsFirstLetterFrame", "Letter", NOT_LEAF),

    Frame("nsFirstLineFrame", "Line", NOT_LEAF),

    Frame("nsFlexContainerFrame", "FlexContainer", NOT_LEAF),

    Frame("nsFrame", "None", NOT_LEAF),

    Frame("nsGfxButtonControlFrame", "GfxButtonControl", LEAF),

    Frame("nsGridContainerFrame", "GridContainer", NOT_LEAF),

    Frame("nsGridRowGroupFrame", "Box", NOT_LEAF),

    Frame("nsGridRowLeafFrame", "Box", NOT_LEAF),

    Frame("nsGroupBoxFrame", "Box", NOT_LEAF),

    Frame("nsHTMLButtonControlFrame", "HTMLButtonControl", NOT_LEAF),

    Frame("nsHTMLCanvasFrame", "HTMLCanvas", NOT_LEAF),

    Frame("nsHTMLFramesetBlankFrame", "None", LEAF),

    Frame("nsHTMLFramesetBorderFrame", "None", LEAF),

    Frame("nsHTMLFramesetFrame", "FrameSet", LEAF),

    Frame("nsHTMLScrollFrame", "Scroll", NOT_LEAF),

    Frame("nsImageBoxFrame", "ImageBox", LEAF),

    Frame("nsImageControlFrame", "ImageControl", LEAF),

    Frame("nsImageFrame", "Image", LEAF),

    Frame("nsInlineFrame", "Inline", NOT_LEAF),

    Frame("nsLeafBoxFrame", "LeafBox", LEAF),

    Frame("nsLegendFrame", "Legend", NOT_LEAF),

    Frame("nsListControlFrame", "ListControl", NOT_LEAF),

    Frame("nsMathMLFrame", "None", NOT_LEAF),

    Frame("nsMathMLmactionFrame", "None", NOT_LEAF),

    Frame("nsMathMLmathBlockFrame", "Block", NOT_LEAF),

    Frame("nsMathMLmathInlineFrame", "Inline", NOT_LEAF),

    Frame("nsMathMLmencloseFrame", "None", NOT_LEAF),

    Frame("nsMathMLmfencedFrame", "None", NOT_LEAF),

    Frame("nsMathMLmfracFrame", "None", NOT_LEAF),

    Frame("nsMathMLmmultiscriptsFrame", "None", NOT_LEAF),

    Frame("nsMathMLmoFrame", "None", NOT_LEAF),

    Frame("nsMathMLmpaddedFrame", "None", NOT_LEAF),

    Frame("nsMathMLmrootFrame", "None", NOT_LEAF),

    Frame("nsMathMLmrowFrame", "None", NOT_LEAF),

    Frame("nsMathMLmspaceFrame", "None", LEAF),

    Frame("nsMathMLmsqrtFrame", "None", NOT_LEAF),

    Frame("nsMathMLmtableFrame", "Table", NOT_LEAF),

    Frame("nsMathMLmtableWrapperFrame", "TableWrapper", NOT_LEAF),

    Frame("nsMathMLmtdFrame", "TableCell", NOT_LEAF),

    Frame("nsMathMLmtdInnerFrame", "Block", NOT_LEAF),

    Frame("nsMathMLmtrFrame", "TableRow", NOT_LEAF),

    Frame("nsMathMLmunderoverFrame", "None", NOT_LEAF),

    Frame("nsMathMLsemanticsFrame", "None", NOT_LEAF),

    Frame("nsMathMLTokenFrame", "None", NOT_LEAF),

    Frame("nsMenuBarFrame", "Box", NOT_LEAF),

    Frame("nsMenuFrame", "Menu", NOT_LEAF),

    Frame("nsMenuPopupFrame", "MenuPopup", DYNAMIC_LEAF),

    Frame("nsMeterFrame", "Meter", LEAF),

    Frame("nsNumberControlFrame", "NumberControl", LEAF),

    Frame("nsPluginFrame", "Object", LEAF),

    Frame("nsPageBreakFrame", "PageBreak", LEAF),

    Frame("nsPageContentFrame", "PageContent", NOT_LEAF),

    Frame("nsPageFrame", "Page", NOT_LEAF),

    Frame("nsPlaceholderFrame", "Placeholder", LEAF),

    Frame("nsPopupSetFrame", "PopupSet", NOT_LEAF),

    Frame("nsProgressFrame", "Progress", LEAF),

    Frame("nsRangeFrame", "Range", LEAF),

    Frame("nsResizerFrame", "Box", NOT_LEAF),

    Frame("nsRootBoxFrame", "Root", NOT_LEAF),

    Frame("nsRubyBaseContainerFrame", "RubyBaseContainer", NOT_LEAF),

    Frame("nsRubyBaseFrame", "RubyBase", NOT_LEAF),

    Frame("nsRubyFrame", "Ruby", NOT_LEAF),

    Frame("nsRubyTextContainerFrame", "RubyTextContainer", NOT_LEAF),

    Frame("nsRubyTextFrame", "RubyText", NOT_LEAF),

    Frame("nsScrollbarButtonFrame", "Box", NOT_LEAF),

    Frame("nsScrollbarFrame", "Scrollbar", NOT_LEAF),

    Frame("nsSelectsAreaFrame", "Block", NOT_LEAF),

    Frame("nsSimplePageSequenceFrame", "Sequence", NOT_LEAF),

    Frame("nsSliderFrame", "Slider", NOT_LEAF),

    Frame("nsSplitterFrame", "Box", NOT_LEAF),

    Frame("nsStackFrame", "Box", NOT_LEAF),

    Frame("nsSubDocumentFrame", "SubDocument", LEAF),

    Frame("nsSVGAFrame", "SVGA", NOT_LEAF),

    Frame("nsSVGClipPathFrame", "SVGClipPath", NOT_LEAF),

    Frame("nsSVGContainerFrame", "None", NOT_LEAF),

    Frame("SVGFEContainerFrame", "SVGFEContainer", NOT_LEAF),

    Frame("SVGFEImageFrame", "SVGFEImage", LEAF),

    Frame("SVGFELeafFrame", "SVGFELeaf", LEAF),

    Frame("SVGFEUnstyledLeafFrame", "SVGFEUnstyledLeaf", LEAF),

    Frame("nsSVGFilterFrame", "SVGFilter", NOT_LEAF),

    Frame("nsSVGForeignObjectFrame", "SVGForeignObject", NOT_LEAF),

    Frame("nsSVGGenericContainerFrame", "SVGGenericContainer", NOT_LEAF),

    Frame("nsSVGGFrame", "SVGG", NOT_LEAF),

    Frame("nsSVGImageFrame", "SVGImage", LEAF),

    Frame("nsSVGInnerSVGFrame", "SVGInnerSVG", NOT_LEAF),

    Frame("nsSVGLinearGradientFrame", "SVGLinearGradient", NOT_LEAF),

    Frame("nsSVGMarkerFrame", "SVGMarker", NOT_LEAF),

    Frame("nsSVGMarkerAnonChildFrame", "SVGMarkerAnonChild", NOT_LEAF),

    Frame("nsSVGMaskFrame", "SVGMask", NOT_LEAF),

    Frame("nsSVGOuterSVGFrame", "SVGOuterSVG", NOT_LEAF),

    Frame("nsSVGOuterSVGAnonChildFrame", "SVGOuterSVGAnonChild", NOT_LEAF),

    Frame("SVGGeometryFrame", "SVGGeometry", LEAF),

    Frame("nsSVGPatternFrame", "SVGPattern", NOT_LEAF),

    Frame("nsSVGRadialGradientFrame", "SVGRadialGradient", NOT_LEAF),

    Frame("nsSVGStopFrame", "SVGStop", LEAF),

    Frame("nsSVGSwitchFrame", "SVGSwitch", NOT_LEAF),

    Frame("nsSVGSymbolFrame", "SVGSymbol", NOT_LEAF),

    Frame("SVGTextFrame", "SVGText", NOT_LEAF),

    # Not a leaf, though it always has a ShadowRoot, so in practice light DOM

    # children never render.

    Frame("nsSVGUseFrame", "SVGUse", NOT_LEAF),

    Frame("SVGViewFrame", "SVGView", LEAF),

    Frame("nsTableCellFrame", "TableCell", NOT_LEAF),

    Frame("nsTableColFrame", "TableCol", LEAF),

    Frame("nsTableColGroupFrame", "TableColGroup", NOT_LEAF),

    Frame("nsTableFrame", "Table", NOT_LEAF),

    Frame("nsTableWrapperFrame", "TableWrapper", NOT_LEAF),

    Frame("nsTableRowFrame", "TableRow", NOT_LEAF),

    Frame("nsTableRowGroupFrame", "TableRowGroup", NOT_LEAF),

    Frame("nsTextBoxFrame", "LeafBox", LEAF),

    Frame("nsTextControlFrame", "TextInput", LEAF),

    Frame("nsTextFrame", "Text", LEAF),

    Frame("nsTitleBarFrame", "Box", NOT_LEAF),

    Frame("nsTreeBodyFrame", "LeafBox", LEAF),

    Frame("nsTreeColFrame", "Box", NOT_LEAF),

    Frame("nsVideoFrame", "HTMLVideo", NOT_LEAF),

    Frame("nsXULLabelFrame", "XULLabel", NOT_LEAF),

    Frame("nsXULScrollFrame", "Scroll", NOT_LEAF),

    Frame("ViewportFrame", "Viewport", NOT_LEAF),



    # Non-concrete classes (for FrameIID use)

    AbstractFrame("nsContainerFrame"),

    AbstractFrame("nsIFrame"),

    AbstractFrame("nsLeafFrame"),

    AbstractFrame("nsMathMLContainerFrame"),

    AbstractFrame("nsRubyContentFrame"),

    AbstractFrame("nsSplittableFrame"),

    AbstractFrame("nsSVGDisplayContainerFrame"),

    AbstractFrame("nsSVGGradientFrame"),

    AbstractFrame("nsSVGPaintServerFrame"),



    # Interfaces (for FrameIID use)

    AbstractFrame("nsIAnonymousContentCreator"),

    AbstractFrame("nsIComboboxControlFrame"),

    AbstractFrame("nsIFormControlFrame"),

    AbstractFrame("nsIFrameFrame"),

    AbstractFrame("nsIListControlFrame"),

    AbstractFrame("nsIMathMLFrame"),

    AbstractFrame("nsIMenuFrame"),

    AbstractFrame("nsIObjectFrame"),

    AbstractFrame("nsIPageSequenceFrame"),

    AbstractFrame("nsIPercentBSizeObserver"),

    AbstractFrame("nsIPopupContainer"),

    AbstractFrame("nsIScrollableFrame"),

    AbstractFrame("nsIScrollbarMediator"),

    AbstractFrame("nsISelectControlFrame"),

    AbstractFrame("nsISVGSVGFrame"),

    AbstractFrame("nsIStatefulFrame"),

    AbstractFrame("nsITableCellLayout"),

    AbstractFrame("nsITableLayout"),

    AbstractFrame("nsITextControlFrame"),

    AbstractFrame("nsSVGDisplayableFrame"),

]