From 1029e65370ef00beeb55bcfff683e678b0193013 Mon Sep 17 00:00:00 2001 From: Mark Capella Date: Tue, 10 Apr 2012 03:52:00 -0700 Subject: [PATCH] Bug 741707 - rm unused a11y CIDs, r=surkov, f=tbsaunde, hub --- accessible/src/base/nsDocAccessible.cpp | 1 - accessible/src/base/nsDocAccessible.h | 12 ------------ accessible/src/base/nsRootAccessible.cpp | 12 +----------- accessible/src/base/nsRootAccessible.h | 14 +------------- accessible/src/html/nsHTMLTableAccessible.cpp | 4 ++-- accessible/src/html/nsHTMLTableAccessible.h | 13 ------------- accessible/src/xul/nsXULTreeAccessible.cpp | 1 - accessible/src/xul/nsXULTreeAccessible.h | 13 ------------- 8 files changed, 4 insertions(+), 66 deletions(-) diff --git a/accessible/src/base/nsDocAccessible.cpp b/accessible/src/base/nsDocAccessible.cpp index 063862f623db..097aa3319725 100644 --- a/accessible/src/base/nsDocAccessible.cpp +++ b/accessible/src/base/nsDocAccessible.cpp @@ -175,7 +175,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsDocAccessible, nsAccessible) NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsDocAccessible) - NS_INTERFACE_MAP_STATIC_AMBIGUOUS(nsDocAccessible) NS_INTERFACE_MAP_ENTRY(nsIAccessibleDocument) NS_INTERFACE_MAP_ENTRY(nsIDocumentObserver) NS_INTERFACE_MAP_ENTRY(nsIMutationObserver) diff --git a/accessible/src/base/nsDocAccessible.h b/accessible/src/base/nsDocAccessible.h index 47449cf81c67..d67209c632b8 100644 --- a/accessible/src/base/nsDocAccessible.h +++ b/accessible/src/base/nsDocAccessible.h @@ -64,14 +64,6 @@ class nsAccessiblePivot; const PRUint32 kDefaultCacheSize = 256; -#define NS_DOCACCESSIBLE_IMPL_CID \ -{ /* 5641921c-a093-4292-9dca-0b51813db57d */ \ - 0x5641921c, \ - 0xa093, \ - 0x4292, \ - { 0x9d, 0xca, 0x0b, 0x51, 0x81, 0x3d, 0xb5, 0x7d } \ -} - class nsDocAccessible : public nsHyperTextAccessibleWrap, public nsIAccessibleDocument, public nsIDocumentObserver, @@ -85,7 +77,6 @@ class nsDocAccessible : public nsHyperTextAccessibleWrap, NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDocAccessible, nsAccessible) NS_DECL_NSIACCESSIBLEDOCUMENT - NS_DECLARE_STATIC_IID_ACCESSOR(NS_DOCACCESSIBLE_IMPL_CID) NS_DECL_NSIOBSERVER @@ -666,9 +657,6 @@ private: nsIPresShell* mPresShell; }; -NS_DEFINE_STATIC_IID_ACCESSOR(nsDocAccessible, - NS_DOCACCESSIBLE_IMPL_CID) - inline nsDocAccessible* nsAccessible::AsDoc() { diff --git a/accessible/src/base/nsRootAccessible.cpp b/accessible/src/base/nsRootAccessible.cpp index 070316073fc6..9d5b2ae9ddaa 100644 --- a/accessible/src/base/nsRootAccessible.cpp +++ b/accessible/src/base/nsRootAccessible.cpp @@ -92,17 +92,7 @@ using namespace mozilla::a11y; //////////////////////////////////////////////////////////////////////////////// // nsISupports -// Expanded version of NS_IMPL_ISUPPORTS_INHERITED2 -// so we can QI directly to concrete nsRootAccessible -NS_IMPL_QUERY_HEAD(nsRootAccessible) -NS_IMPL_QUERY_BODY(nsIDOMEventListener) -if (aIID.Equals(NS_GET_IID(nsRootAccessible))) - foundInterface = reinterpret_cast(this); -else -NS_IMPL_QUERY_TAIL_INHERITING(nsDocAccessible) - -NS_IMPL_ADDREF_INHERITED(nsRootAccessible, nsDocAccessible) -NS_IMPL_RELEASE_INHERITED(nsRootAccessible, nsDocAccessible) +NS_IMPL_ISUPPORTS_INHERITED1(nsRootAccessible, nsDocAccessible, nsIAccessibleDocument) //////////////////////////////////////////////////////////////////////////////// // Constructor/desctructor diff --git a/accessible/src/base/nsRootAccessible.h b/accessible/src/base/nsRootAccessible.h index 1bef60b679c9..d27090411424 100644 --- a/accessible/src/base/nsRootAccessible.h +++ b/accessible/src/base/nsRootAccessible.h @@ -50,14 +50,6 @@ class nsXULTreeAccessible; class Relation; -#define NS_ROOTACCESSIBLE_IMPL_CID \ -{ /* eaba2cf0-21b1-4e2b-b711-d3a89dcd5e1a */ \ - 0xeaba2cf0, \ - 0x21b1, \ - 0x4e2b, \ - { 0xb7, 0x11, 0xd3, 0xa8, 0x9d, 0xcd, 0x5e, 0x1a } \ -} - const PRInt32 SCROLL_HASH_START_SIZE = 6; class nsRootAccessible : public nsDocAccessibleWrap, @@ -85,9 +77,7 @@ public: virtual PRUint64 NativeState(); // nsRootAccessible - NS_DECLARE_STATIC_IID_ACCESSOR(NS_ROOTACCESSIBLE_IMPL_CID) - - nsCaretAccessible *GetCaretAccessible(); + nsCaretAccessible* GetCaretAccessible(); /** * Notify that the sub document presshell was activated. @@ -129,8 +119,6 @@ protected: nsRefPtr mCaretAccessible; }; -NS_DEFINE_STATIC_IID_ACCESSOR(nsRootAccessible, NS_ROOTACCESSIBLE_IMPL_CID) - inline nsRootAccessible* nsAccessible::AsRoot() { diff --git a/accessible/src/html/nsHTMLTableAccessible.cpp b/accessible/src/html/nsHTMLTableAccessible.cpp index a09c2740b68c..e637642f2c7a 100644 --- a/accessible/src/html/nsHTMLTableAccessible.cpp +++ b/accessible/src/html/nsHTMLTableAccessible.cpp @@ -443,8 +443,8 @@ nsHTMLTableAccessible:: //////////////////////////////////////////////////////////////////////////////// // nsHTMLTableAccessible: nsISupports implementation -NS_IMPL_ISUPPORTS_INHERITED2(nsHTMLTableAccessible, nsAccessible, - nsHTMLTableAccessible, nsIAccessibleTable) +NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLTableAccessible, nsAccessible, + nsIAccessibleTable) //////////////////////////////////////////////////////////////////////////////// //nsAccessNode diff --git a/accessible/src/html/nsHTMLTableAccessible.h b/accessible/src/html/nsHTMLTableAccessible.h index 4691bd9fc6d7..5dd1023de234 100644 --- a/accessible/src/html/nsHTMLTableAccessible.h +++ b/accessible/src/html/nsHTMLTableAccessible.h @@ -114,14 +114,6 @@ public: // data vs. layout heuristic // #define SHOW_LAYOUT_HEURISTIC -#define NS_TABLEACCESSIBLE_IMPL_CID \ -{ /* 8d6d9c40-74bd-47ac-88dc-4a23516aa23d */ \ - 0x8d6d9c40, \ - 0x74bd, \ - 0x47ac, \ - { 0x88, 0xdc, 0x4a, 0x23, 0x51, 0x6a, 0xa2, 0x3d } \ -} - class nsHTMLTableAccessible : public nsAccessibleWrap, public xpcAccessibleTable, public nsIAccessibleTable, @@ -131,7 +123,6 @@ public: nsHTMLTableAccessible(nsIContent* aContent, nsDocAccessible* aDoc); NS_DECL_ISUPPORTS_INHERITED - NS_DECLARE_STATIC_IID_ACCESSOR(NS_TABLEACCESSIBLE_IMPL_CID) // nsIAccessible Table NS_DECL_OR_FORWARD_NSIACCESSIBLETABLE_WITH_XPCACCESSIBLETABLE @@ -208,10 +199,6 @@ protected: #endif }; -NS_DEFINE_STATIC_IID_ACCESSOR(nsHTMLTableAccessible, - NS_TABLEACCESSIBLE_IMPL_CID) - - /** * HTML caption accessible (html:caption). */ diff --git a/accessible/src/xul/nsXULTreeAccessible.cpp b/accessible/src/xul/nsXULTreeAccessible.cpp index 4a358eac68dd..3a212c078701 100644 --- a/accessible/src/xul/nsXULTreeAccessible.cpp +++ b/accessible/src/xul/nsXULTreeAccessible.cpp @@ -107,7 +107,6 @@ NS_IMPL_CYCLE_COLLECTION_UNLINK_BEGIN_INHERITED(nsXULTreeAccessible, NS_IMPL_CYCLE_COLLECTION_UNLINK_END NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION_INHERITED(nsXULTreeAccessible) -NS_INTERFACE_MAP_STATIC_AMBIGUOUS(nsXULTreeAccessible) NS_INTERFACE_MAP_END_INHERITING(nsAccessible) NS_IMPL_ADDREF_INHERITED(nsXULTreeAccessible, nsAccessible) diff --git a/accessible/src/xul/nsXULTreeAccessible.h b/accessible/src/xul/nsXULTreeAccessible.h index be389522e275..6d35794dd3d5 100644 --- a/accessible/src/xul/nsXULTreeAccessible.h +++ b/accessible/src/xul/nsXULTreeAccessible.h @@ -53,14 +53,6 @@ const PRUint32 kDefaultTreeCacheSize = 256; * Accessible class for XUL tree element. */ -#define NS_XULTREEACCESSIBLE_IMPL_CID \ -{ /* 2692e149-6176-42ee-b8e1-2c44b04185e3 */ \ - 0x2692e149, \ - 0x6176, \ - 0x42ee, \ - { 0xb8, 0xe1, 0x2c, 0x44, 0xb0, 0x41, 0x85, 0xe3 } \ -} - class nsXULTreeAccessible : public nsAccessibleWrap { public: @@ -109,8 +101,6 @@ public: // nsXULTreeAccessible - NS_DECLARE_STATIC_IID_ACCESSOR(NS_XULTREEACCESSIBLE_IMPL_CID) - /** * Return tree item accessible at the givem row. If accessible doesn't exist * in the cache then create and cache it. @@ -157,9 +147,6 @@ protected: nsAccessibleHashtable mAccessibleCache; }; -NS_DEFINE_STATIC_IID_ACCESSOR(nsXULTreeAccessible, - NS_XULTREEACCESSIBLE_IMPL_CID) - /** * Base class for tree item accessibles. */