Bug 1436902 part 3. Replace usage of NS_IMPL_ISUPPORTS_INHERITED0 wit…

…h NS_INLINE_DECL_REFCOUNTING_INHERITED when possible. r=mccr8 The change to RootAccessible.cpp fixes an obvious bug introduced in bug 741707. The visibility changes in gfx/thebes are because NS_DECL_ISUPPORTS has a trailing "public:" that those classes were relying on to have public constructors. MozReview-Commit-ID: IeB8KIJCGhU
Brli · Feb 12, 2018 · fb6be0e · fb6be0e
1 parent 556d05a
commit fb6be0e
Show file tree

Hide file tree

Showing 145 changed files with 159 additions and 311 deletions.
diff --git a/accessible/generic/ARIAGridAccessible.cpp b/accessible/generic/ARIAGridAccessible.cpp
@@ -32,8 +32,6 @@ ARIAGridAccessible::
 {
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(ARIAGridAccessible, Accessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // Table
 
@@ -543,8 +541,6 @@ ARIARowAccessible::
   mGenericTypes |= eTableRow;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(ARIARowAccessible, Accessible)
-
 GroupPos
 ARIARowAccessible::GroupPosition()
 {
@@ -575,8 +571,6 @@ ARIAGridCellAccessible::
   mGenericTypes |= eTableCell;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(ARIAGridCellAccessible, HyperTextAccessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // TableCell
 

diff --git a/accessible/generic/ARIAGridAccessible.h b/accessible/generic/ARIAGridAccessible.h
@@ -22,7 +22,7 @@ class ARIAGridAccessible : public AccessibleWrap,
 public:
   ARIAGridAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(ARIAGridAccessible, AccessibleWrap)
 
   // Accessible
   virtual TableAccessible* AsTable() override { return this; }
@@ -81,7 +81,7 @@ class ARIARowAccessible : public AccessibleWrap
 public:
   ARIARowAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(ARIARowAccessible, AccessibleWrap)
 
   // Accessible
   virtual mozilla::a11y::GroupPos GroupPosition() override;
@@ -100,7 +100,8 @@ class ARIAGridCellAccessible : public HyperTextAccessibleWrap,
 public:
   ARIAGridCellAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(ARIAGridCellAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual TableCellAccessible* AsTableCell() override { return this; }

diff --git a/accessible/generic/ApplicationAccessible.cpp b/accessible/generic/ApplicationAccessible.cpp
@@ -31,8 +31,6 @@ ApplicationAccessible::ApplicationAccessible() :
   MOZ_ASSERT(mAppInfo, "no application info");
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(ApplicationAccessible, Accessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessible
 

diff --git a/accessible/generic/ApplicationAccessible.h b/accessible/generic/ApplicationAccessible.h
@@ -32,7 +32,7 @@ class ApplicationAccessible : public AccessibleWrap
 
   ApplicationAccessible();
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(ApplicationAccessible, AccessibleWrap)
 
   // Accessible
   virtual void Shutdown() override;

diff --git a/accessible/generic/BaseAccessibles.cpp b/accessible/generic/BaseAccessibles.cpp
@@ -27,8 +27,6 @@ LeafAccessible::
   mStateFlags |= eNoKidsFromDOM;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(LeafAccessible, Accessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // LeafAccessible: Accessible public
 
@@ -66,8 +64,6 @@ LeafAccessible::IsAcceptableChild(nsIContent* aEl) const
 // LinkableAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED0(LinkableAccessible, AccessibleWrap)
-
 ////////////////////////////////////////////////////////////////////////////////
 // LinkableAccessible. nsIAccessible
 

diff --git a/accessible/generic/BaseAccessibles.h b/accessible/generic/BaseAccessibles.h
@@ -30,7 +30,7 @@ class LeafAccessible : public AccessibleWrap
   LeafAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
   // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(LeafAccessible, AccessibleWrap)
 
   // Accessible
   virtual Accessible* ChildAtPoint(int32_t aX, int32_t aY,
@@ -60,7 +60,7 @@ class LinkableAccessible : public AccessibleWrap
   {
   }
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(LinkableAccessible, AccessibleWrap)
 
   // Accessible
   virtual void Value(nsString& aValue) override;

diff --git a/accessible/generic/HyperTextAccessible.cpp b/accessible/generic/HyperTextAccessible.cpp
@@ -56,8 +56,6 @@ HyperTextAccessible::
   mGenericTypes |= eHyperText;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(HyperTextAccessible, Accessible)
-
 role
 HyperTextAccessible::NativeRole()
 {

diff --git a/accessible/generic/HyperTextAccessible.h b/accessible/generic/HyperTextAccessible.h
@@ -51,7 +51,7 @@ class HyperTextAccessible : public AccessibleWrap
 public:
   HyperTextAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HyperTextAccessible, AccessibleWrap)
 
   // Accessible
   virtual nsAtom* LandmarkRole() const override;

diff --git a/accessible/generic/OuterDocAccessible.cpp b/accessible/generic/OuterDocAccessible.cpp
@@ -50,12 +50,6 @@ OuterDocAccessible::~OuterDocAccessible()
 {
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// nsISupports
-
-NS_IMPL_ISUPPORTS_INHERITED0(OuterDocAccessible,
-                             Accessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // Accessible public (DON'T add methods here)
 

diff --git a/accessible/generic/OuterDocAccessible.h b/accessible/generic/OuterDocAccessible.h
@@ -26,7 +26,7 @@ class OuterDocAccessible final : public AccessibleWrap
 public:
   OuterDocAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(OuterDocAccessible, AccessibleWrap)
 
   DocAccessibleParent* RemoteChildDoc() const;
 

diff --git a/accessible/generic/RootAccessible.cpp b/accessible/generic/RootAccessible.cpp
@@ -52,7 +52,7 @@ using namespace mozilla::dom;
 ////////////////////////////////////////////////////////////////////////////////
 // nsISupports
 
-NS_IMPL_ISUPPORTS_INHERITED0(RootAccessible, DocAccessible)
+NS_IMPL_ISUPPORTS_INHERITED(RootAccessible, DocAccessible, nsIDOMEventListener)
 
 ////////////////////////////////////////////////////////////////////////////////
 // Constructor/destructor

diff --git a/accessible/html/HTMLCanvasAccessible.cpp b/accessible/html/HTMLCanvasAccessible.cpp
@@ -15,8 +15,6 @@ HTMLCanvasAccessible::
 {
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLCanvasAccessible, HyperTextAccessible)
-
 role
 HTMLCanvasAccessible::NativeRole()
 {

diff --git a/accessible/html/HTMLCanvasAccessible.h b/accessible/html/HTMLCanvasAccessible.h
@@ -20,7 +20,8 @@ class HTMLCanvasAccessible : public HyperTextAccessibleWrap
   HTMLCanvasAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
   // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLCanvasAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual a11y::role NativeRole() override;

diff --git a/accessible/html/HTMLElementAccessibles.cpp b/accessible/html/HTMLElementAccessibles.cpp
@@ -56,8 +56,6 @@ HTMLBRAccessible::NativeName(nsString& aName)
 // HTMLLabelAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLLabelAccessible, HyperTextAccessible)
-
 ENameValueFlag
 HTMLLabelAccessible::NativeName(nsString& aName)
 {
@@ -107,8 +105,6 @@ HTMLLabelAccessible::DoAction(uint8_t aIndex)
 // nsHTMLOuputAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLOutputAccessible, HyperTextAccessible)
-
 Relation
 HTMLOutputAccessible::RelationByType(RelationType aType)
 {
@@ -208,8 +204,6 @@ HTMLSummaryAccessible::IsWidget() const
 // HTMLHeaderOrFooterAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLHeaderOrFooterAccessible, HyperTextAccessible)
-
 role
 HTMLHeaderOrFooterAccessible::NativeRole()
 {

diff --git a/accessible/html/HTMLElementAccessibles.h b/accessible/html/HTMLElementAccessibles.h
@@ -57,7 +57,8 @@ class HTMLLabelAccessible : public HyperTextAccessibleWrap
   HTMLLabelAccessible(nsIContent* aContent, DocAccessible* aDoc) :
     HyperTextAccessibleWrap(aContent, aDoc) {}
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLLabelAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual Relation RelationByType(RelationType aType) override;
@@ -82,7 +83,8 @@ class HTMLOutputAccessible : public HyperTextAccessibleWrap
   HTMLOutputAccessible(nsIContent* aContent, DocAccessible* aDoc) :
     HyperTextAccessibleWrap(aContent, aDoc) {}
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLOutputAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual Relation RelationByType(RelationType aType) override;
@@ -124,7 +126,8 @@ class HTMLHeaderOrFooterAccessible : public HyperTextAccessibleWrap
   HTMLHeaderOrFooterAccessible(nsIContent* aContent, DocAccessible* aDoc) :
     HyperTextAccessibleWrap(aContent, aDoc) {}
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLHeaderOrFooterAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual nsAtom* LandmarkRole() const override;

diff --git a/accessible/html/HTMLFormControlAccessible.cpp b/accessible/html/HTMLFormControlAccessible.cpp
@@ -285,9 +285,6 @@ HTMLTextFieldAccessible::
   mType = eHTMLTextFieldType;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLTextFieldAccessible,
-                             HyperTextAccessible)
-
 role
 HTMLTextFieldAccessible::NativeRole()
 {

diff --git a/accessible/html/HTMLFormControlAccessible.h b/accessible/html/HTMLFormControlAccessible.h
@@ -114,7 +114,8 @@ class HTMLTextFieldAccessible final : public HyperTextAccessibleWrap
 
   HTMLTextFieldAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLTextFieldAccessible,
+                                       HyperTextAccessibleWrap)
 
   // HyperTextAccessible
   virtual already_AddRefed<TextEditor> GetEditor() const override;

diff --git a/accessible/html/HTMLImageMapAccessible.cpp b/accessible/html/HTMLImageMapAccessible.cpp
@@ -33,11 +33,6 @@ HTMLImageMapAccessible::
   UpdateChildAreas(false);
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// HTMLImageMapAccessible: nsISupports
-
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLImageMapAccessible, ImageAccessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLImageMapAccessible: Accessible public
 

diff --git a/accessible/html/HTMLImageMapAccessible.h b/accessible/html/HTMLImageMapAccessible.h
@@ -21,7 +21,8 @@ class HTMLImageMapAccessible final : public ImageAccessibleWrap
   HTMLImageMapAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
   // nsISupports and cycle collector
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLImageMapAccessible,
+                                       ImageAccessibleWrap)
 
   // Accessible
   virtual a11y::role NativeRole() override;

diff --git a/accessible/html/HTMLLinkAccessible.cpp b/accessible/html/HTMLLinkAccessible.cpp
@@ -27,8 +27,6 @@ HTMLLinkAccessible::
 {
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLLinkAccessible, HyperTextAccessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // nsIAccessible
 

diff --git a/accessible/html/HTMLLinkAccessible.h b/accessible/html/HTMLLinkAccessible.h
@@ -16,7 +16,8 @@ class HTMLLinkAccessible : public HyperTextAccessibleWrap
 public:
   HTMLLinkAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLLinkAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual void Value(nsString& aValue) override;

diff --git a/accessible/html/HTMLListAccessible.cpp b/accessible/html/HTMLListAccessible.cpp
@@ -21,8 +21,6 @@ using namespace mozilla::a11y;
 // HTMLListAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLListAccessible, HyperTextAccessible)
-
 role
 HTMLListAccessible::NativeRole()
 {
@@ -55,8 +53,6 @@ HTMLLIAccessible::
   }
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLLIAccessible, HyperTextAccessible)
-
 void
 HTMLLIAccessible::Shutdown()
 {

diff --git a/accessible/html/HTMLListAccessible.h b/accessible/html/HTMLListAccessible.h
@@ -25,7 +25,8 @@ class HTMLListAccessible : public HyperTextAccessibleWrap
     HyperTextAccessibleWrap(aContent, aDoc) { mGenericTypes |= eList; }
 
   // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLListAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual a11y::role NativeRole() override;
@@ -45,7 +46,8 @@ class HTMLLIAccessible : public HyperTextAccessibleWrap
   HTMLLIAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
   // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLLIAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual void Shutdown() override;

diff --git a/accessible/html/HTMLTableAccessible.cpp b/accessible/html/HTMLTableAccessible.cpp
@@ -52,8 +52,6 @@ HTMLTableCellAccessible::
   mGenericTypes |= eTableCell;
 }
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableCellAccessible, HyperTextAccessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLTableCellAccessible: Accessible implementation
 
@@ -357,8 +355,6 @@ HTMLTableHeaderCellAccessible::NativeRole()
 // HTMLTableRowAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableRowAccessible, Accessible)
-
 role
 HTMLTableRowAccessible::NativeRole()
 {
@@ -388,8 +384,6 @@ HTMLTableRowAccessible::GroupPosition()
 // HTMLTableAccessible
 ////////////////////////////////////////////////////////////////////////////////
 
-NS_IMPL_ISUPPORTS_INHERITED0(HTMLTableAccessible, Accessible)
-
 ////////////////////////////////////////////////////////////////////////////////
 // HTMLTableAccessible: Accessible
 

diff --git a/accessible/html/HTMLTableAccessible.h b/accessible/html/HTMLTableAccessible.h
@@ -26,7 +26,8 @@ class HTMLTableCellAccessible : public HyperTextAccessibleWrap,
   HTMLTableCellAccessible(nsIContent* aContent, DocAccessible* aDoc);
 
   // nsISupports
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLTableCellAccessible,
+                                       HyperTextAccessibleWrap)
 
   // Accessible
   virtual TableCellAccessible* AsTableCell() override { return this; }
@@ -92,7 +93,7 @@ class HTMLTableRowAccessible : public AccessibleWrap
     mGenericTypes |= eTableRow;
   }
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLTableRowAccessible, AccessibleWrap)
 
   // Accessible
   virtual a11y::role NativeRole() override;
@@ -123,7 +124,7 @@ class HTMLTableAccessible : public AccessibleWrap,
     mGenericTypes |= eTable;
   }
 
-  NS_DECL_ISUPPORTS_INHERITED
+  NS_INLINE_DECL_REFCOUNTING_INHERITED(HTMLTableAccessible, AccessibleWrap)
 
   // TableAccessible
   virtual Accessible* Caption() const override;
-Original file line number
+Diff line change
@@ Expand Up / @@ -56,8 +56,6 @@ HyperTextAccessible:: @@
       mGenericTypes |= eHyperText;
     }
-    NS_IMPL_ISUPPORTS_INHERITED0(HyperTextAccessible, Accessible)
     role
     HyperTextAccessible::NativeRole()
     {
@@ Expand Down @@