Backed out changeset e2927bb26412

2009-08-26 14:49:18 -07:00 · 2009-08-26 14:49:18 -07:00 · 4453cced60
--- 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;
--- 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
--- 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
--- 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)

  /**
   * 
--- 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
--- 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
--- 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
--- 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;

--- 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) {}

--- 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;
--- 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
--- 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);

--- a/layout/generic/nsIAnonymousContentCreator.h
+++ b/layout/generic/nsIAnonymousContentCreator.h
@ -58,7 +58,7 @@ template <class T> 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
--- 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
--- 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();
--- 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;

--- 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;

--- 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;

--- 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.
--- 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.
--- 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;
 };
--- 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
--- 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);
--- 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<class*>(this);
+#define NS_QUERYFRAME_ENTRY(class) \
+  if (class::kFrameIID == id) \
+    return static_cast<class*>(this);

-#define NS_QUERYFRAME_ENTRY_CONDITIONAL(class, condition)       \
-  case class::kFrameIID:                                        \
-  if (condition) return static_cast<class*>(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
--- 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 */
 /*====================================================================*/
--- 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;
 };
--- 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
--- 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;
--- 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;
--- 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;      
--- 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

--- 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

--- 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,
--- 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;
--- 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
--- 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
--- 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();
--- 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.
--- 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;
--- 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
--- 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;
--- 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.
--- 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

--- 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