From 4453cced602bc75fedef8174ad7624c23f1bbd82 Mon Sep 17 00:00:00 2001 From: Robert O'Callahan Date: Wed, 26 Aug 2009 14:49:18 -0700 Subject: [PATCH] Backed out changeset e2927bb26412 --- layout/base/nsIPercentHeightObserver.h | 2 +- layout/forms/nsICheckboxControlFrame.h | 2 +- layout/forms/nsIComboboxControlFrame.h | 2 +- layout/forms/nsIFormControlFrame.h | 2 +- layout/forms/nsIListControlFrame.h | 2 +- layout/forms/nsIRadioControlFrame.h | 2 +- layout/forms/nsISelectControlFrame.h | 2 +- layout/forms/nsITextControlFrame.h | 2 +- layout/forms/nsLegendFrame.h | 2 +- layout/generic/nsBlockFrame.h | 2 +- layout/generic/nsFrame.cpp | 2 +- layout/generic/nsFrameSetFrame.h | 2 +- layout/generic/nsIAnonymousContentCreator.h | 2 +- layout/generic/nsICanvasFrame.h | 2 +- layout/generic/nsIFrame.h | 2 +- layout/generic/nsIFrameFrame.h | 2 +- layout/generic/nsIImageFrame.h | 2 +- layout/generic/nsIObjectFrame.h | 2 +- layout/generic/nsIPageSequenceFrame.h | 2 +- layout/generic/nsIScrollableFrame.h | 2 +- layout/generic/nsIScrollableViewProvider.h | 2 +- layout/generic/nsIStatefulFrame.h | 2 +- layout/generic/nsInlineFrame.h | 2 +- layout/generic/nsQueryFrame.h | 34 ++++++------------- layout/mathml/nsIMathMLFrame.h | 2 +- layout/style/nsICSSPseudoComparator.h | 2 +- layout/svg/base/src/nsISVGChildFrame.h | 2 +- layout/svg/base/src/nsISVGGlyphFragmentLeaf.h | 2 +- layout/svg/base/src/nsISVGGlyphFragmentNode.h | 2 +- layout/svg/base/src/nsISVGSVGFrame.h | 2 +- layout/svg/base/src/nsSVGContainerFrame.h | 4 +-- layout/svg/base/src/nsSVGInnerSVGFrame.h | 2 +- layout/svg/base/src/nsSVGTextContainerFrame.h | 2 +- layout/tables/nsITableCellLayout.h | 2 +- layout/tables/nsITableLayout.h | 2 +- layout/tables/nsTableCellFrame.h | 2 +- layout/tables/nsTableRowFrame.h | 2 +- layout/tables/nsTableRowGroupFrame.h | 2 +- layout/xul/base/public/nsIMenuFrame.h | 2 +- layout/xul/base/public/nsIScrollbarMediator.h | 2 +- layout/xul/base/src/nsIRootBox.h | 2 +- layout/xul/base/src/nsIScrollbarFrame.h | 2 +- layout/xul/base/src/nsListBoxBodyFrame.h | 2 +- .../xul/base/src/tree/src/nsTreeBodyFrame.h | 2 +- 44 files changed, 55 insertions(+), 67 deletions(-) diff --git a/layout/base/nsIPercentHeightObserver.h b/layout/base/nsIPercentHeightObserver.h index 2a878d3eee6e..c80d6b89ee71 100644 --- a/layout/base/nsIPercentHeightObserver.h +++ b/layout/base/nsIPercentHeightObserver.h @@ -51,7 +51,7 @@ class nsPresContext; class nsIPercentHeightObserver { public: - NS_DECL_QUERYFRAME_TARGET(nsIPercentHeightObserver) + NS_DECLARE_FRAME_ACCESSOR(nsIPercentHeightObserver) // Notify the observer that aReflowState has no computed height, but it has a percent height virtual void NotifyPercentHeight(const nsHTMLReflowState& aReflowState) = 0; diff --git a/layout/forms/nsICheckboxControlFrame.h b/layout/forms/nsICheckboxControlFrame.h index da9e26c00ae8..0ffb86f0e70a 100644 --- a/layout/forms/nsICheckboxControlFrame.h +++ b/layout/forms/nsICheckboxControlFrame.h @@ -49,7 +49,7 @@ class nsPresContext; class nsICheckboxControlFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsICheckboxControlFrame) + NS_DECLARE_FRAME_ACCESSOR(nsICheckboxControlFrame) /** * Called by content when checkbox "checked" changes diff --git a/layout/forms/nsIComboboxControlFrame.h b/layout/forms/nsIComboboxControlFrame.h index e477560e8e0a..13c1daaf0d4f 100644 --- a/layout/forms/nsIComboboxControlFrame.h +++ b/layout/forms/nsIComboboxControlFrame.h @@ -54,7 +54,7 @@ class nsCSSFrameConstructor; class nsIComboboxControlFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIComboboxControlFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIComboboxControlFrame) /** * Indicates whether the list is dropped down diff --git a/layout/forms/nsIFormControlFrame.h b/layout/forms/nsIFormControlFrame.h index 496fe82a2578..6e757e70521a 100644 --- a/layout/forms/nsIFormControlFrame.h +++ b/layout/forms/nsIFormControlFrame.h @@ -52,7 +52,7 @@ struct nsSize; class nsIFormControlFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIFormControlFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIFormControlFrame) /** * diff --git a/layout/forms/nsIListControlFrame.h b/layout/forms/nsIListControlFrame.h index f57381b31732..bea580ba0a65 100644 --- a/layout/forms/nsIListControlFrame.h +++ b/layout/forms/nsIListControlFrame.h @@ -50,7 +50,7 @@ class nsIContent; class nsIListControlFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIListControlFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIListControlFrame) /** * Sets the ComboBoxFrame diff --git a/layout/forms/nsIRadioControlFrame.h b/layout/forms/nsIRadioControlFrame.h index ee22d7e35d72..e5df4772c983 100644 --- a/layout/forms/nsIRadioControlFrame.h +++ b/layout/forms/nsIRadioControlFrame.h @@ -48,7 +48,7 @@ class nsStyleContext; class nsIRadioControlFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIRadioControlFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIRadioControlFrame) /** * Called by content when the radio button's state changes diff --git a/layout/forms/nsISelectControlFrame.h b/layout/forms/nsISelectControlFrame.h index 721ec946dc30..51fe72e78bbf 100644 --- a/layout/forms/nsISelectControlFrame.h +++ b/layout/forms/nsISelectControlFrame.h @@ -49,7 +49,7 @@ class nsIDOMHTMLOptionElement; class nsISelectControlFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsISelectControlFrame) + NS_DECLARE_FRAME_ACCESSOR(nsISelectControlFrame) /** * Adds an option to the list at index diff --git a/layout/forms/nsITextControlFrame.h b/layout/forms/nsITextControlFrame.h index 223b7d898111..85c677b83937 100644 --- a/layout/forms/nsITextControlFrame.h +++ b/layout/forms/nsITextControlFrame.h @@ -48,7 +48,7 @@ class nsFrameSelection; class nsITextControlFrame : public nsIFormControlFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsITextControlFrame) + NS_DECLARE_FRAME_ACCESSOR(nsITextControlFrame) NS_IMETHOD GetEditor(nsIEditor **aEditor) = 0; diff --git a/layout/forms/nsLegendFrame.h b/layout/forms/nsLegendFrame.h index 3f30d1c25368..378fe6169df0 100644 --- a/layout/forms/nsLegendFrame.h +++ b/layout/forms/nsLegendFrame.h @@ -42,7 +42,7 @@ class nsLegendFrame : public nsBlockFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsLegendFrame) + NS_DECLARE_FRAME_ACCESSOR(nsLegendFrame) nsLegendFrame(nsStyleContext* aContext) : nsBlockFrame(aContext) {} diff --git a/layout/generic/nsBlockFrame.h b/layout/generic/nsBlockFrame.h index 7ab62467e6a1..b282fdab74a4 100644 --- a/layout/generic/nsBlockFrame.h +++ b/layout/generic/nsBlockFrame.h @@ -142,7 +142,7 @@ class nsIntervalSet; class nsBlockFrame : public nsBlockFrameSuper { public: - NS_DECL_QUERYFRAME_TARGET(nsBlockFrame) + NS_DECLARE_FRAME_ACCESSOR(nsBlockFrame) typedef nsLineList::iterator line_iterator; typedef nsLineList::const_iterator const_line_iterator; diff --git a/layout/generic/nsFrame.cpp b/layout/generic/nsFrame.cpp index 65a019b62e31..86e347f6d180 100644 --- a/layout/generic/nsFrame.cpp +++ b/layout/generic/nsFrame.cpp @@ -331,7 +331,7 @@ nsFrame::~nsFrame() NS_QUERYFRAME_HEAD(nsFrame) NS_QUERYFRAME_ENTRY(nsIFrame) -NS_QUERYFRAME_TAIL_INHERITANCE_ROOT +NS_QUERYFRAME_TAIL ///////////////////////////////////////////////////////////////////////////// // nsIFrame diff --git a/layout/generic/nsFrameSetFrame.h b/layout/generic/nsFrameSetFrame.h index d6d51f8117b7..4f31be1c1ddb 100644 --- a/layout/generic/nsFrameSetFrame.h +++ b/layout/generic/nsFrameSetFrame.h @@ -104,7 +104,7 @@ struct nsFramesetDrag { class nsHTMLFramesetFrame : public nsHTMLContainerFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsHTMLFramesetFrame) + NS_DECLARE_FRAME_ACCESSOR(nsHTMLFramesetFrame) nsHTMLFramesetFrame(nsStyleContext* aContext); diff --git a/layout/generic/nsIAnonymousContentCreator.h b/layout/generic/nsIAnonymousContentCreator.h index 6c6dd4c61355..7a62e905b8e7 100644 --- a/layout/generic/nsIAnonymousContentCreator.h +++ b/layout/generic/nsIAnonymousContentCreator.h @@ -58,7 +58,7 @@ template class nsTArray; class nsIAnonymousContentCreator { public: - NS_DECL_QUERYFRAME_TARGET(nsIAnonymousContentCreator) + NS_DECLARE_FRAME_ACCESSOR(nsIAnonymousContentCreator) /** * Creates "native" anonymous content and adds the created content to diff --git a/layout/generic/nsICanvasFrame.h b/layout/generic/nsICanvasFrame.h index 2a57a72f5eb3..0a7693af0c4e 100644 --- a/layout/generic/nsICanvasFrame.h +++ b/layout/generic/nsICanvasFrame.h @@ -45,7 +45,7 @@ class nsICanvasFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsICanvasFrame) + NS_DECLARE_FRAME_ACCESSOR(nsICanvasFrame) /** SetHasFocus tells the CanvasFrame to draw with focus ring * @param aHasFocus PR_TRUE to show focus ring, PR_FALSE to hide it diff --git a/layout/generic/nsIFrame.h b/layout/generic/nsIFrame.h index 1bf23aefa8b0..bb554d069f28 100644 --- a/layout/generic/nsIFrame.h +++ b/layout/generic/nsIFrame.h @@ -490,7 +490,7 @@ typedef PRBool nsDidReflowStatus; class nsIFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIFrame) nsPresContext* PresContext() const { return GetStyleContext()->GetRuleNode()->GetPresContext(); diff --git a/layout/generic/nsIFrameFrame.h b/layout/generic/nsIFrameFrame.h index 6e99ea679cbe..7bcf14f1c142 100644 --- a/layout/generic/nsIFrameFrame.h +++ b/layout/generic/nsIFrameFrame.h @@ -48,7 +48,7 @@ class nsIDocShell; class nsIFrameFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIFrameFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIFrameFrame) NS_IMETHOD GetDocShell(nsIDocShell **aDocShell) = 0; diff --git a/layout/generic/nsIImageFrame.h b/layout/generic/nsIImageFrame.h index bf0888561aa1..d015ec6ed7a1 100644 --- a/layout/generic/nsIImageFrame.h +++ b/layout/generic/nsIImageFrame.h @@ -51,7 +51,7 @@ class nsIImageMap; class nsIImageFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIImageFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIImageFrame) NS_IMETHOD GetIntrinsicImageSize(nsSize& aSize) = 0; diff --git a/layout/generic/nsIObjectFrame.h b/layout/generic/nsIObjectFrame.h index 7a1e30c6528d..003c930e4cdc 100644 --- a/layout/generic/nsIObjectFrame.h +++ b/layout/generic/nsIObjectFrame.h @@ -50,7 +50,7 @@ class nsIPluginInstance; class nsIObjectFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIObjectFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIObjectFrame) NS_IMETHOD GetPluginInstance(nsIPluginInstance*& aPluginInstance) = 0; diff --git a/layout/generic/nsIPageSequenceFrame.h b/layout/generic/nsIPageSequenceFrame.h index f39e8687a963..5a008ab20979 100644 --- a/layout/generic/nsIPageSequenceFrame.h +++ b/layout/generic/nsIPageSequenceFrame.h @@ -51,7 +51,7 @@ class nsIPrintSettings; class nsIPageSequenceFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIPageSequenceFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIPageSequenceFrame) /** * Print the set of pages. diff --git a/layout/generic/nsIScrollableFrame.h b/layout/generic/nsIScrollableFrame.h index 0555c95b68b2..21ec24816b29 100644 --- a/layout/generic/nsIScrollableFrame.h +++ b/layout/generic/nsIScrollableFrame.h @@ -55,7 +55,7 @@ class nsBoxLayoutState; class nsIScrollableFrame : public nsIScrollableViewProvider { public: - NS_DECL_QUERYFRAME_TARGET(nsIScrollableFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIScrollableFrame) /** * Get the frame that we are scrolling within the scrollable frame. diff --git a/layout/generic/nsIScrollableViewProvider.h b/layout/generic/nsIScrollableViewProvider.h index 71f24fc01117..eb229d01fef9 100644 --- a/layout/generic/nsIScrollableViewProvider.h +++ b/layout/generic/nsIScrollableViewProvider.h @@ -46,7 +46,7 @@ class nsIScrollableView; class nsIScrollableViewProvider : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIScrollableViewProvider) + NS_DECLARE_FRAME_ACCESSOR(nsIScrollableViewProvider) virtual nsIScrollableView* GetScrollableView() = 0; }; diff --git a/layout/generic/nsIStatefulFrame.h b/layout/generic/nsIStatefulFrame.h index 980238797d44..ba2d870e8330 100644 --- a/layout/generic/nsIStatefulFrame.h +++ b/layout/generic/nsIStatefulFrame.h @@ -14,7 +14,7 @@ class nsPresState; class nsIStatefulFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIStatefulFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIStatefulFrame) // If you create a special type stateful frame (e.g. scroll) that needs // to be captured outside of the standard pass through the frames, you'll need diff --git a/layout/generic/nsInlineFrame.h b/layout/generic/nsInlineFrame.h index e7b230f4a0c0..da5875bf0f5b 100644 --- a/layout/generic/nsInlineFrame.h +++ b/layout/generic/nsInlineFrame.h @@ -76,7 +76,7 @@ class nsAnonymousBlockFrame; class nsInlineFrame : public nsInlineFrameSuper { public: - NS_DECL_QUERYFRAME_TARGET(nsInlineFrame) + NS_DECLARE_FRAME_ACCESSOR(nsInlineFrame) NS_DECL_QUERYFRAME friend nsIFrame* NS_NewInlineFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); diff --git a/layout/generic/nsQueryFrame.h b/layout/generic/nsQueryFrame.h index 9adba67f8445..e49c66e21feb 100644 --- a/layout/generic/nsQueryFrame.h +++ b/layout/generic/nsQueryFrame.h @@ -40,34 +40,23 @@ #include "nscore.h" -#define NS_DECL_QUERYFRAME_TARGET(classname) \ +#define NS_DECLARE_FRAME_ACCESSOR(classname) \ static const nsQueryFrame::FrameIID kFrameIID = nsQueryFrame::classname##_id; -#define NS_DECL_QUERYFRAME \ +#define NS_DECL_QUERYFRAME \ virtual void* QueryFrame(FrameIID id); -#define NS_QUERYFRAME_HEAD(class) \ - void* class::QueryFrame(FrameIID id) { switch (id) { +#define NS_QUERYFRAME_HEAD(class) \ + void* class::QueryFrame(FrameIID id) { -#define NS_QUERYFRAME_ENTRY(class) \ - case class::kFrameIID: return static_cast(this); +#define NS_QUERYFRAME_ENTRY(class) \ + if (class::kFrameIID == id) \ + return static_cast(this); -#define NS_QUERYFRAME_ENTRY_CONDITIONAL(class, condition) \ - case class::kFrameIID: \ - if (condition) return static_cast(this); \ - break; +#define NS_QUERYFRAME_TAIL_INHERITING(class) \ + return class::QueryFrame(id); } -#define NS_QUERYFRAME_TAIL_INHERITING(class) \ - default: break; \ - } \ - return class::QueryFrame(id); \ -} - -#define NS_QUERYFRAME_TAIL_INHERITANCE_ROOT \ - default: break; \ - } \ - return nsnull; \ -} +#define NS_QUERYFRAME_TAIL return nsnull; } class nsQueryFrame { @@ -75,6 +64,7 @@ public: enum FrameIID { BRFrame_id, CanvasFrame_id, + nsAreaFrame_id, nsAutoRepeatBoxFrame_id, nsBCTableCellFrame_id, nsBlockFrame_id, @@ -158,7 +148,6 @@ public: nsMathMLmactionFrame_id, nsMathMLmathBlockFrame_id, nsMathMLmathInlineFrame_id, - nsMathMLmencloseFrame_id, nsMathMLmfencedFrame_id, nsMathMLmfracFrame_id, nsMathMLmmultiscriptsFrame_id, @@ -248,7 +237,6 @@ public: nsTreeBodyFrame_id, nsTreeColFrame_id, nsVideoFrame_id, - nsXULLabelFrame_id, nsXULScrollFrame_id, SpacerFrame_id, ViewportFrame_id diff --git a/layout/mathml/nsIMathMLFrame.h b/layout/mathml/nsIMathMLFrame.h index 9beff41acb88..642ad5ffd0cf 100644 --- a/layout/mathml/nsIMathMLFrame.h +++ b/layout/mathml/nsIMathMLFrame.h @@ -64,7 +64,7 @@ enum eMathMLFrameType { class nsIMathMLFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIMathMLFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIMathMLFrame) /* SUPPORT FOR PRECISE POSITIONING */ /*====================================================================*/ diff --git a/layout/style/nsICSSPseudoComparator.h b/layout/style/nsICSSPseudoComparator.h index af10aecc3d8f..ac8d5e38e105 100644 --- a/layout/style/nsICSSPseudoComparator.h +++ b/layout/style/nsICSSPseudoComparator.h @@ -48,7 +48,7 @@ struct nsCSSSelector; class nsICSSPseudoComparator { public: - NS_DECL_QUERYFRAME_TARGET(nsICSSPseudoComparator) + NS_DECLARE_FRAME_ACCESSOR(nsICSSPseudoComparator) NS_IMETHOD PseudoMatches(nsIAtom* aTag, nsCSSSelector* aSelector, PRBool* aResult)=0; }; diff --git a/layout/svg/base/src/nsISVGChildFrame.h b/layout/svg/base/src/nsISVGChildFrame.h index 1c202e5b5117..c227187068ec 100644 --- a/layout/svg/base/src/nsISVGChildFrame.h +++ b/layout/svg/base/src/nsISVGChildFrame.h @@ -53,7 +53,7 @@ class nsSVGRenderState; class nsISVGChildFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsISVGChildFrame) + NS_DECLARE_FRAME_ACCESSOR(nsISVGChildFrame) // Paint this frame - aDirtyRect is the area being redrawn, in frame // offset pixel coordinates diff --git a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h index 39037cb5e3d7..2d80de356d48 100644 --- a/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h +++ b/layout/svg/base/src/nsISVGGlyphFragmentLeaf.h @@ -49,7 +49,7 @@ class nsSVGTextPathFrame; class nsISVGGlyphFragmentLeaf : public nsISVGGlyphFragmentNode { public: - NS_DECL_QUERYFRAME_TARGET(nsISVGGlyphFragmentLeaf) + NS_DECLARE_FRAME_ACCESSOR(nsISVGGlyphFragmentLeaf) NS_IMETHOD GetStartPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval)=0; NS_IMETHOD GetEndPositionOfChar(PRUint32 charnum, nsIDOMSVGPoint **_retval)=0; diff --git a/layout/svg/base/src/nsISVGGlyphFragmentNode.h b/layout/svg/base/src/nsISVGGlyphFragmentNode.h index 9aaba459e0b0..7131f3b641a2 100644 --- a/layout/svg/base/src/nsISVGGlyphFragmentNode.h +++ b/layout/svg/base/src/nsISVGGlyphFragmentNode.h @@ -53,7 +53,7 @@ class nsIDOMSVGPoint; class nsISVGGlyphFragmentNode : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsISVGGlyphFragmentNode) + NS_DECLARE_FRAME_ACCESSOR(nsISVGGlyphFragmentNode) virtual PRUint32 GetNumberOfChars()=0; virtual float GetComputedTextLength()=0; diff --git a/layout/svg/base/src/nsISVGSVGFrame.h b/layout/svg/base/src/nsISVGSVGFrame.h index e27e5824e2f4..8e1b5b0e4859 100644 --- a/layout/svg/base/src/nsISVGSVGFrame.h +++ b/layout/svg/base/src/nsISVGSVGFrame.h @@ -44,7 +44,7 @@ class nsISVGSVGFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsISVGSVGFrame) + NS_DECLARE_FRAME_ACCESSOR(nsISVGSVGFrame) NS_IMETHOD SuspendRedraw()=0; NS_IMETHOD UnsuspendRedraw()=0; diff --git a/layout/svg/base/src/nsSVGContainerFrame.h b/layout/svg/base/src/nsSVGContainerFrame.h index 5d42116d67d3..d98c217b45be 100644 --- a/layout/svg/base/src/nsSVGContainerFrame.h +++ b/layout/svg/base/src/nsSVGContainerFrame.h @@ -54,7 +54,7 @@ protected: nsSVGContainerFrameBase(aContext) {} public: - NS_DECL_QUERYFRAME_TARGET(nsSVGContainerFrame) + NS_DECLARE_FRAME_ACCESSOR(nsSVGContainerFrame) NS_DECL_QUERYFRAME @@ -88,7 +88,7 @@ protected: nsSVGContainerFrame(aContext) {} public: - NS_DECL_QUERYFRAME_TARGET(nsSVGDisplayContainerFrame) + NS_DECLARE_FRAME_ACCESSOR(nsSVGDisplayContainerFrame) NS_DECL_QUERYFRAME diff --git a/layout/svg/base/src/nsSVGInnerSVGFrame.h b/layout/svg/base/src/nsSVGInnerSVGFrame.h index cfb65542e211..0caca26d1eee 100644 --- a/layout/svg/base/src/nsSVGInnerSVGFrame.h +++ b/layout/svg/base/src/nsSVGInnerSVGFrame.h @@ -52,7 +52,7 @@ protected: nsSVGInnerSVGFrameBase(aContext) {} public: - NS_DECL_QUERYFRAME_TARGET(nsSVGInnerSVGFrame) + NS_DECLARE_FRAME_ACCESSOR(nsSVGInnerSVGFrame) NS_DECL_QUERYFRAME diff --git a/layout/svg/base/src/nsSVGTextContainerFrame.h b/layout/svg/base/src/nsSVGTextContainerFrame.h index 20df90d02e21..6ba4f238a252 100644 --- a/layout/svg/base/src/nsSVGTextContainerFrame.h +++ b/layout/svg/base/src/nsSVGTextContainerFrame.h @@ -59,7 +59,7 @@ public: public: NS_DECL_QUERYFRAME - NS_DECL_QUERYFRAME_TARGET(nsSVGTextContainerFrame) + NS_DECLARE_FRAME_ACCESSOR(nsSVGTextContainerFrame) // nsIFrame NS_IMETHOD InsertFrames(nsIAtom* aListName, diff --git a/layout/tables/nsITableCellLayout.h b/layout/tables/nsITableCellLayout.h index 550bf6a334b0..f201d6bacc1a 100644 --- a/layout/tables/nsITableCellLayout.h +++ b/layout/tables/nsITableCellLayout.h @@ -49,7 +49,7 @@ class nsITableCellLayout { public: - NS_DECL_QUERYFRAME_TARGET(nsITableCellLayout) + NS_DECLARE_FRAME_ACCESSOR(nsITableCellLayout) /** return the mapped cell's row and column indexes (starting at 0 for each) */ NS_IMETHOD GetCellIndexes(PRInt32 &aRowIndex, PRInt32 &aColIndex)=0; diff --git a/layout/tables/nsITableLayout.h b/layout/tables/nsITableLayout.h index 9f9dd21c93ff..0d9e3aef874f 100644 --- a/layout/tables/nsITableLayout.h +++ b/layout/tables/nsITableLayout.h @@ -51,7 +51,7 @@ class nsITableLayout { public: - NS_DECL_QUERYFRAME_TARGET(nsITableLayout) + NS_DECLARE_FRAME_ACCESSOR(nsITableLayout) /** return all the relevant layout information about a cell. * @param aRowIndex a row which the cell intersects diff --git a/layout/tables/nsTableCellFrame.h b/layout/tables/nsTableCellFrame.h index 6df299978cdd..2732485bbb27 100644 --- a/layout/tables/nsTableCellFrame.h +++ b/layout/tables/nsTableCellFrame.h @@ -73,7 +73,7 @@ class nsTableCellFrame : public nsHTMLContainerFrame, { public: - NS_DECL_QUERYFRAME_TARGET(nsTableCellFrame) + NS_DECLARE_FRAME_ACCESSOR(nsTableCellFrame) NS_DECL_QUERYFRAME // default constructor supplied by the compiler diff --git a/layout/tables/nsTableRowFrame.h b/layout/tables/nsTableRowFrame.h index f9343e6cf78f..6e3375bea854 100644 --- a/layout/tables/nsTableRowFrame.h +++ b/layout/tables/nsTableRowFrame.h @@ -68,7 +68,7 @@ class nsTableRowFrame : public nsHTMLContainerFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsTableRowFrame) + NS_DECLARE_FRAME_ACCESSOR(nsTableRowFrame) NS_DECL_QUERYFRAME virtual ~nsTableRowFrame(); diff --git a/layout/tables/nsTableRowGroupFrame.h b/layout/tables/nsTableRowGroupFrame.h index 12ae36973cc6..96eb0b32a7e5 100644 --- a/layout/tables/nsTableRowGroupFrame.h +++ b/layout/tables/nsTableRowGroupFrame.h @@ -97,7 +97,7 @@ class nsTableRowGroupFrame , public nsILineIterator { public: - NS_DECL_QUERYFRAME_TARGET(nsTableRowGroupFrame) + NS_DECLARE_FRAME_ACCESSOR(nsTableRowGroupFrame) NS_DECL_QUERYFRAME /** instantiate a new instance of nsTableRowFrame. diff --git a/layout/xul/base/public/nsIMenuFrame.h b/layout/xul/base/public/nsIMenuFrame.h index aee0ec847e52..68419dd5e413 100644 --- a/layout/xul/base/public/nsIMenuFrame.h +++ b/layout/xul/base/public/nsIMenuFrame.h @@ -46,7 +46,7 @@ class nsIMenuFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIMenuFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIMenuFrame) virtual PRBool IsOpen() = 0; virtual PRBool IsMenu() = 0; diff --git a/layout/xul/base/public/nsIScrollbarMediator.h b/layout/xul/base/public/nsIScrollbarMediator.h index 4d5a2fd93d37..465e1242abd6 100644 --- a/layout/xul/base/public/nsIScrollbarMediator.h +++ b/layout/xul/base/public/nsIScrollbarMediator.h @@ -47,7 +47,7 @@ class nsIScrollbarFrame; class nsIScrollbarMediator { public: - NS_DECL_QUERYFRAME_TARGET(nsIScrollbarMediator) + NS_DECLARE_FRAME_ACCESSOR(nsIScrollbarMediator) // The nsIFrame aScrollbar argument below denotes the // scrollbar that's firing the notification. It should be diff --git a/layout/xul/base/src/nsIRootBox.h b/layout/xul/base/src/nsIRootBox.h index d04557bdea46..142a284bd6ea 100644 --- a/layout/xul/base/src/nsIRootBox.h +++ b/layout/xul/base/src/nsIRootBox.h @@ -48,7 +48,7 @@ class nsIPresShell; class nsIRootBox { public: - NS_DECL_QUERYFRAME_TARGET(nsIRootBox) + NS_DECLARE_FRAME_ACCESSOR(nsIRootBox) virtual nsPopupSetFrame* GetPopupSetFrame() = 0; virtual void SetPopupSetFrame(nsPopupSetFrame* aPopupSet) = 0; diff --git a/layout/xul/base/src/nsIScrollbarFrame.h b/layout/xul/base/src/nsIScrollbarFrame.h index 6783c868bef3..74e5576d7f9a 100644 --- a/layout/xul/base/src/nsIScrollbarFrame.h +++ b/layout/xul/base/src/nsIScrollbarFrame.h @@ -46,7 +46,7 @@ class nsIScrollbarMediator; class nsIScrollbarFrame : public nsQueryFrame { public: - NS_DECL_QUERYFRAME_TARGET(nsIScrollbarFrame) + NS_DECLARE_FRAME_ACCESSOR(nsIScrollbarFrame) // Sets the scrollbar mediator content. We will try to get its primary frame // and then QI that to nsIScrollbarMediator as necessary. diff --git a/layout/xul/base/src/nsListBoxBodyFrame.h b/layout/xul/base/src/nsListBoxBodyFrame.h index 6e76cef7ec8d..95b7616d2498 100644 --- a/layout/xul/base/src/nsListBoxBodyFrame.h +++ b/layout/xul/base/src/nsListBoxBodyFrame.h @@ -64,7 +64,7 @@ class nsListBoxBodyFrame : public nsBoxFrame, virtual ~nsListBoxBodyFrame(); public: - NS_DECL_QUERYFRAME_TARGET(nsListBoxBodyFrame) + NS_DECLARE_FRAME_ACCESSOR(nsListBoxBodyFrame) NS_DECL_QUERYFRAME diff --git a/layout/xul/base/src/tree/src/nsTreeBodyFrame.h b/layout/xul/base/src/tree/src/nsTreeBodyFrame.h index 4c2886fdc02d..c365747b0cbc 100644 --- a/layout/xul/base/src/tree/src/nsTreeBodyFrame.h +++ b/layout/xul/base/src/tree/src/nsTreeBodyFrame.h @@ -87,7 +87,7 @@ public: nsTreeBodyFrame(nsIPresShell* aPresShell, nsStyleContext* aContext); ~nsTreeBodyFrame(); - NS_DECL_QUERYFRAME_TARGET(nsTreeBodyFrame) + NS_DECLARE_FRAME_ACCESSOR(nsTreeBodyFrame) NS_DECL_QUERYFRAME