Bug 1387832 - Remove @deprecated nsIAccessibleRetrieval. r=surkov
authorMasatoshi Kimura <VYV03354@nifty.ne.jp>
Sun, 06 Aug 2017 23:34:32 +0900
changeset 373656 2e37a43d33d3fe141c7e634727bbf43e54c3108f
parent 373655 946c7dc6aaa46a90b5b851442b93552532824343
child 373657 0dbe24ac3a2ffb28b2f1425f97186a1fb531f5ae
push id32308
push userarchaeopteryx@coole-files.de
push dateThu, 10 Aug 2017 15:20:33 +0000
treeherdermozilla-central@5322c03f4c85 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssurkov
bugs1387832
milestone57.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1387832 - Remove @deprecated nsIAccessibleRetrieval. r=surkov MozReview-Commit-ID: DaqIezvQvUe
accessible/interfaces/nsIAccessibilityService.idl
accessible/xpcom/xpcAccessibilityService.cpp
accessible/xpcom/xpcAccessibilityService.h
--- a/accessible/interfaces/nsIAccessibilityService.idl
+++ b/accessible/interfaces/nsIAccessibilityService.idl
@@ -93,16 +93,8 @@ interface nsIAccessibilityService : nsIS
    */
   void setLogging(in ACString aModules);
 
   /**
    * Return true if the given module is logged.
    */
   boolean isLogged(in AString aModule);
 };
-
-/**
- * @deprecated, use nsIAccessibilityService instead.
- */
-[scriptable, builtinclass, uuid(d85e0cbe-47ce-490c-8488-f821dd2be0c2)]
-interface nsIAccessibleRetrieval : nsIAccessibilityService
-{
-};
--- a/accessible/xpcom/xpcAccessibilityService.cpp
+++ b/accessible/xpcom/xpcAccessibilityService.cpp
@@ -86,18 +86,17 @@ xpcAccessibilityService::Release(void)
         nsITimer::TYPE_ONE_SHOT,
         "xpcAccessibilityService::Release");
     }
   }
 
   return count;
 }
 
-NS_IMPL_QUERY_INTERFACE(xpcAccessibilityService, nsIAccessibilityService,
-                                                 nsIAccessibleRetrieval)
+NS_IMPL_QUERY_INTERFACE(xpcAccessibilityService, nsIAccessibilityService)
 
 NS_IMETHODIMP
 xpcAccessibilityService::GetApplicationAccessible(nsIAccessible** aAccessibleApplication)
 {
   NS_ENSURE_ARG_POINTER(aAccessibleApplication);
 
   NS_IF_ADDREF(*aAccessibleApplication = XPCApplicationAcc());
   return NS_OK;
--- a/accessible/xpcom/xpcAccessibilityService.h
+++ b/accessible/xpcom/xpcAccessibilityService.h
@@ -2,23 +2,22 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this file,
  * You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifndef mozilla_a11y_xpcAccessibilityService_h_
 #define mozilla_a11y_xpcAccessibilityService_h_
 
 #include "nsIAccessibilityService.h"
 
-class xpcAccessibilityService : public nsIAccessibleRetrieval
+class xpcAccessibilityService : public nsIAccessibilityService
 {
 
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIACCESSIBILITYSERVICE
-  NS_DECL_NSIACCESSIBLERETRIEVAL
 
   /**
    * Return true if xpc accessibility service is in use.
    */
   static bool IsInUse() {
     // When ref count goes down to 1 (held internally as a static reference),
     // it means that there are no more external references and thus it is not in
     // use.