Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-23 12:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1364805 part 1 - Make every concrete frame class be a NS_DECL_QUERYFRAME_TARGET. r=jfkthame

Browse Source 
MozReview-Commit-ID: Gy9gcEYupeY
This commit is contained in:
Mats Palmgren 2017-05-26 12:11:11 +02:00
parent c2849d4c0b
commit ec6b1ef065
127 changed files with 153 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
layout/forms/nsColorControlFrame.h
View File

@ -28,9 +28,8 @@ public:
virtual void DestroyFrom(nsIFrame* aDestructRoot) override;
NS_DECL_QUERYFRAME_TARGET(nsColorControlFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsColorControlFrame)
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const override;

2
layout/forms/nsComboboxControlFrame.cpp
View File

@ -1282,7 +1282,7 @@ nsComboboxControlFrame::AppendAnonymousContentTo(nsTArray<nsIContent*>& aElement
// need to revisit this.
class nsComboboxDisplayFrame : public nsBlockFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsComboboxDisplayFrame)
nsComboboxDisplayFrame(nsStyleContext* aContext,
nsComboboxControlFrame* aComboBox)

3
layout/forms/nsComboboxControlFrame.h
View File

@ -54,7 +54,6 @@ class nsComboboxControlFrame final : public nsBlockFrame,
typedef mozilla::gfx::DrawTarget DrawTarget;
public:
NS_DECL_QUERYFRAME_TARGET(nsComboboxControlFrame)
friend nsComboboxControlFrame* NS_NewComboboxControlFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext,
nsFrameState aFlags);
@ -64,7 +63,7 @@ public:
~nsComboboxControlFrame();
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsComboboxControlFrame)
// nsIAnonymousContentCreator
virtual nsresult CreateAnonymousContent(nsTArray<ContentInfo>& aElements) override;

3
layout/forms/nsDateTimeControlFrame.h
View File

@ -40,9 +40,8 @@ public:
void ContentStatesChanged(mozilla::EventStates aStates) override;
void DestroyFrom(nsIFrame* aDestructRoot) override;
NS_DECL_QUERYFRAME_TARGET(nsDateTimeControlFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsDateTimeControlFrame)
#ifdef DEBUG_FRAME_DUMP
nsresult GetFrameName(nsAString& aResult) const override {

2
layout/forms/nsFieldSetFrame.h
View File

@ -15,7 +15,7 @@ class nsFieldSetFrame final : public nsContainerFrame
typedef mozilla::image::DrawResult DrawResult;
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsFieldSetFrame)
explicit nsFieldSetFrame(nsStyleContext* aContext);

2
layout/forms/nsFileControlFrame.h
View File

@ -37,7 +37,7 @@ public:
const nsDisplayListSet& aLists) override;
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsFileControlFrame)
// nsIFormControlFrame
virtual nsresult SetFormProperty(nsIAtom* aName, const nsAString& aValue) override;

2
layout/forms/nsGfxButtonControlFrame.h
View File

@ -21,7 +21,7 @@ class nsGfxButtonControlFrame final
, public nsIAnonymousContentCreator
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsGfxButtonControlFrame)
explicit nsGfxButtonControlFrame(nsStyleContext* aContext);

2
layout/forms/nsGfxCheckboxControlFrame.h
View File

@ -11,7 +11,7 @@
class nsGfxCheckboxControlFrame : public nsFormControlFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsGfxCheckboxControlFrame)
explicit nsGfxCheckboxControlFrame(nsStyleContext* aContext);
virtual ~nsGfxCheckboxControlFrame();

2
layout/forms/nsGfxRadioControlFrame.h
View File

@ -18,7 +18,7 @@ public:
explicit nsGfxRadioControlFrame(nsStyleContext* aContext);
~nsGfxRadioControlFrame();
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsGfxRadioControlFrame)
#ifdef ACCESSIBILITY
virtual mozilla::a11y::AccType AccessibleType() override;

2
layout/forms/nsHTMLButtonControlFrame.h
View File

@ -28,7 +28,7 @@ public:
virtual void DestroyFrom(nsIFrame* aDestructRoot) override;
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsHTMLButtonControlFrame)
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,

2
layout/forms/nsImageControlFrame.cpp
View File

@ -28,7 +28,7 @@ public:
nsIFrame* aPrevInFlow) override;
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsImageControlFrame)
virtual void Reflow(nsPresContext* aPresContext,
ReflowOutput& aDesiredSize,

3
layout/forms/nsLegendFrame.h
View File

@ -12,9 +12,8 @@
class nsLegendFrame final : public nsBlockFrame
{
public:
NS_DECL_QUERYFRAME_TARGET(nsLegendFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsLegendFrame)
explicit nsLegendFrame(nsStyleContext* aContext)
: nsBlockFrame(aContext, mozilla::LayoutFrameType::Legend)

2
layout/forms/nsListControlFrame.h
View File

@ -55,7 +55,7 @@ public:
nsStyleContext* aContext);
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsListControlFrame)
// nsIFrame
virtual nsresult HandleEvent(nsPresContext* aPresContext,

3
layout/forms/nsMeterFrame.h
View File

@ -19,9 +19,8 @@ class nsMeterFrame : public nsContainerFrame,
typedef mozilla::dom::Element Element;
public:
NS_DECL_QUERYFRAME_TARGET(nsMeterFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMeterFrame)
explicit nsMeterFrame(nsStyleContext* aContext);
virtual ~nsMeterFrame();

3
layout/forms/nsNumberControlFrame.h
View File

@ -43,9 +43,8 @@ class nsNumberControlFrame final : public nsContainerFrame
explicit nsNumberControlFrame(nsStyleContext* aContext);
public:
NS_DECL_QUERYFRAME_TARGET(nsNumberControlFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsNumberControlFrame)
virtual void DestroyFrom(nsIFrame* aDestructRoot) override;
virtual void ContentStatesChanged(mozilla::EventStates aStates) override;

3
layout/forms/nsProgressFrame.h
View File

@ -23,9 +23,8 @@ class nsProgressFrame final
typedef mozilla::dom::Element Element;
public:
NS_DECL_QUERYFRAME_TARGET(nsProgressFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsProgressFrame)
explicit nsProgressFrame(nsStyleContext* aContext);
virtual ~nsProgressFrame();

3
layout/forms/nsRangeFrame.h
View File

@ -31,9 +31,8 @@ class nsRangeFrame final : public nsContainerFrame,
typedef mozilla::dom::Element Element;
public:
NS_DECL_QUERYFRAME_TARGET(nsRangeFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsRangeFrame)
// nsIFrame overrides
virtual void Init(nsIContent* aContent,

2
layout/forms/nsSelectsAreaFrame.h
View File

@ -11,7 +11,7 @@
class nsSelectsAreaFrame : public nsBlockFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSelectsAreaFrame)
friend nsContainerFrame* NS_NewSelectsAreaFrame(nsIPresShell* aShell,
nsStyleContext* aContext,

2
layout/forms/nsTextControlFrame.h
View File

@ -31,7 +31,7 @@ class nsTextControlFrame final : public nsContainerFrame,
public nsIStatefulFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsTextControlFrame)
NS_DECLARE_FRAME_PROPERTY_DELETABLE(ContentScrollPos, nsPoint)

2
layout/generic/BRFrame.cpp
View File

@ -27,7 +27,7 @@ namespace mozilla {
class BRFrame final : public nsFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(BRFrame)
friend nsIFrame* ::NS_NewBRFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

3
layout/generic/DetailsFrame.h
View File

@ -23,8 +23,7 @@ class DetailsFrame final : public nsBlockFrame
, public nsIAnonymousContentCreator
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(DetailsFrame)
NS_DECL_FRAMEARENA_HELPERS(DetailsFrame)
NS_DECL_QUERYFRAME
explicit DetailsFrame(nsStyleContext* aContext);

3
layout/generic/ViewportFrame.h
View File

@ -25,9 +25,8 @@ namespace mozilla {
*/
class ViewportFrame : public nsContainerFrame {
public:
NS_DECL_QUERYFRAME_TARGET(ViewportFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(ViewportFrame)
explicit ViewportFrame(nsStyleContext* aContext)
: ViewportFrame(aContext, mozilla::LayoutFrameType::Viewport)

2
layout/generic/nsBackdropFrame.h
View File

@ -14,7 +14,7 @@
class nsBackdropFrame final : public nsFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsBackdropFrame)
explicit nsBackdropFrame(nsStyleContext* aContext)
: nsFrame(aContext, mozilla::LayoutFrameType::Backdrop)

3
layout/generic/nsBlockFrame.h
View File

@ -80,8 +80,7 @@ class nsBlockFrame : public nsContainerFrame
using BlockReflowInput = mozilla::BlockReflowInput;
public:
NS_DECL_QUERYFRAME_TARGET(nsBlockFrame)
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsBlockFrame)
typedef nsLineList::iterator LineIterator;
typedef nsLineList::const_iterator ConstLineIterator;

3
layout/generic/nsBulletFrame.h
View File

@ -47,9 +47,8 @@ class nsBulletFrame final : public nsFrame {
typedef mozilla::image::DrawResult DrawResult;
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsBulletFrame)
#ifdef DEBUG
NS_DECL_QUERYFRAME_TARGET(nsBulletFrame)
NS_DECL_QUERYFRAME
#endif

3
layout/generic/nsCanvasFrame.h
View File

@ -39,9 +39,8 @@ public:
, mAddedScrollPositionListener(false)
{}
NS_DECL_QUERYFRAME_TARGET(nsCanvasFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsCanvasFrame)
virtual void DestroyFrom(nsIFrame* aDestructRoot) override;

2
layout/generic/nsColumnSetFrame.h
View File

@ -20,7 +20,7 @@
class nsColumnSetFrame final : public nsContainerFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsColumnSetFrame)
explicit nsColumnSetFrame(nsStyleContext* aContext);

3
layout/generic/nsFirstLetterFrame.h
View File

@ -13,9 +13,8 @@
class nsFirstLetterFrame final : public nsContainerFrame {
public:
NS_DECL_QUERYFRAME_TARGET(nsFirstLetterFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsFirstLetterFrame)
explicit nsFirstLetterFrame(nsStyleContext* aContext)
: nsContainerFrame(aContext, mozilla::LayoutFrameType::Letter)

3
layout/generic/nsFlexContainerFrame.h
View File

@ -44,8 +44,7 @@ nsContainerFrame* NS_NewFlexContainerFrame(nsIPresShell* aPresShell,
class nsFlexContainerFrame final : public nsContainerFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(nsFlexContainerFrame)
NS_DECL_FRAMEARENA_HELPERS(nsFlexContainerFrame)
NS_DECL_QUERYFRAME
// Factory method:

16
layout/generic/nsFrame.h
View File

@ -90,15 +90,16 @@
// with potentially catastrophic consequences (not enough memory is
// allocated for a frame object).
#define NS_DECL_FRAMEARENA_HELPERS \
void* operator new(size_t, nsIPresShell*) MOZ_MUST_OVERRIDE; \
nsQueryFrame::FrameIID GetFrameId() override MOZ_MUST_OVERRIDE;
#define NS_DECL_FRAMEARENA_HELPERS(class) \
NS_DECL_QUERYFRAME_TARGET(class) \
void* operator new(size_t, nsIPresShell*) MOZ_MUST_OVERRIDE; \
nsQueryFrame::FrameIID GetFrameId() override MOZ_MUST_OVERRIDE { \
return nsQueryFrame::class##_id; \
}
#define NS_IMPL_FRAMEARENA_HELPERS(class) \
void* class::operator new(size_t sz, nsIPresShell* aShell) \
{ return aShell->AllocateFrame(nsQueryFrame::class##_id, sz); } \
nsQueryFrame::FrameIID class::GetFrameId() \
{ return nsQueryFrame::class##_id; }
#define NS_DECL_ABSTRACT_FRAME(class) \
void* operator new(size_t, nsIPresShell*) MOZ_MUST_OVERRIDE = delete; \
@ -147,8 +148,11 @@ public:
// nsQueryFrame
NS_DECL_QUERYFRAME
NS_DECL_QUERYFRAME_TARGET(nsFrame)
virtual nsQueryFrame::FrameIID GetFrameId() MOZ_MUST_OVERRIDE {
return kFrameIID;
}
void* operator new(size_t, nsIPresShell*) MOZ_MUST_OVERRIDE;
virtual nsQueryFrame::FrameIID GetFrameId() MOZ_MUST_OVERRIDE;
// nsIFrame
void Init(nsIContent* aContent,

5
layout/generic/nsFrameSetFrame.cpp
View File

@ -86,7 +86,7 @@ void nsFramesetDrag::UnSet()
class nsHTMLFramesetBorderFrame final : public nsLeafFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsHTMLFramesetBorderFrame)
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const override;
@ -137,9 +137,8 @@ protected:
class nsHTMLFramesetBlankFrame final : public nsLeafFrame
{
public:
NS_DECL_QUERYFRAME_TARGET(nsHTMLFramesetBlankFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsHTMLFramesetBlankFrame)
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const override

3
layout/generic/nsFrameSetFrame.h
View File

@ -64,9 +64,8 @@ struct nsFramesetDrag {
class nsHTMLFramesetFrame : public nsContainerFrame
{
public:
NS_DECL_QUERYFRAME_TARGET(nsHTMLFramesetFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsHTMLFramesetFrame)
explicit nsHTMLFramesetFrame(nsStyleContext* aContext);

4
layout/generic/nsGfxScrollFrame.h
View File

@ -682,7 +682,7 @@ public:
bool aIsRoot);
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsHTMLScrollFrame)
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,
@ -1111,7 +1111,7 @@ public:
typedef mozilla::CSSIntPoint CSSIntPoint;
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsXULScrollFrame)
friend nsXULScrollFrame* NS_NewXULScrollFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext,

3
layout/generic/nsGridContainerFrame.h
View File

@ -84,8 +84,7 @@ struct ComputedGridLineInfo
class nsGridContainerFrame final : public nsContainerFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(nsGridContainerFrame)
NS_DECL_FRAMEARENA_HELPERS(nsGridContainerFrame)
NS_DECL_QUERYFRAME
typedef mozilla::ComputedGridTrackInfo ComputedGridTrackInfo;
typedef mozilla::ComputedGridLineInfo ComputedGridLineInfo;

3
layout/generic/nsHTMLCanvasFrame.h
View File

@ -32,9 +32,8 @@ public:
typedef mozilla::layers::LayerManager LayerManager;
typedef mozilla::ContainerLayerParameters ContainerLayerParameters;
NS_DECL_QUERYFRAME_TARGET(nsHTMLCanvasFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsHTMLCanvasFrame)
explicit nsHTMLCanvasFrame(nsStyleContext* aContext)
: nsContainerFrame(aContext, mozilla::LayoutFrameType::HTMLCanvas)

5
layout/generic/nsImageFrame.h
View File

@ -69,14 +69,13 @@ public:
typedef mozilla::layers::ImageLayer ImageLayer;
typedef mozilla::layers::LayerManager LayerManager;
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsImageFrame)
NS_DECL_QUERYFRAME
explicit nsImageFrame(nsStyleContext* aContext)
: nsImageFrame(aContext, mozilla::LayoutFrameType::Image)
{}
NS_DECL_QUERYFRAME_TARGET(nsImageFrame)
NS_DECL_QUERYFRAME
virtual void DestroyFrom(nsIFrame* aDestructRoot) override;
virtual void DidSetStyleContext(nsStyleContext* aOldStyleContext) override;

5
layout/generic/nsInlineFrame.h
View File

@ -22,9 +22,8 @@ class nsLineLayout;
class nsInlineFrame : public nsContainerFrame
{
public:
NS_DECL_QUERYFRAME_TARGET(nsInlineFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsInlineFrame)
friend nsInlineFrame* NS_NewInlineFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);
@ -212,7 +211,7 @@ protected:
*/
class nsFirstLineFrame final : public nsInlineFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsFirstLineFrame)
friend nsFirstLineFrame* NS_NewFirstLineFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);

2
layout/generic/nsPageContentFrame.h
View File

@ -15,7 +15,7 @@ class nsSharedPageData;
class nsPageContentFrame final : public mozilla::ViewportFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsPageContentFrame)
friend nsPageContentFrame* NS_NewPageContentFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);

5
layout/generic/nsPageFrame.h
View File

@ -16,9 +16,8 @@ class nsSharedPageData;
class nsPageFrame final : public nsContainerFrame {
public:
NS_DECL_QUERYFRAME_TARGET(nsPageFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsPageFrame)
friend nsPageFrame* NS_NewPageFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);
@ -99,7 +98,7 @@ protected:
class nsPageBreakFrame : public nsLeafFrame
{
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsPageBreakFrame)
explicit nsPageBreakFrame(nsStyleContext* aContext);
~nsPageBreakFrame();

3
layout/generic/nsPlaceholderFrame.h
View File

@ -54,9 +54,8 @@ nsIFrame* NS_NewPlaceholderFrame(nsIPresShell* aPresShell,
*/
class nsPlaceholderFrame final : public nsFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsPlaceholderFrame)
#ifdef DEBUG
NS_DECL_QUERYFRAME_TARGET(nsPlaceholderFrame)
NS_DECL_QUERYFRAME
#endif

6
layout/generic/nsPluginFrame.h
View File

@ -62,13 +62,11 @@ public:
typedef mozilla::layers::ImageContainer ImageContainer;
typedef mozilla::ContainerLayerParameters ContainerLayerParameters;
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsPluginFrame)
NS_DECL_QUERYFRAME
friend nsIFrame* NS_NewObjectFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);
NS_DECL_QUERYFRAME
NS_DECL_QUERYFRAME_TARGET(nsPluginFrame)
virtual void Init(nsIContent* aContent,
nsContainerFrame* aParent,
nsIFrame* aPrevInFlow) override;

3
layout/generic/nsRubyBaseContainerFrame.h
View File

@ -22,8 +22,7 @@ nsContainerFrame* NS_NewRubyBaseContainerFrame(nsIPresShell* aPresShell,
class nsRubyBaseContainerFrame final : public nsContainerFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(nsRubyBaseContainerFrame)
NS_DECL_FRAMEARENA_HELPERS(nsRubyBaseContainerFrame)
NS_DECL_QUERYFRAME
// nsIFrame overrides

3
layout/generic/nsRubyBaseFrame.h
View File

@ -21,8 +21,7 @@ nsContainerFrame* NS_NewRubyBaseFrame(nsIPresShell* aPresShell,
class nsRubyBaseFrame final : public nsRubyContentFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(nsRubyBaseFrame)
NS_DECL_FRAMEARENA_HELPERS(nsRubyBaseFrame)
NS_DECL_QUERYFRAME
#ifdef DEBUG_FRAME_DUMP

3
layout/generic/nsRubyFrame.h
View File

@ -22,8 +22,7 @@ nsContainerFrame* NS_NewRubyFrame(nsIPresShell* aPresShell,
class nsRubyFrame final : public nsInlineFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(nsRubyFrame)
NS_DECL_FRAMEARENA_HELPERS(nsRubyFrame)
NS_DECL_QUERYFRAME
// nsIFrame overrides

3
layout/generic/nsRubyTextContainerFrame.h
View File

@ -21,8 +21,7 @@ nsContainerFrame* NS_NewRubyTextContainerFrame(nsIPresShell* aPresShell,
class nsRubyTextContainerFrame final : public nsContainerFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(nsRubyTextContainerFrame)
NS_DECL_FRAMEARENA_HELPERS(nsRubyTextContainerFrame)
NS_DECL_QUERYFRAME
// nsIFrame overrides

3
layout/generic/nsRubyTextFrame.h
View File

@ -21,8 +21,7 @@ nsContainerFrame* NS_NewRubyTextFrame(nsIPresShell* aPresShell,
class nsRubyTextFrame final : public nsRubyContentFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(nsRubyTextFrame)
NS_DECL_FRAMEARENA_HELPERS(nsRubyTextFrame)
NS_DECL_QUERYFRAME
// nsIFrame overrides

2
layout/generic/nsSimplePageSequenceFrame.h
View File

@ -60,7 +60,7 @@ public:
nsStyleContext* aContext);
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSimplePageSequenceFrame)
// nsIFrame
void Reflow(nsPresContext* aPresContext,

3
layout/generic/nsSubDocumentFrame.h
View File

@ -20,8 +20,7 @@ class nsSubDocumentFrame final
, public nsIReflowCallback
{
public:
NS_DECL_QUERYFRAME_TARGET(nsSubDocumentFrame)
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSubDocumentFrame)
explicit nsSubDocumentFrame(nsStyleContext* aContext);

2
layout/generic/nsTextFrame.cpp
View File

@ -4390,7 +4390,7 @@ nsTextFrame::DestroyFrom(nsIFrame* aDestructRoot)
class nsContinuingTextFrame final : public nsTextFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsContinuingTextFrame)
friend nsIFrame* NS_NewContinuingTextFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

3
layout/generic/nsTextFrame.h
View File

@ -54,8 +54,7 @@ public:
: nsTextFrame(aContext, mozilla::LayoutFrameType::Text)
{}
NS_DECL_QUERYFRAME_TARGET(nsTextFrame)
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsTextFrame)
friend class nsContinuingTextFrame;
friend class nsDisplayTextGeometry;

3
layout/generic/nsVideoFrame.h
View File

@ -41,8 +41,7 @@ public:
explicit nsVideoFrame(nsStyleContext* aContext);
NS_DECL_QUERYFRAME
NS_DECL_QUERYFRAME_TARGET(nsVideoFrame)
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsVideoFrame)
void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,

6
layout/mathml/nsMathMLContainerFrame.h
View File

@ -402,9 +402,8 @@ private:
// Issues: If/when mathml becomes a pluggable component, the separation will be needed.
class nsMathMLmathBlockFrame : public nsBlockFrame {
public:
NS_DECL_QUERYFRAME_TARGET(nsMathMLmathBlockFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmathBlockFrame)
friend nsContainerFrame* NS_NewMathMLmathBlockFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);
@ -484,9 +483,8 @@ protected:
class nsMathMLmathInlineFrame : public nsInlineFrame,
public nsMathMLFrame {
public:
NS_DECL_QUERYFRAME_TARGET(nsMathMLmathInlineFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmathInlineFrame)
friend nsContainerFrame* NS_NewMathMLmathInlineFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);

2
layout/mathml/nsMathMLTokenFrame.h
View File

@ -15,7 +15,7 @@
class nsMathMLTokenFrame : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLTokenFrame)
friend nsIFrame* NS_NewMathMLTokenFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmactionFrame.h
View File

@ -17,7 +17,7 @@
class nsMathMLmactionFrame : public nsMathMLSelectedFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmactionFrame)
friend nsIFrame* NS_NewMathMLmactionFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmencloseFrame.h
View File

@ -44,7 +44,7 @@ enum nsMencloseNotation
class nsMathMLmencloseFrame : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmencloseFrame)
friend nsIFrame* NS_NewMathMLmencloseFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);

2
layout/mathml/nsMathMLmfencedFrame.h
View File

@ -17,7 +17,7 @@ class nsFontMetrics;
class nsMathMLmfencedFrame final : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmfencedFrame)
friend nsIFrame* NS_NewMathMLmfencedFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmfracFrame.h
View File

@ -51,7 +51,7 @@ element.
class nsMathMLmfracFrame : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmfracFrame)
friend nsIFrame* NS_NewMathMLmfracFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmmultiscriptsFrame.h
View File

@ -18,7 +18,7 @@
class nsMathMLmmultiscriptsFrame : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmmultiscriptsFrame)
friend nsIFrame* NS_NewMathMLmmultiscriptsFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmoFrame.h
View File

@ -16,7 +16,7 @@
class nsMathMLmoFrame : public nsMathMLTokenFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmoFrame)
friend nsIFrame* NS_NewMathMLmoFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmpaddedFrame.h
View File

@ -15,7 +15,7 @@
class nsMathMLmpaddedFrame : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmpaddedFrame)
friend nsIFrame* NS_NewMathMLmpaddedFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmrootFrame.h
View File

@ -16,7 +16,7 @@
class nsMathMLmrootFrame : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmrootFrame)
friend nsIFrame* NS_NewMathMLmrootFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmrowFrame.h
View File

@ -17,7 +17,7 @@
class nsMathMLmrowFrame : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmrowFrame)
friend nsIFrame* NS_NewMathMLmrowFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmspaceFrame.h
View File

@ -15,7 +15,7 @@
class nsMathMLmspaceFrame : public nsMathMLContainerFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmspaceFrame)
friend nsIFrame* NS_NewMathMLmspaceFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLmsqrtFrame.h
View File

@ -34,7 +34,7 @@ but can be set explicitly only on <mstyle>. (See Section 3.3.4.)
class nsMathMLmsqrtFrame : public nsMathMLmencloseFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmsqrtFrame)
friend nsIFrame* NS_NewMathMLmsqrtFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);

11
layout/mathml/nsMathMLmtableFrame.h
View File

@ -27,7 +27,7 @@ public:
nsStyleContext* aContext);
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmtableWrapperFrame)
// overloaded nsTableWrapperFrame methods
@ -66,9 +66,8 @@ protected:
class nsMathMLmtableFrame final : public nsTableFrame
{
public:
NS_DECL_QUERYFRAME_TARGET(nsMathMLmtableFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmtableFrame)
friend nsContainerFrame*
NS_NewMathMLmtableFrame(nsIPresShell* aPresShell,
@ -179,7 +178,7 @@ private:
class nsMathMLmtrFrame final : public nsTableRowFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmtrFrame)
friend nsContainerFrame*
NS_NewMathMLmtrFrame(nsIPresShell* aPresShell,
@ -244,7 +243,7 @@ protected:
class nsMathMLmtdFrame : public nsTableCellFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmtdFrame)
friend nsContainerFrame*
NS_NewMathMLmtdFrame(nsIPresShell* aPresShell,
@ -299,7 +298,7 @@ public:
nsStyleContext* aContext);
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmtdInnerFrame)
// Overloaded nsIMathMLFrame methods

2
layout/mathml/nsMathMLmunderoverFrame.h
View File

@ -20,7 +20,7 @@ class nsMathMLmunderoverFrame final
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLmunderoverFrame)
friend nsIFrame* NS_NewMathMLmunderoverFrame(nsIPresShell* aPresShell, nsStyleContext* aContext);

2
layout/mathml/nsMathMLsemanticsFrame.h
View File

@ -15,7 +15,7 @@
class nsMathMLsemanticsFrame : public nsMathMLSelectedFrame {
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsMathMLsemanticsFrame)
friend nsIFrame* NS_NewMathMLsemanticsFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);

2
layout/svg/SVGFEContainerFrame.cpp
View File

@ -27,7 +27,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(SVGFEContainerFrame)
virtual bool IsFrameOfType(uint32_t aFlags) const override
{

2
layout/svg/SVGFEImageFrame.cpp
View File

@ -35,7 +35,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(SVGFEImageFrame)
virtual void Init(nsIContent* aContent,
nsContainerFrame* aParent,

2
layout/svg/SVGFELeafFrame.cpp
View File

@ -26,7 +26,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(SVGFELeafFrame)
#ifdef DEBUG
virtual void Init(nsIContent* aContent,

2
layout/svg/SVGFEUnstyledLeafFrame.cpp
View File

@ -22,7 +22,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(SVGFEUnstyledLeafFrame)
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,
const nsRect& aDirtyRect,

3
layout/svg/SVGGeometryFrame.h
View File

@ -60,9 +60,8 @@ protected:
{}
public:
NS_DECL_QUERYFRAME_TARGET(SVGGeometryFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(SVGGeometryFrame)
// nsIFrame interface:
virtual void Init(nsIContent* aContent,

3
layout/svg/SVGTextFrame.h
View File

@ -205,9 +205,8 @@ protected:
~SVGTextFrame() {}
public:
NS_DECL_QUERYFRAME_TARGET(SVGTextFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(SVGTextFrame)
// nsIFrame:
virtual void Init(nsIContent* aContent,

2
layout/svg/SVGViewFrame.cpp
View File

@ -30,7 +30,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(SVGViewFrame)
#ifdef DEBUG
virtual void Init(nsIContent* aContent,

2
layout/svg/nsSVGAFrame.cpp
View File

@ -25,7 +25,7 @@ protected:
{}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGAFrame)
#ifdef DEBUG
virtual void Init(nsIContent* aContent,

2
layout/svg/nsSVGClipPathFrame.h
View File

@ -32,7 +32,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGClipPathFrame)
// nsIFrame methods:
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,

6
layout/svg/nsSVGContainerFrame.h
View File

@ -47,9 +47,8 @@ protected:
}
public:
NS_DECL_QUERYFRAME_TARGET(nsSVGContainerFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGContainerFrame)
// Returns the transform to our gfxContext (to device pixels, not CSS px)
virtual gfxMatrix GetCanvasTM() {
@ -119,9 +118,8 @@ protected:
}
public:
NS_DECL_QUERYFRAME_TARGET(nsSVGDisplayContainerFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGDisplayContainerFrame)
// nsIFrame:
virtual void InsertFrames(ChildListID aListID,

2
layout/svg/nsSVGFilterFrame.h
View File

@ -41,7 +41,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGFilterFrame)
// nsIFrame methods:
virtual void BuildDisplayList(nsDisplayListBuilder* aBuilder,

2
layout/svg/nsSVGForeignObjectFrame.h
View File

@ -26,7 +26,7 @@ protected:
public:
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGForeignObjectFrame)
// nsIFrame:
virtual void Init(nsIContent* aContent,

2
layout/svg/nsSVGGFrame.h
View File

@ -25,7 +25,7 @@ protected:
{}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGGFrame)
#ifdef DEBUG
virtual void Init(nsIContent* aContent,

2
layout/svg/nsSVGGenericContainerFrame.h
View File

@ -30,7 +30,7 @@ protected:
{}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGGenericContainerFrame)
// nsIFrame:
virtual nsresult AttributeChanged(int32_t aNameSpaceID,

4
layout/svg/nsSVGGradientFrame.h
View File

@ -131,7 +131,7 @@ protected:
{}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGLinearGradientFrame)
// nsIFrame interface:
#ifdef DEBUG
@ -173,7 +173,7 @@ protected:
{}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGRadialGradientFrame)
// nsIFrame interface:
#ifdef DEBUG

3
layout/svg/nsSVGImageFrame.h
View File

@ -69,9 +69,8 @@ protected:
virtual ~nsSVGImageFrame();
public:
NS_DECL_QUERYFRAME_TARGET(nsSVGImageFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGImageFrame)
// nsSVGDisplayableFrame interface:
virtual void PaintSVG(gfxContext& aContext,

3
layout/svg/nsSVGInnerSVGFrame.h
View File

@ -27,9 +27,8 @@ protected:
}
public:
NS_DECL_QUERYFRAME_TARGET(nsSVGInnerSVGFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGInnerSVGFrame)
#ifdef DEBUG
virtual void Init(nsIContent* aContent,

4
layout/svg/nsSVGMarkerFrame.h
View File

@ -44,7 +44,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGMarkerFrame)
// nsIFrame interface:
#ifdef DEBUG
@ -146,7 +146,7 @@ class nsSVGMarkerAnonChildFrame final : public nsSVGDisplayContainerFrame
{}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGMarkerAnonChildFrame)
#ifdef DEBUG
virtual void Init(nsIContent* aContent,

2
layout/svg/nsSVGMaskFrame.h
View File

@ -49,7 +49,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGMaskFrame)
struct MaskParams {
gfxContext* ctx;

4
layout/svg/nsSVGOuterSVGFrame.h
View File

@ -30,7 +30,7 @@ protected:
public:
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGOuterSVGFrame)
#ifdef DEBUG
~nsSVGOuterSVGFrame() {
@ -238,7 +238,7 @@ class nsSVGOuterSVGAnonChildFrame final : public nsSVGDisplayContainerFrame
{}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGOuterSVGAnonChildFrame)
#ifdef DEBUG
virtual void Init(nsIContent* aContent,

2
layout/svg/nsSVGPatternFrame.h
View File

@ -32,7 +32,7 @@ class nsSVGPatternFrame final : public nsSVGPaintServerFrame
typedef mozilla::gfx::SourceSurface SourceSurface;
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGPatternFrame)
friend nsIFrame* NS_NewSVGPatternFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);

2
layout/svg/nsSVGStopFrame.cpp
View File

@ -26,7 +26,7 @@ protected:
}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGStopFrame)
// nsIFrame interface:
#ifdef DEBUG

2
layout/svg/nsSVGSwitchFrame.cpp
View File

@ -23,7 +23,7 @@ protected:
{}
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGSwitchFrame)
#ifdef DEBUG
virtual void Init(nsIContent* aContent,

2
layout/svg/nsSVGUseFrame.cpp
View File

@ -27,7 +27,7 @@ protected:
public:
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsSVGUseFrame)
// nsIFrame interface:
virtual void Init(nsIContent* aContent,

5
layout/tables/nsTableCellFrame.h
View File

@ -43,9 +43,8 @@ protected:
typedef mozilla::LogicalMargin LogicalMargin;
public:
NS_DECL_QUERYFRAME_TARGET(nsTableCellFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsTableCellFrame)
// default constructor supplied by the compiler
@ -305,7 +304,7 @@ class nsBCTableCellFrame final : public nsTableCellFrame
{
typedef mozilla::image::DrawResult DrawResult;
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsBCTableCellFrame)
nsBCTableCellFrame(nsStyleContext* aContext, nsTableFrame* aTableFrame);

2
layout/tables/nsTableColFrame.h
View File

@ -16,7 +16,7 @@
class nsTableColFrame final : public nsSplittableFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsTableColFrame)
enum {eWIDTH_SOURCE_NONE =0, // no cell has contributed to the width style
eWIDTH_SOURCE_CELL =1, // a cell specified a width

2
layout/tables/nsTableColGroupFrame.h
View File

@ -20,7 +20,7 @@ class nsTableColFrame;
class nsTableColGroupFrame final : public nsContainerFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsTableColGroupFrame)
/** instantiate a new instance of nsTableRowFrame.
* @param aPresShell the pres shell for this frame

3
layout/tables/nsTableFrame.h
View File

@ -134,8 +134,7 @@ class nsTableFrame : public nsContainerFrame
typedef mozilla::TableReflowInput TableReflowInput;
public:
NS_DECL_QUERYFRAME_TARGET(nsTableFrame)
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsTableFrame)
typedef nsTArray<nsIFrame*> FrameTArray;
NS_DECLARE_FRAME_PROPERTY_DELETABLE(PositionedTablePartArray, FrameTArray)

3
layout/tables/nsTableRowFrame.h
View File

@ -31,9 +31,8 @@ class nsTableRowFrame : public nsContainerFrame
using TableCellReflowInput = mozilla::TableCellReflowInput;
public:
NS_DECL_QUERYFRAME_TARGET(nsTableRowFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsTableRowFrame)
virtual ~nsTableRowFrame();

3
layout/tables/nsTableRowGroupFrame.h
View File

@ -37,9 +37,8 @@ class nsTableRowGroupFrame final
using TableRowGroupReflowInput = mozilla::TableRowGroupReflowInput;
public:
NS_DECL_QUERYFRAME_TARGET(nsTableRowGroupFrame)
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsTableRowGroupFrame)
/** instantiate a new instance of nsTableRowFrame.
* @param aPresShell the pres shell for this frame

4
layout/tables/nsTableWrapperFrame.h
View File

@ -21,9 +21,7 @@ class nsTableWrapperFrame : public nsContainerFrame
{
public:
NS_DECL_QUERYFRAME
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_QUERYFRAME_TARGET(nsTableWrapperFrame)
NS_DECL_FRAMEARENA_HELPERS(nsTableWrapperFrame)
/** instantiate a new instance of nsTableRowFrame.
* @param aPresShell the pres shell for this frame

2
layout/xul/grid/nsGridRowGroupFrame.h
View File

@ -26,7 +26,7 @@
class nsGridRowGroupFrame final : public nsBoxFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsGridRowGroupFrame)
#ifdef DEBUG_FRAME_DUMP
virtual nsresult GetFrameName(nsAString& aResult) const override

2
layout/xul/grid/nsGridRowLeafFrame.h
View File

@ -27,7 +27,7 @@
class nsGridRowLeafFrame : public nsBoxFrame
{
public:
NS_DECL_FRAMEARENA_HELPERS
NS_DECL_FRAMEARENA_HELPERS(nsGridRowLeafFrame)
friend nsIFrame* NS_NewGridRowLeafFrame(nsIPresShell* aPresShell,
nsStyleContext* aContext);

Some files were not shown because too many files have changed in this diff Show More