From 1db3f9da782a1e98d64722153ba7b8953e9b1199 Mon Sep 17 00:00:00 2001 From: Cameron McCormack Date: Fri, 7 Dec 2018 20:00:18 +0000 Subject: [PATCH] Bug 1512716 - Re-indent NS_QUERYFRAME macros after clang-format. r=TYLin Differential Revision: https://phabricator.services.mozilla.com/D13995 --HG-- extra : moz-landing-system : lando --- .clang-format | 6 ++++-- layout/forms/nsCheckboxRadioFrame.cpp | 2 +- layout/forms/nsColorControlFrame.cpp | 4 ++-- layout/forms/nsComboboxControlFrame.cpp | 10 +++++----- layout/forms/nsDateTimeControlFrame.cpp | 4 ++-- layout/forms/nsFileControlFrame.cpp | 4 ++-- layout/forms/nsGfxButtonControlFrame.cpp | 2 +- layout/forms/nsHTMLButtonControlFrame.cpp | 2 +- layout/forms/nsImageControlFrame.cpp | 2 +- layout/forms/nsLegendFrame.cpp | 2 +- layout/forms/nsListControlFrame.cpp | 6 +++--- layout/forms/nsMeterFrame.cpp | 4 ++-- layout/forms/nsNumberControlFrame.cpp | 6 +++--- layout/forms/nsProgressFrame.cpp | 4 ++-- layout/forms/nsRangeFrame.cpp | 4 ++-- layout/forms/nsTextControlFrame.cpp | 8 ++++---- layout/generic/ColumnSetWrapperFrame.cpp | 2 +- layout/generic/DetailsFrame.cpp | 4 ++-- layout/generic/ViewportFrame.cpp | 2 +- layout/generic/nsBlockFrame.cpp | 2 +- layout/generic/nsBulletFrame.cpp | 2 +- layout/generic/nsCanvasFrame.cpp | 6 +++--- layout/generic/nsContainerFrame.cpp | 2 +- layout/generic/nsFirstLetterFrame.cpp | 2 +- layout/generic/nsFlexContainerFrame.cpp | 2 +- layout/generic/nsFrame.cpp | 2 +- layout/generic/nsFrameSetFrame.cpp | 4 ++-- layout/generic/nsGfxScrollFrame.cpp | 16 ++++++++-------- layout/generic/nsGridContainerFrame.cpp | 2 +- layout/generic/nsHTMLCanvasFrame.cpp | 2 +- layout/generic/nsImageFrame.cpp | 2 +- layout/generic/nsInlineFrame.cpp | 2 +- layout/generic/nsPageFrame.cpp | 2 +- layout/generic/nsPlaceholderFrame.cpp | 2 +- layout/generic/nsPluginFrame.cpp | 4 ++-- layout/generic/nsRubyBaseContainerFrame.cpp | 2 +- layout/generic/nsRubyBaseFrame.cpp | 2 +- layout/generic/nsRubyFrame.cpp | 2 +- layout/generic/nsRubyTextContainerFrame.cpp | 2 +- layout/generic/nsRubyTextFrame.cpp | 2 +- layout/generic/nsSimplePageSequenceFrame.cpp | 2 +- layout/generic/nsSubDocumentFrame.cpp | 2 +- layout/generic/nsTextFrame.cpp | 2 +- layout/generic/nsVideoFrame.cpp | 4 ++-- layout/mathml/nsMathMLContainerFrame.cpp | 8 ++++---- layout/mathml/nsMathMLmtableFrame.cpp | 6 +++--- layout/svg/SVGGeometryFrame.cpp | 4 ++-- layout/svg/SVGTextFrame.cpp | 2 +- layout/svg/nsSVGContainerFrame.cpp | 6 +++--- layout/svg/nsSVGForeignObjectFrame.cpp | 2 +- layout/svg/nsSVGImageFrame.cpp | 2 +- layout/svg/nsSVGInnerSVGFrame.cpp | 4 ++-- layout/svg/nsSVGOuterSVGFrame.cpp | 2 +- layout/svg/nsSVGSymbolFrame.cpp | 2 +- layout/tables/nsTableCellFrame.cpp | 6 +++--- layout/tables/nsTableRowFrame.cpp | 2 +- layout/tables/nsTableRowGroupFrame.cpp | 2 +- layout/tables/nsTableWrapperFrame.cpp | 2 +- layout/xul/nsBoxFrame.cpp | 2 +- layout/xul/nsDeckFrame.cpp | 2 +- layout/xul/nsDocElementBoxFrame.cpp | 2 +- layout/xul/nsMenuBarFrame.cpp | 2 +- layout/xul/nsMenuFrame.cpp | 2 +- layout/xul/nsMenuPopupFrame.cpp | 2 +- layout/xul/nsRootBoxFrame.cpp | 2 +- layout/xul/nsScrollbarFrame.cpp | 4 ++-- layout/xul/nsSliderFrame.cpp | 2 +- layout/xul/nsTextBoxFrame.cpp | 2 +- layout/xul/tree/nsTreeBodyFrame.cpp | 4 ++-- 69 files changed, 115 insertions(+), 113 deletions(-) diff --git a/.clang-format b/.clang-format index 84dd963f3100..870f7faa529f 100644 --- a/.clang-format +++ b/.clang-format @@ -10,7 +10,8 @@ NS_IMPL_CYCLE_COLLECTION_.*_BEGIN|\ NS_INTERFACE_TABLE_HEAD_CYCLE_COLLECTION_INHERITED|\ NS_INTERFACE_TABLE_BEGIN|\ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_BEGIN_INHERITED|\ -NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED$" +NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED|\ +NS_QUERYFRAME_HEAD$" MacroBlockEnd: "^\ JS_END_MACRO|\ NS_INTERFACE_MAP_END|\ @@ -19,6 +20,7 @@ NS_INTERFACE_TABLE_END|\ NS_INTERFACE_TABLE_TAIL.*|\ NS_INTERFACE_MAP_END_.*|\ NS_IMPL_CYCLE_COLLECTION_TRAVERSE_END_INHERITED|\ -NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED$" +NS_IMPL_CYCLE_COLLECTION_UNLINK_END_INHERITED|\ +NS_QUERYFRAME_TAIL.*$" SortIncludes: false diff --git a/layout/forms/nsCheckboxRadioFrame.cpp b/layout/forms/nsCheckboxRadioFrame.cpp index 59d651c0c666..ac22db321634 100644 --- a/layout/forms/nsCheckboxRadioFrame.cpp +++ b/layout/forms/nsCheckboxRadioFrame.cpp @@ -40,7 +40,7 @@ void nsCheckboxRadioFrame::DestroyFrom(nsIFrame* aDestructRoot, NS_IMPL_FRAMEARENA_HELPERS(nsCheckboxRadioFrame) NS_QUERYFRAME_HEAD(nsCheckboxRadioFrame) -NS_QUERYFRAME_ENTRY(nsIFormControlFrame) + NS_QUERYFRAME_ENTRY(nsIFormControlFrame) NS_QUERYFRAME_TAIL_INHERITING(nsAtomicContainerFrame) /* virtual */ nscoord nsCheckboxRadioFrame::GetMinISize( diff --git a/layout/forms/nsColorControlFrame.cpp b/layout/forms/nsColorControlFrame.cpp index 7132905470a4..25c364676593 100644 --- a/layout/forms/nsColorControlFrame.cpp +++ b/layout/forms/nsColorControlFrame.cpp @@ -31,8 +31,8 @@ nsIFrame* NS_NewColorControlFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsColorControlFrame) NS_QUERYFRAME_HEAD(nsColorControlFrame) -NS_QUERYFRAME_ENTRY(nsColorControlFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsColorControlFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsHTMLButtonControlFrame) void nsColorControlFrame::DestroyFrom(nsIFrame* aDestructRoot, diff --git a/layout/forms/nsComboboxControlFrame.cpp b/layout/forms/nsComboboxControlFrame.cpp index 125aa7d0d93c..5edb0cab2d12 100644 --- a/layout/forms/nsComboboxControlFrame.cpp +++ b/layout/forms/nsComboboxControlFrame.cpp @@ -239,11 +239,11 @@ nsComboboxControlFrame::nsComboboxControlFrame(ComputedStyle* aStyle) //-------------------------------------------------------------- NS_QUERYFRAME_HEAD(nsComboboxControlFrame) -NS_QUERYFRAME_ENTRY(nsComboboxControlFrame) -NS_QUERYFRAME_ENTRY(nsIFormControlFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) -NS_QUERYFRAME_ENTRY(nsISelectControlFrame) -NS_QUERYFRAME_ENTRY(nsIStatefulFrame) + NS_QUERYFRAME_ENTRY(nsComboboxControlFrame) + NS_QUERYFRAME_ENTRY(nsIFormControlFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsISelectControlFrame) + NS_QUERYFRAME_ENTRY(nsIStatefulFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) #ifdef ACCESSIBILITY diff --git a/layout/forms/nsDateTimeControlFrame.cpp b/layout/forms/nsDateTimeControlFrame.cpp index 61d9ab24d899..3f222e3b2d62 100644 --- a/layout/forms/nsDateTimeControlFrame.cpp +++ b/layout/forms/nsDateTimeControlFrame.cpp @@ -37,8 +37,8 @@ nsIFrame* NS_NewDateTimeControlFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsDateTimeControlFrame) NS_QUERYFRAME_HEAD(nsDateTimeControlFrame) -NS_QUERYFRAME_ENTRY(nsDateTimeControlFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsDateTimeControlFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) nsDateTimeControlFrame::nsDateTimeControlFrame(ComputedStyle* aStyle) diff --git a/layout/forms/nsFileControlFrame.cpp b/layout/forms/nsFileControlFrame.cpp index 87873b58f7b9..cecf24bf3698 100644 --- a/layout/forms/nsFileControlFrame.cpp +++ b/layout/forms/nsFileControlFrame.cpp @@ -302,8 +302,8 @@ void nsFileControlFrame::AppendAnonymousContentTo( } NS_QUERYFRAME_HEAD(nsFileControlFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) -NS_QUERYFRAME_ENTRY(nsIFormControlFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsIFormControlFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) void nsFileControlFrame::SetFocus(bool aOn, bool aRepaint) {} diff --git a/layout/forms/nsGfxButtonControlFrame.cpp b/layout/forms/nsGfxButtonControlFrame.cpp index 9de844b248a7..3c3f4a6791d9 100644 --- a/layout/forms/nsGfxButtonControlFrame.cpp +++ b/layout/forms/nsGfxButtonControlFrame.cpp @@ -61,7 +61,7 @@ void nsGfxButtonControlFrame::AppendAnonymousContentTo( } NS_QUERYFRAME_HEAD(nsGfxButtonControlFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsHTMLButtonControlFrame) // Initially we hardcoded the default strings here. diff --git a/layout/forms/nsHTMLButtonControlFrame.cpp b/layout/forms/nsHTMLButtonControlFrame.cpp index b6dcdc50d130..8a983c45052a 100644 --- a/layout/forms/nsHTMLButtonControlFrame.cpp +++ b/layout/forms/nsHTMLButtonControlFrame.cpp @@ -47,7 +47,7 @@ void nsHTMLButtonControlFrame::Init(nsIContent* aContent, } NS_QUERYFRAME_HEAD(nsHTMLButtonControlFrame) -NS_QUERYFRAME_ENTRY(nsIFormControlFrame) + NS_QUERYFRAME_ENTRY(nsIFormControlFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef ACCESSIBILITY diff --git a/layout/forms/nsImageControlFrame.cpp b/layout/forms/nsImageControlFrame.cpp index 6762e4bc78c3..82cd74ae71cb 100644 --- a/layout/forms/nsImageControlFrame.cpp +++ b/layout/forms/nsImageControlFrame.cpp @@ -89,7 +89,7 @@ void nsImageControlFrame::Init(nsIContent* aContent, nsContainerFrame* aParent, } NS_QUERYFRAME_HEAD(nsImageControlFrame) -NS_QUERYFRAME_ENTRY(nsIFormControlFrame) + NS_QUERYFRAME_ENTRY(nsIFormControlFrame) NS_QUERYFRAME_TAIL_INHERITING(nsImageFrame) #ifdef ACCESSIBILITY diff --git a/layout/forms/nsLegendFrame.cpp b/layout/forms/nsLegendFrame.cpp index 6a508572e19c..2d5fb44bfbae 100644 --- a/layout/forms/nsLegendFrame.cpp +++ b/layout/forms/nsLegendFrame.cpp @@ -39,7 +39,7 @@ void nsLegendFrame::DestroyFrom(nsIFrame* aDestructRoot, } NS_QUERYFRAME_HEAD(nsLegendFrame) -NS_QUERYFRAME_ENTRY(nsLegendFrame) + NS_QUERYFRAME_ENTRY(nsLegendFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) void nsLegendFrame::Reflow(nsPresContext* aPresContext, diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp index 5d9e433e1fe5..3c34ed830349 100644 --- a/layout/forms/nsListControlFrame.cpp +++ b/layout/forms/nsListControlFrame.cpp @@ -251,9 +251,9 @@ void nsListControlFrame::InvalidateFocus() { } NS_QUERYFRAME_HEAD(nsListControlFrame) -NS_QUERYFRAME_ENTRY(nsIFormControlFrame) -NS_QUERYFRAME_ENTRY(nsISelectControlFrame) -NS_QUERYFRAME_ENTRY(nsListControlFrame) + NS_QUERYFRAME_ENTRY(nsIFormControlFrame) + NS_QUERYFRAME_ENTRY(nsISelectControlFrame) + NS_QUERYFRAME_ENTRY(nsListControlFrame) NS_QUERYFRAME_TAIL_INHERITING(nsHTMLScrollFrame) #ifdef ACCESSIBILITY diff --git a/layout/forms/nsMeterFrame.cpp b/layout/forms/nsMeterFrame.cpp index fd62cfdbbeaa..ec4b56a79524 100644 --- a/layout/forms/nsMeterFrame.cpp +++ b/layout/forms/nsMeterFrame.cpp @@ -71,8 +71,8 @@ void nsMeterFrame::AppendAnonymousContentTo(nsTArray& aElements, } NS_QUERYFRAME_HEAD(nsMeterFrame) -NS_QUERYFRAME_ENTRY(nsMeterFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsMeterFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) void nsMeterFrame::Reflow(nsPresContext* aPresContext, diff --git a/layout/forms/nsNumberControlFrame.cpp b/layout/forms/nsNumberControlFrame.cpp index 380adea0e136..7739f22bd6e9 100644 --- a/layout/forms/nsNumberControlFrame.cpp +++ b/layout/forms/nsNumberControlFrame.cpp @@ -40,9 +40,9 @@ nsIFrame* NS_NewNumberControlFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsNumberControlFrame) NS_QUERYFRAME_HEAD(nsNumberControlFrame) -NS_QUERYFRAME_ENTRY(nsNumberControlFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) -NS_QUERYFRAME_ENTRY(nsIFormControlFrame) + NS_QUERYFRAME_ENTRY(nsNumberControlFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsIFormControlFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) nsNumberControlFrame::nsNumberControlFrame(ComputedStyle* aStyle) diff --git a/layout/forms/nsProgressFrame.cpp b/layout/forms/nsProgressFrame.cpp index 9686a228ae3f..e164a9c6d2bf 100644 --- a/layout/forms/nsProgressFrame.cpp +++ b/layout/forms/nsProgressFrame.cpp @@ -70,8 +70,8 @@ void nsProgressFrame::AppendAnonymousContentTo(nsTArray& aElements, } NS_QUERYFRAME_HEAD(nsProgressFrame) -NS_QUERYFRAME_ENTRY(nsProgressFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsProgressFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) void nsProgressFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder, diff --git a/layout/forms/nsRangeFrame.cpp b/layout/forms/nsRangeFrame.cpp index 2b412d2d3ab2..21cbfd873e75 100644 --- a/layout/forms/nsRangeFrame.cpp +++ b/layout/forms/nsRangeFrame.cpp @@ -52,8 +52,8 @@ nsRangeFrame::~nsRangeFrame() {} NS_IMPL_FRAMEARENA_HELPERS(nsRangeFrame) NS_QUERYFRAME_HEAD(nsRangeFrame) -NS_QUERYFRAME_ENTRY(nsRangeFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsRangeFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) void nsRangeFrame::Init(nsIContent* aContent, nsContainerFrame* aParent, diff --git a/layout/forms/nsTextControlFrame.cpp b/layout/forms/nsTextControlFrame.cpp index ae533ba9fc2f..a140f169e4b2 100644 --- a/layout/forms/nsTextControlFrame.cpp +++ b/layout/forms/nsTextControlFrame.cpp @@ -59,10 +59,10 @@ nsIFrame* NS_NewTextControlFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsTextControlFrame) NS_QUERYFRAME_HEAD(nsTextControlFrame) -NS_QUERYFRAME_ENTRY(nsIFormControlFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) -NS_QUERYFRAME_ENTRY(nsITextControlFrame) -NS_QUERYFRAME_ENTRY(nsIStatefulFrame) + NS_QUERYFRAME_ENTRY(nsIFormControlFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsITextControlFrame) + NS_QUERYFRAME_ENTRY(nsIStatefulFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef ACCESSIBILITY diff --git a/layout/generic/ColumnSetWrapperFrame.cpp b/layout/generic/ColumnSetWrapperFrame.cpp index eecbcd13ff81..31d1aa968831 100644 --- a/layout/generic/ColumnSetWrapperFrame.cpp +++ b/layout/generic/ColumnSetWrapperFrame.cpp @@ -27,7 +27,7 @@ nsBlockFrame* NS_NewColumnSetWrapperFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(ColumnSetWrapperFrame) NS_QUERYFRAME_HEAD(ColumnSetWrapperFrame) -NS_QUERYFRAME_ENTRY(ColumnSetWrapperFrame) + NS_QUERYFRAME_ENTRY(ColumnSetWrapperFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) ColumnSetWrapperFrame::ColumnSetWrapperFrame(ComputedStyle* aStyle) diff --git a/layout/generic/DetailsFrame.cpp b/layout/generic/DetailsFrame.cpp index eef2160789ae..4971801f2e78 100644 --- a/layout/generic/DetailsFrame.cpp +++ b/layout/generic/DetailsFrame.cpp @@ -19,8 +19,8 @@ using namespace mozilla::dom; NS_IMPL_FRAMEARENA_HELPERS(DetailsFrame) NS_QUERYFRAME_HEAD(DetailsFrame) -NS_QUERYFRAME_ENTRY(DetailsFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(DetailsFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) nsBlockFrame* NS_NewDetailsFrame(nsIPresShell* aPresShell, diff --git a/layout/generic/ViewportFrame.cpp b/layout/generic/ViewportFrame.cpp index e659345ad1be..0e22e9500df4 100644 --- a/layout/generic/ViewportFrame.cpp +++ b/layout/generic/ViewportFrame.cpp @@ -32,7 +32,7 @@ ViewportFrame* NS_NewViewportFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(ViewportFrame) NS_QUERYFRAME_HEAD(ViewportFrame) -NS_QUERYFRAME_ENTRY(ViewportFrame) + NS_QUERYFRAME_ENTRY(ViewportFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) void ViewportFrame::Init(nsIContent* aContent, nsContainerFrame* aParent, diff --git a/layout/generic/nsBlockFrame.cpp b/layout/generic/nsBlockFrame.cpp index f98d65e337df..74928071d285 100644 --- a/layout/generic/nsBlockFrame.cpp +++ b/layout/generic/nsBlockFrame.cpp @@ -376,7 +376,7 @@ void nsBlockFrame::DestroyFrom(nsIFrame* aDestructRoot, } NS_QUERYFRAME_HEAD(nsBlockFrame) -NS_QUERYFRAME_ENTRY(nsBlockFrame) + NS_QUERYFRAME_ENTRY(nsBlockFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef DEBUG_FRAME_DUMP diff --git a/layout/generic/nsBulletFrame.cpp b/layout/generic/nsBulletFrame.cpp index a02426ae3327..ba74f3ba5a28 100644 --- a/layout/generic/nsBulletFrame.cpp +++ b/layout/generic/nsBulletFrame.cpp @@ -59,7 +59,7 @@ NS_IMPL_FRAMEARENA_HELPERS(nsBulletFrame) #ifdef DEBUG NS_QUERYFRAME_HEAD(nsBulletFrame) -NS_QUERYFRAME_ENTRY(nsBulletFrame) + NS_QUERYFRAME_ENTRY(nsBulletFrame) NS_QUERYFRAME_TAIL_INHERITING(nsFrame) #endif diff --git a/layout/generic/nsCanvasFrame.cpp b/layout/generic/nsCanvasFrame.cpp index 30beb4dd332c..af90c2403561 100644 --- a/layout/generic/nsCanvasFrame.cpp +++ b/layout/generic/nsCanvasFrame.cpp @@ -51,9 +51,9 @@ nsCanvasFrame* NS_NewCanvasFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsCanvasFrame) NS_QUERYFRAME_HEAD(nsCanvasFrame) -NS_QUERYFRAME_ENTRY(nsCanvasFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) -NS_QUERYFRAME_ENTRY(nsIPopupContainer) + NS_QUERYFRAME_ENTRY(nsCanvasFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsIPopupContainer) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) void nsCanvasFrame::ShowCustomContentContainer() { diff --git a/layout/generic/nsContainerFrame.cpp b/layout/generic/nsContainerFrame.cpp index b7e45447a2bf..dfb61f3b66c0 100644 --- a/layout/generic/nsContainerFrame.cpp +++ b/layout/generic/nsContainerFrame.cpp @@ -46,7 +46,7 @@ using namespace mozilla::layout; nsContainerFrame::~nsContainerFrame() {} NS_QUERYFRAME_HEAD(nsContainerFrame) -NS_QUERYFRAME_ENTRY(nsContainerFrame) + NS_QUERYFRAME_ENTRY(nsContainerFrame) NS_QUERYFRAME_TAIL_INHERITING(nsSplittableFrame) void nsContainerFrame::Init(nsIContent* aContent, nsContainerFrame* aParent, diff --git a/layout/generic/nsFirstLetterFrame.cpp b/layout/generic/nsFirstLetterFrame.cpp index 3ef23f6ceaf5..e4a73da0c862 100644 --- a/layout/generic/nsFirstLetterFrame.cpp +++ b/layout/generic/nsFirstLetterFrame.cpp @@ -29,7 +29,7 @@ nsFirstLetterFrame* NS_NewFirstLetterFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsFirstLetterFrame) NS_QUERYFRAME_HEAD(nsFirstLetterFrame) -NS_QUERYFRAME_ENTRY(nsFirstLetterFrame) + NS_QUERYFRAME_ENTRY(nsFirstLetterFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef DEBUG_FRAME_DUMP diff --git a/layout/generic/nsFlexContainerFrame.cpp b/layout/generic/nsFlexContainerFrame.cpp index 6d8e7a7220a8..04fa2b648013 100644 --- a/layout/generic/nsFlexContainerFrame.cpp +++ b/layout/generic/nsFlexContainerFrame.cpp @@ -2318,7 +2318,7 @@ class MOZ_STACK_CLASS SingleLineCrossAxisPositionTracker // ======================= NS_QUERYFRAME_HEAD(nsFlexContainerFrame) -NS_QUERYFRAME_ENTRY(nsFlexContainerFrame) + NS_QUERYFRAME_ENTRY(nsFlexContainerFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) NS_IMPL_FRAMEARENA_HELPERS(nsFlexContainerFrame) diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index cf818da147b6..33ab05e55fad 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -475,7 +475,7 @@ void nsFrame::operator delete(void*, size_t) { } NS_QUERYFRAME_HEAD(nsFrame) -NS_QUERYFRAME_ENTRY(nsIFrame) + NS_QUERYFRAME_ENTRY(nsIFrame) NS_QUERYFRAME_TAIL_INHERITANCE_ROOT ///////////////////////////////////////////////////////////////////////////// diff --git a/layout/generic/nsFrameSetFrame.cpp b/layout/generic/nsFrameSetFrame.cpp index 310ff7c4a8d1..b153cd93dc38 100644 --- a/layout/generic/nsFrameSetFrame.cpp +++ b/layout/generic/nsFrameSetFrame.cpp @@ -182,7 +182,7 @@ nsHTMLFramesetFrame::nsHTMLFramesetFrame(ComputedStyle* aStyle) nsHTMLFramesetFrame::~nsHTMLFramesetFrame() {} NS_QUERYFRAME_HEAD(nsHTMLFramesetFrame) -NS_QUERYFRAME_ENTRY(nsHTMLFramesetFrame) + NS_QUERYFRAME_ENTRY(nsHTMLFramesetFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) void nsHTMLFramesetFrame::Init(nsIContent* aContent, nsContainerFrame* aParent, @@ -1487,7 +1487,7 @@ nsresult nsHTMLFramesetBorderFrame::GetFrameName(nsAString& aResult) const { ******************************************************************************/ NS_QUERYFRAME_HEAD(nsHTMLFramesetBlankFrame) -NS_QUERYFRAME_ENTRY(nsHTMLFramesetBlankFrame) + NS_QUERYFRAME_ENTRY(nsHTMLFramesetBlankFrame) NS_QUERYFRAME_TAIL_INHERITING(nsLeafFrame) NS_IMPL_FRAMEARENA_HELPERS(nsHTMLFramesetBlankFrame) diff --git a/layout/generic/nsGfxScrollFrame.cpp b/layout/generic/nsGfxScrollFrame.cpp index 38b078de07d3..87e39200e1e8 100644 --- a/layout/generic/nsGfxScrollFrame.cpp +++ b/layout/generic/nsGfxScrollFrame.cpp @@ -1150,10 +1150,10 @@ a11y::AccType nsHTMLScrollFrame::AccessibleType() { #endif NS_QUERYFRAME_HEAD(nsHTMLScrollFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) -NS_QUERYFRAME_ENTRY(nsIScrollableFrame) -NS_QUERYFRAME_ENTRY(nsIStatefulFrame) -NS_QUERYFRAME_ENTRY(nsIScrollbarMediator) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsIScrollableFrame) + NS_QUERYFRAME_ENTRY(nsIStatefulFrame) + NS_QUERYFRAME_ENTRY(nsIScrollbarMediator) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) //----------nsXULScrollFrame------------------------------------------- @@ -1587,10 +1587,10 @@ nsXULScrollFrame::DoXULLayout(nsBoxLayoutState& aState) { } NS_QUERYFRAME_HEAD(nsXULScrollFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) -NS_QUERYFRAME_ENTRY(nsIScrollableFrame) -NS_QUERYFRAME_ENTRY(nsIStatefulFrame) -NS_QUERYFRAME_ENTRY(nsIScrollbarMediator) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsIScrollableFrame) + NS_QUERYFRAME_ENTRY(nsIStatefulFrame) + NS_QUERYFRAME_ENTRY(nsIScrollbarMediator) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) //-------------------- Helper ---------------------- diff --git a/layout/generic/nsGridContainerFrame.cpp b/layout/generic/nsGridContainerFrame.cpp index ea66d4d50577..5d18635cb332 100644 --- a/layout/generic/nsGridContainerFrame.cpp +++ b/layout/generic/nsGridContainerFrame.cpp @@ -2484,7 +2484,7 @@ static uint16_t GetAlignJustifyFallbackIfAny(uint16_t aAlignment, // ======================= NS_QUERYFRAME_HEAD(nsGridContainerFrame) -NS_QUERYFRAME_ENTRY(nsGridContainerFrame) + NS_QUERYFRAME_ENTRY(nsGridContainerFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) NS_IMPL_FRAMEARENA_HELPERS(nsGridContainerFrame) diff --git a/layout/generic/nsHTMLCanvasFrame.cpp b/layout/generic/nsHTMLCanvasFrame.cpp index 658441074eac..75fa26717dce 100644 --- a/layout/generic/nsHTMLCanvasFrame.cpp +++ b/layout/generic/nsHTMLCanvasFrame.cpp @@ -231,7 +231,7 @@ nsIFrame* NS_NewHTMLCanvasFrame(nsIPresShell* aPresShell, } NS_QUERYFRAME_HEAD(nsHTMLCanvasFrame) -NS_QUERYFRAME_ENTRY(nsHTMLCanvasFrame) + NS_QUERYFRAME_ENTRY(nsHTMLCanvasFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) NS_IMPL_FRAMEARENA_HELPERS(nsHTMLCanvasFrame) diff --git a/layout/generic/nsImageFrame.cpp b/layout/generic/nsImageFrame.cpp index e605c74b9bbd..00a38e8aac07 100644 --- a/layout/generic/nsImageFrame.cpp +++ b/layout/generic/nsImageFrame.cpp @@ -193,7 +193,7 @@ nsImageFrame::nsImageFrame(ComputedStyle* aStyle, ClassID aID, Kind aKind) nsImageFrame::~nsImageFrame() {} NS_QUERYFRAME_HEAD(nsImageFrame) -NS_QUERYFRAME_ENTRY(nsImageFrame) + NS_QUERYFRAME_ENTRY(nsImageFrame) NS_QUERYFRAME_TAIL_INHERITING(nsAtomicContainerFrame) #ifdef ACCESSIBILITY diff --git a/layout/generic/nsInlineFrame.cpp b/layout/generic/nsInlineFrame.cpp index 203f299b2bf1..6b8d0437c580 100644 --- a/layout/generic/nsInlineFrame.cpp +++ b/layout/generic/nsInlineFrame.cpp @@ -42,7 +42,7 @@ nsInlineFrame* NS_NewInlineFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsInlineFrame) NS_QUERYFRAME_HEAD(nsInlineFrame) -NS_QUERYFRAME_ENTRY(nsInlineFrame) + NS_QUERYFRAME_ENTRY(nsInlineFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef DEBUG_FRAME_DUMP diff --git a/layout/generic/nsPageFrame.cpp b/layout/generic/nsPageFrame.cpp index ea561769ebed..c92d64fb742d 100644 --- a/layout/generic/nsPageFrame.cpp +++ b/layout/generic/nsPageFrame.cpp @@ -35,7 +35,7 @@ nsPageFrame* NS_NewPageFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle) { NS_IMPL_FRAMEARENA_HELPERS(nsPageFrame) NS_QUERYFRAME_HEAD(nsPageFrame) -NS_QUERYFRAME_ENTRY(nsPageFrame) + NS_QUERYFRAME_ENTRY(nsPageFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) nsPageFrame::nsPageFrame(ComputedStyle* aStyle) diff --git a/layout/generic/nsPlaceholderFrame.cpp b/layout/generic/nsPlaceholderFrame.cpp index 4b0921c17f42..4b8c744aaacc 100644 --- a/layout/generic/nsPlaceholderFrame.cpp +++ b/layout/generic/nsPlaceholderFrame.cpp @@ -36,7 +36,7 @@ NS_IMPL_FRAMEARENA_HELPERS(nsPlaceholderFrame) #ifdef DEBUG NS_QUERYFRAME_HEAD(nsPlaceholderFrame) -NS_QUERYFRAME_ENTRY(nsPlaceholderFrame) + NS_QUERYFRAME_ENTRY(nsPlaceholderFrame) NS_QUERYFRAME_TAIL_INHERITING(nsFrame) #endif diff --git a/layout/generic/nsPluginFrame.cpp b/layout/generic/nsPluginFrame.cpp index 56d31f3c9dd4..de1d571dc30f 100644 --- a/layout/generic/nsPluginFrame.cpp +++ b/layout/generic/nsPluginFrame.cpp @@ -150,8 +150,8 @@ nsPluginFrame::~nsPluginFrame() { } NS_QUERYFRAME_HEAD(nsPluginFrame) -NS_QUERYFRAME_ENTRY(nsPluginFrame) -NS_QUERYFRAME_ENTRY(nsIObjectFrame) + NS_QUERYFRAME_ENTRY(nsPluginFrame) + NS_QUERYFRAME_ENTRY(nsIObjectFrame) NS_QUERYFRAME_TAIL_INHERITING(nsFrame) #ifdef ACCESSIBILITY diff --git a/layout/generic/nsRubyBaseContainerFrame.cpp b/layout/generic/nsRubyBaseContainerFrame.cpp index 81ca0ff8808b..3f1f5fb4aa22 100644 --- a/layout/generic/nsRubyBaseContainerFrame.cpp +++ b/layout/generic/nsRubyBaseContainerFrame.cpp @@ -30,7 +30,7 @@ using namespace mozilla::gfx; // ======================= NS_QUERYFRAME_HEAD(nsRubyBaseContainerFrame) -NS_QUERYFRAME_ENTRY(nsRubyBaseContainerFrame) + NS_QUERYFRAME_ENTRY(nsRubyBaseContainerFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) NS_IMPL_FRAMEARENA_HELPERS(nsRubyBaseContainerFrame) diff --git a/layout/generic/nsRubyBaseFrame.cpp b/layout/generic/nsRubyBaseFrame.cpp index 6c7a9211e5ce..cbab9d3aeac6 100644 --- a/layout/generic/nsRubyBaseFrame.cpp +++ b/layout/generic/nsRubyBaseFrame.cpp @@ -21,7 +21,7 @@ using namespace mozilla; // ======================= NS_QUERYFRAME_HEAD(nsRubyBaseFrame) -NS_QUERYFRAME_ENTRY(nsRubyBaseFrame) + NS_QUERYFRAME_ENTRY(nsRubyBaseFrame) NS_QUERYFRAME_TAIL_INHERITING(nsRubyContentFrame) NS_IMPL_FRAMEARENA_HELPERS(nsRubyBaseFrame) diff --git a/layout/generic/nsRubyFrame.cpp b/layout/generic/nsRubyFrame.cpp index 252b0ba991ee..41c1c9efd4f7 100644 --- a/layout/generic/nsRubyFrame.cpp +++ b/layout/generic/nsRubyFrame.cpp @@ -25,7 +25,7 @@ using namespace mozilla; // ======================= NS_QUERYFRAME_HEAD(nsRubyFrame) -NS_QUERYFRAME_ENTRY(nsRubyFrame) + NS_QUERYFRAME_ENTRY(nsRubyFrame) NS_QUERYFRAME_TAIL_INHERITING(nsInlineFrame) NS_IMPL_FRAMEARENA_HELPERS(nsRubyFrame) diff --git a/layout/generic/nsRubyTextContainerFrame.cpp b/layout/generic/nsRubyTextContainerFrame.cpp index 3ac53cb74618..2bf145f728b3 100644 --- a/layout/generic/nsRubyTextContainerFrame.cpp +++ b/layout/generic/nsRubyTextContainerFrame.cpp @@ -22,7 +22,7 @@ using namespace mozilla; // ======================= NS_QUERYFRAME_HEAD(nsRubyTextContainerFrame) -NS_QUERYFRAME_ENTRY(nsRubyTextContainerFrame) + NS_QUERYFRAME_ENTRY(nsRubyTextContainerFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) NS_IMPL_FRAMEARENA_HELPERS(nsRubyTextContainerFrame) diff --git a/layout/generic/nsRubyTextFrame.cpp b/layout/generic/nsRubyTextFrame.cpp index 9c1a603e259e..e3998129266c 100644 --- a/layout/generic/nsRubyTextFrame.cpp +++ b/layout/generic/nsRubyTextFrame.cpp @@ -21,7 +21,7 @@ using namespace mozilla; // ======================= NS_QUERYFRAME_HEAD(nsRubyTextFrame) -NS_QUERYFRAME_ENTRY(nsRubyTextFrame) + NS_QUERYFRAME_ENTRY(nsRubyTextFrame) NS_QUERYFRAME_TAIL_INHERITING(nsRubyContentFrame) NS_IMPL_FRAMEARENA_HELPERS(nsRubyTextFrame) diff --git a/layout/generic/nsSimplePageSequenceFrame.cpp b/layout/generic/nsSimplePageSequenceFrame.cpp index ed2a02047d27..a0c76d48715f 100644 --- a/layout/generic/nsSimplePageSequenceFrame.cpp +++ b/layout/generic/nsSimplePageSequenceFrame.cpp @@ -68,7 +68,7 @@ nsSimplePageSequenceFrame::~nsSimplePageSequenceFrame() { } NS_QUERYFRAME_HEAD(nsSimplePageSequenceFrame) -NS_QUERYFRAME_ENTRY(nsIPageSequenceFrame) + NS_QUERYFRAME_ENTRY(nsIPageSequenceFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) //---------------------------------------------------------------------- diff --git a/layout/generic/nsSubDocumentFrame.cpp b/layout/generic/nsSubDocumentFrame.cpp index b7fdec7b8e19..6d84250a2bac 100644 --- a/layout/generic/nsSubDocumentFrame.cpp +++ b/layout/generic/nsSubDocumentFrame.cpp @@ -74,7 +74,7 @@ a11y::AccType nsSubDocumentFrame::AccessibleType() { #endif NS_QUERYFRAME_HEAD(nsSubDocumentFrame) -NS_QUERYFRAME_ENTRY(nsSubDocumentFrame) + NS_QUERYFRAME_ENTRY(nsSubDocumentFrame) NS_QUERYFRAME_TAIL_INHERITING(nsAtomicContainerFrame) class AsyncFrameInit : public Runnable { diff --git a/layout/generic/nsTextFrame.cpp b/layout/generic/nsTextFrame.cpp index 6aa2cfa25af8..3d30b8422b11 100644 --- a/layout/generic/nsTextFrame.cpp +++ b/layout/generic/nsTextFrame.cpp @@ -2781,7 +2781,7 @@ void BuildTextRunsScanner::AssignTextRun(gfxTextRun* aTextRun, } NS_QUERYFRAME_HEAD(nsTextFrame) -NS_QUERYFRAME_ENTRY(nsTextFrame) + NS_QUERYFRAME_ENTRY(nsTextFrame) NS_QUERYFRAME_TAIL_INHERITING(nsFrame) gfxSkipCharsIterator nsTextFrame::EnsureTextRun( diff --git a/layout/generic/nsVideoFrame.cpp b/layout/generic/nsVideoFrame.cpp index a380c41b03ea..feb64bb7e6e2 100644 --- a/layout/generic/nsVideoFrame.cpp +++ b/layout/generic/nsVideoFrame.cpp @@ -79,8 +79,8 @@ nsVideoFrame::nsVideoFrame(ComputedStyle* aStyle) nsVideoFrame::~nsVideoFrame() {} NS_QUERYFRAME_HEAD(nsVideoFrame) -NS_QUERYFRAME_ENTRY(nsVideoFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsVideoFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) nsresult nsVideoFrame::CreateAnonymousContent( diff --git a/layout/mathml/nsMathMLContainerFrame.cpp b/layout/mathml/nsMathMLContainerFrame.cpp index ae4e676cb4e9..0982c44e8d6e 100644 --- a/layout/mathml/nsMathMLContainerFrame.cpp +++ b/layout/mathml/nsMathMLContainerFrame.cpp @@ -29,8 +29,8 @@ using namespace mozilla::gfx; // NS_QUERYFRAME_HEAD(nsMathMLContainerFrame) -NS_QUERYFRAME_ENTRY(nsIMathMLFrame) -NS_QUERYFRAME_ENTRY(nsMathMLContainerFrame) + NS_QUERYFRAME_ENTRY(nsIMathMLFrame) + NS_QUERYFRAME_ENTRY(nsMathMLContainerFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) // ============================================================================= @@ -1459,7 +1459,7 @@ nsContainerFrame* NS_NewMathMLmathBlockFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsMathMLmathBlockFrame) NS_QUERYFRAME_HEAD(nsMathMLmathBlockFrame) -NS_QUERYFRAME_ENTRY(nsMathMLmathBlockFrame) + NS_QUERYFRAME_ENTRY(nsMathMLmathBlockFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) nsContainerFrame* NS_NewMathMLmathInlineFrame(nsIPresShell* aPresShell, @@ -1470,5 +1470,5 @@ nsContainerFrame* NS_NewMathMLmathInlineFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsMathMLmathInlineFrame) NS_QUERYFRAME_HEAD(nsMathMLmathInlineFrame) -NS_QUERYFRAME_ENTRY(nsIMathMLFrame) + NS_QUERYFRAME_ENTRY(nsIMathMLFrame) NS_QUERYFRAME_TAIL_INHERITING(nsInlineFrame) diff --git a/layout/mathml/nsMathMLmtableFrame.cpp b/layout/mathml/nsMathMLmtableFrame.cpp index 6b5ece53bf7e..2e5207c15f0b 100644 --- a/layout/mathml/nsMathMLmtableFrame.cpp +++ b/layout/mathml/nsMathMLmtableFrame.cpp @@ -649,7 +649,7 @@ static void ListMathMLTree(nsIFrame* atLeast) { // implementation of nsMathMLmtableWrapperFrame NS_QUERYFRAME_HEAD(nsMathMLmtableWrapperFrame) -NS_QUERYFRAME_ENTRY(nsIMathMLFrame) + NS_QUERYFRAME_ENTRY(nsIMathMLFrame) NS_QUERYFRAME_TAIL_INHERITING(nsTableWrapperFrame) nsContainerFrame* NS_NewMathMLmtableOuterFrame(nsIPresShell* aPresShell, @@ -1023,7 +1023,7 @@ void nsMathMLmtableFrame::SetUseCSSSpacing() { } NS_QUERYFRAME_HEAD(nsMathMLmtableFrame) -NS_QUERYFRAME_ENTRY(nsMathMLmtableFrame) + NS_QUERYFRAME_ENTRY(nsMathMLmtableFrame) NS_QUERYFRAME_TAIL_INHERITING(nsTableFrame) // -------- @@ -1164,7 +1164,7 @@ nsMargin nsMathMLmtdFrame::GetBorderOverflow() { // implementation of nsMathMLmtdInnerFrame NS_QUERYFRAME_HEAD(nsMathMLmtdInnerFrame) -NS_QUERYFRAME_ENTRY(nsIMathMLFrame) + NS_QUERYFRAME_ENTRY(nsIMathMLFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBlockFrame) nsContainerFrame* NS_NewMathMLmtdInnerFrame(nsIPresShell* aPresShell, diff --git a/layout/svg/SVGGeometryFrame.cpp b/layout/svg/SVGGeometryFrame.cpp index b71846ecccba..744ae6a88ad6 100644 --- a/layout/svg/SVGGeometryFrame.cpp +++ b/layout/svg/SVGGeometryFrame.cpp @@ -48,8 +48,8 @@ NS_IMPL_FRAMEARENA_HELPERS(SVGGeometryFrame) // nsQueryFrame methods NS_QUERYFRAME_HEAD(SVGGeometryFrame) -NS_QUERYFRAME_ENTRY(nsSVGDisplayableFrame) -NS_QUERYFRAME_ENTRY(SVGGeometryFrame) + NS_QUERYFRAME_ENTRY(nsSVGDisplayableFrame) + NS_QUERYFRAME_ENTRY(SVGGeometryFrame) NS_QUERYFRAME_TAIL_INHERITING(nsFrame) //---------------------------------------------------------------------- diff --git a/layout/svg/SVGTextFrame.cpp b/layout/svg/SVGTextFrame.cpp index 6bb21800f370..d6d484885c7d 100644 --- a/layout/svg/SVGTextFrame.cpp +++ b/layout/svg/SVGTextFrame.cpp @@ -2904,7 +2904,7 @@ void nsDisplaySVGText::Paint(nsDisplayListBuilder* aBuilder, gfxContext* aCtx) { // nsQueryFrame methods NS_QUERYFRAME_HEAD(SVGTextFrame) -NS_QUERYFRAME_ENTRY(SVGTextFrame) + NS_QUERYFRAME_ENTRY(SVGTextFrame) NS_QUERYFRAME_TAIL_INHERITING(nsSVGDisplayContainerFrame) // --------------------------------------------------------------------- diff --git a/layout/svg/nsSVGContainerFrame.cpp b/layout/svg/nsSVGContainerFrame.cpp index c0b7e654f5b4..09f8b8eb8da1 100644 --- a/layout/svg/nsSVGContainerFrame.cpp +++ b/layout/svg/nsSVGContainerFrame.cpp @@ -21,12 +21,12 @@ using namespace mozilla; using namespace mozilla::image; NS_QUERYFRAME_HEAD(nsSVGContainerFrame) -NS_QUERYFRAME_ENTRY(nsSVGContainerFrame) + NS_QUERYFRAME_ENTRY(nsSVGContainerFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) NS_QUERYFRAME_HEAD(nsSVGDisplayContainerFrame) -NS_QUERYFRAME_ENTRY(nsSVGDisplayContainerFrame) -NS_QUERYFRAME_ENTRY(nsSVGDisplayableFrame) + NS_QUERYFRAME_ENTRY(nsSVGDisplayContainerFrame) + NS_QUERYFRAME_ENTRY(nsSVGDisplayableFrame) NS_QUERYFRAME_TAIL_INHERITING(nsSVGContainerFrame) nsIFrame* NS_NewSVGContainerFrame(nsIPresShell* aPresShell, diff --git a/layout/svg/nsSVGForeignObjectFrame.cpp b/layout/svg/nsSVGForeignObjectFrame.cpp index f1dab39c3df4..7bbb8ba2b661 100644 --- a/layout/svg/nsSVGForeignObjectFrame.cpp +++ b/layout/svg/nsSVGForeignObjectFrame.cpp @@ -47,7 +47,7 @@ nsSVGForeignObjectFrame::nsSVGForeignObjectFrame(ComputedStyle* aStyle) // nsIFrame methods NS_QUERYFRAME_HEAD(nsSVGForeignObjectFrame) -NS_QUERYFRAME_ENTRY(nsSVGDisplayableFrame) + NS_QUERYFRAME_ENTRY(nsSVGDisplayableFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) void nsSVGForeignObjectFrame::Init(nsIContent* aContent, diff --git a/layout/svg/nsSVGImageFrame.cpp b/layout/svg/nsSVGImageFrame.cpp index 36425db3c3d7..9364e8e35254 100644 --- a/layout/svg/nsSVGImageFrame.cpp +++ b/layout/svg/nsSVGImageFrame.cpp @@ -33,7 +33,7 @@ using namespace mozilla::image; // --------------------------------------------------------------------- // nsQueryFrame methods NS_QUERYFRAME_HEAD(nsSVGImageFrame) -NS_QUERYFRAME_ENTRY(nsSVGImageFrame) + NS_QUERYFRAME_ENTRY(nsSVGImageFrame) NS_QUERYFRAME_TAIL_INHERITING(SVGGeometryFrame) nsIFrame* NS_NewSVGImageFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle) { diff --git a/layout/svg/nsSVGInnerSVGFrame.cpp b/layout/svg/nsSVGInnerSVGFrame.cpp index 6abbc3cf810d..6084362c72db 100644 --- a/layout/svg/nsSVGInnerSVGFrame.cpp +++ b/layout/svg/nsSVGInnerSVGFrame.cpp @@ -20,8 +20,8 @@ NS_IMPL_FRAMEARENA_HELPERS(nsSVGInnerSVGFrame) // nsIFrame methods NS_QUERYFRAME_HEAD(nsSVGInnerSVGFrame) -NS_QUERYFRAME_ENTRY(nsSVGInnerSVGFrame) -NS_QUERYFRAME_ENTRY(nsISVGSVGFrame) + NS_QUERYFRAME_ENTRY(nsSVGInnerSVGFrame) + NS_QUERYFRAME_ENTRY(nsISVGSVGFrame) NS_QUERYFRAME_TAIL_INHERITING(nsSVGViewportFrame) #ifdef DEBUG diff --git a/layout/svg/nsSVGOuterSVGFrame.cpp b/layout/svg/nsSVGOuterSVGFrame.cpp index a3d1220b4c6c..7915661262a0 100644 --- a/layout/svg/nsSVGOuterSVGFrame.cpp +++ b/layout/svg/nsSVGOuterSVGFrame.cpp @@ -136,7 +136,7 @@ void nsSVGOuterSVGFrame::Init(nsIContent* aContent, nsContainerFrame* aParent, // nsQueryFrame methods NS_QUERYFRAME_HEAD(nsSVGOuterSVGFrame) -NS_QUERYFRAME_ENTRY(nsISVGSVGFrame) + NS_QUERYFRAME_ENTRY(nsISVGSVGFrame) NS_QUERYFRAME_TAIL_INHERITING(nsSVGDisplayContainerFrame) //---------------------------------------------------------------------- diff --git a/layout/svg/nsSVGSymbolFrame.cpp b/layout/svg/nsSVGSymbolFrame.cpp index ebbb00af6060..27e82a1a9753 100644 --- a/layout/svg/nsSVGSymbolFrame.cpp +++ b/layout/svg/nsSVGSymbolFrame.cpp @@ -20,7 +20,7 @@ NS_IMPL_FRAMEARENA_HELPERS(nsSVGSymbolFrame) // nsIFrame methods NS_QUERYFRAME_HEAD(nsSVGSymbolFrame) -NS_QUERYFRAME_ENTRY(nsSVGSymbolFrame) + NS_QUERYFRAME_ENTRY(nsSVGSymbolFrame) NS_QUERYFRAME_TAIL_INHERITING(nsSVGViewportFrame) #ifdef DEBUG diff --git a/layout/tables/nsTableCellFrame.cpp b/layout/tables/nsTableCellFrame.cpp index 4f23a68677e3..68242cbe44d5 100644 --- a/layout/tables/nsTableCellFrame.cpp +++ b/layout/tables/nsTableCellFrame.cpp @@ -950,9 +950,9 @@ void nsTableCellFrame::Reflow(nsPresContext* aPresContext, /* ----- global methods ----- */ NS_QUERYFRAME_HEAD(nsTableCellFrame) -NS_QUERYFRAME_ENTRY(nsTableCellFrame) -NS_QUERYFRAME_ENTRY(nsITableCellLayout) -NS_QUERYFRAME_ENTRY(nsIPercentBSizeObserver) + NS_QUERYFRAME_ENTRY(nsTableCellFrame) + NS_QUERYFRAME_ENTRY(nsITableCellLayout) + NS_QUERYFRAME_ENTRY(nsIPercentBSizeObserver) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef ACCESSIBILITY diff --git a/layout/tables/nsTableRowFrame.cpp b/layout/tables/nsTableRowFrame.cpp index 871f3ad406ca..75b93b594d24 100644 --- a/layout/tables/nsTableRowFrame.cpp +++ b/layout/tables/nsTableRowFrame.cpp @@ -114,7 +114,7 @@ void nsTableRowFrame::SetPctBSize(float aPctValue, bool aForce) { /* ----------- nsTableRowFrame ---------- */ NS_QUERYFRAME_HEAD(nsTableRowFrame) -NS_QUERYFRAME_ENTRY(nsTableRowFrame) + NS_QUERYFRAME_ENTRY(nsTableRowFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) nsTableRowFrame::nsTableRowFrame(ComputedStyle* aStyle, ClassID aID) diff --git a/layout/tables/nsTableRowGroupFrame.cpp b/layout/tables/nsTableRowGroupFrame.cpp index aed47e287b20..816bf99b0456 100644 --- a/layout/tables/nsTableRowGroupFrame.cpp +++ b/layout/tables/nsTableRowGroupFrame.cpp @@ -66,7 +66,7 @@ void nsTableRowGroupFrame::DestroyFrom(nsIFrame* aDestructRoot, } NS_QUERYFRAME_HEAD(nsTableRowGroupFrame) -NS_QUERYFRAME_ENTRY(nsTableRowGroupFrame) + NS_QUERYFRAME_ENTRY(nsTableRowGroupFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) int32_t nsTableRowGroupFrame::GetRowCount() { diff --git a/layout/tables/nsTableWrapperFrame.cpp b/layout/tables/nsTableWrapperFrame.cpp index a5e948f8c665..50efed74bf8e 100644 --- a/layout/tables/nsTableWrapperFrame.cpp +++ b/layout/tables/nsTableWrapperFrame.cpp @@ -46,7 +46,7 @@ nsTableWrapperFrame::nsTableWrapperFrame(ComputedStyle* aStyle, ClassID aID) nsTableWrapperFrame::~nsTableWrapperFrame() {} NS_QUERYFRAME_HEAD(nsTableWrapperFrame) -NS_QUERYFRAME_ENTRY(nsTableWrapperFrame) + NS_QUERYFRAME_ENTRY(nsTableWrapperFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #ifdef ACCESSIBILITY diff --git a/layout/xul/nsBoxFrame.cpp b/layout/xul/nsBoxFrame.cpp index d81cadac302a..f7f4aff3358f 100644 --- a/layout/xul/nsBoxFrame.cpp +++ b/layout/xul/nsBoxFrame.cpp @@ -99,7 +99,7 @@ NS_IMPL_FRAMEARENA_HELPERS(nsBoxFrame) #ifdef DEBUG NS_QUERYFRAME_HEAD(nsBoxFrame) -NS_QUERYFRAME_ENTRY(nsBoxFrame) + NS_QUERYFRAME_ENTRY(nsBoxFrame) NS_QUERYFRAME_TAIL_INHERITING(nsContainerFrame) #endif diff --git a/layout/xul/nsDeckFrame.cpp b/layout/xul/nsDeckFrame.cpp index ba82c786ea72..7669bf29aba0 100644 --- a/layout/xul/nsDeckFrame.cpp +++ b/layout/xul/nsDeckFrame.cpp @@ -42,7 +42,7 @@ nsIFrame* NS_NewDeckFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle) { NS_IMPL_FRAMEARENA_HELPERS(nsDeckFrame) NS_QUERYFRAME_HEAD(nsDeckFrame) -NS_QUERYFRAME_ENTRY(nsDeckFrame) + NS_QUERYFRAME_ENTRY(nsDeckFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) nsDeckFrame::nsDeckFrame(ComputedStyle* aStyle) diff --git a/layout/xul/nsDocElementBoxFrame.cpp b/layout/xul/nsDocElementBoxFrame.cpp index 53200d240b02..03518619e67b 100644 --- a/layout/xul/nsDocElementBoxFrame.cpp +++ b/layout/xul/nsDocElementBoxFrame.cpp @@ -129,7 +129,7 @@ void nsDocElementBoxFrame::AppendAnonymousContentTo( } NS_QUERYFRAME_HEAD(nsDocElementBoxFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) #ifdef DEBUG_FRAME_DUMP diff --git a/layout/xul/nsMenuBarFrame.cpp b/layout/xul/nsMenuBarFrame.cpp index ad39c5928593..d5ecfc904467 100644 --- a/layout/xul/nsMenuBarFrame.cpp +++ b/layout/xul/nsMenuBarFrame.cpp @@ -44,7 +44,7 @@ nsIFrame* NS_NewMenuBarFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle) { NS_IMPL_FRAMEARENA_HELPERS(nsMenuBarFrame) NS_QUERYFRAME_HEAD(nsMenuBarFrame) -NS_QUERYFRAME_ENTRY(nsMenuBarFrame) + NS_QUERYFRAME_ENTRY(nsMenuBarFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) // diff --git a/layout/xul/nsMenuFrame.cpp b/layout/xul/nsMenuFrame.cpp index d2e1f9787a20..a3557b9c9a93 100644 --- a/layout/xul/nsMenuFrame.cpp +++ b/layout/xul/nsMenuFrame.cpp @@ -156,7 +156,7 @@ nsIFrame* NS_NewMenuItemFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle) { NS_IMPL_FRAMEARENA_HELPERS(nsMenuFrame) NS_QUERYFRAME_HEAD(nsMenuFrame) -NS_QUERYFRAME_ENTRY(nsMenuFrame) + NS_QUERYFRAME_ENTRY(nsMenuFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) nsMenuFrame::nsMenuFrame(ComputedStyle* aStyle) diff --git a/layout/xul/nsMenuPopupFrame.cpp b/layout/xul/nsMenuPopupFrame.cpp index 9e4329098655..23bc63e40073 100644 --- a/layout/xul/nsMenuPopupFrame.cpp +++ b/layout/xul/nsMenuPopupFrame.cpp @@ -85,7 +85,7 @@ nsIFrame* NS_NewMenuPopupFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsMenuPopupFrame) NS_QUERYFRAME_HEAD(nsMenuPopupFrame) -NS_QUERYFRAME_ENTRY(nsMenuPopupFrame) + NS_QUERYFRAME_ENTRY(nsMenuPopupFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) // diff --git a/layout/xul/nsRootBoxFrame.cpp b/layout/xul/nsRootBoxFrame.cpp index cad7d637380a..b72cfc171f86 100644 --- a/layout/xul/nsRootBoxFrame.cpp +++ b/layout/xul/nsRootBoxFrame.cpp @@ -214,7 +214,7 @@ void nsRootBoxFrame::SetDefaultTooltip(Element* aTooltip) { } NS_QUERYFRAME_HEAD(nsRootBoxFrame) -NS_QUERYFRAME_ENTRY(nsIPopupContainer) + NS_QUERYFRAME_ENTRY(nsIPopupContainer) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) #ifdef DEBUG_FRAME_DUMP diff --git a/layout/xul/nsScrollbarFrame.cpp b/layout/xul/nsScrollbarFrame.cpp index c30c35747ebe..f66f8c486f67 100644 --- a/layout/xul/nsScrollbarFrame.cpp +++ b/layout/xul/nsScrollbarFrame.cpp @@ -38,8 +38,8 @@ nsIFrame* NS_NewScrollbarFrame(nsIPresShell* aPresShell, NS_IMPL_FRAMEARENA_HELPERS(nsScrollbarFrame) NS_QUERYFRAME_HEAD(nsScrollbarFrame) -NS_QUERYFRAME_ENTRY(nsScrollbarFrame) -NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) + NS_QUERYFRAME_ENTRY(nsScrollbarFrame) + NS_QUERYFRAME_ENTRY(nsIAnonymousContentCreator) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) void nsScrollbarFrame::Init(nsIContent* aContent, nsContainerFrame* aParent, diff --git a/layout/xul/nsSliderFrame.cpp b/layout/xul/nsSliderFrame.cpp index 3aa4746bf335..35b1ce44e50e 100644 --- a/layout/xul/nsSliderFrame.cpp +++ b/layout/xul/nsSliderFrame.cpp @@ -74,7 +74,7 @@ nsIFrame* NS_NewSliderFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle) { NS_IMPL_FRAMEARENA_HELPERS(nsSliderFrame) NS_QUERYFRAME_HEAD(nsSliderFrame) -NS_QUERYFRAME_ENTRY(nsSliderFrame) + NS_QUERYFRAME_ENTRY(nsSliderFrame) NS_QUERYFRAME_TAIL_INHERITING(nsBoxFrame) nsSliderFrame::nsSliderFrame(ComputedStyle* aStyle) diff --git a/layout/xul/nsTextBoxFrame.cpp b/layout/xul/nsTextBoxFrame.cpp index 8e42b0eac833..6541ab29091b 100644 --- a/layout/xul/nsTextBoxFrame.cpp +++ b/layout/xul/nsTextBoxFrame.cpp @@ -65,7 +65,7 @@ nsIFrame* NS_NewTextBoxFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle) { NS_IMPL_FRAMEARENA_HELPERS(nsTextBoxFrame) NS_QUERYFRAME_HEAD(nsTextBoxFrame) -NS_QUERYFRAME_ENTRY(nsTextBoxFrame) + NS_QUERYFRAME_ENTRY(nsTextBoxFrame) NS_QUERYFRAME_TAIL_INHERITING(nsLeafBoxFrame) nsresult nsTextBoxFrame::AttributeChanged(int32_t aNameSpaceID, diff --git a/layout/xul/tree/nsTreeBodyFrame.cpp b/layout/xul/tree/nsTreeBodyFrame.cpp index 5614f9661cea..7f00230a8217 100644 --- a/layout/xul/tree/nsTreeBodyFrame.cpp +++ b/layout/xul/tree/nsTreeBodyFrame.cpp @@ -103,8 +103,8 @@ nsIFrame* NS_NewTreeBodyFrame(nsIPresShell* aPresShell, ComputedStyle* aStyle) { NS_IMPL_FRAMEARENA_HELPERS(nsTreeBodyFrame) NS_QUERYFRAME_HEAD(nsTreeBodyFrame) -NS_QUERYFRAME_ENTRY(nsIScrollbarMediator) -NS_QUERYFRAME_ENTRY(nsTreeBodyFrame) + NS_QUERYFRAME_ENTRY(nsIScrollbarMediator) + NS_QUERYFRAME_ENTRY(nsTreeBodyFrame) NS_QUERYFRAME_TAIL_INHERITING(nsLeafBoxFrame) // Constructor