Bug 858136 - Rename nsIDOMSpeechSynthesisGetter as nsISpeechSynthesisGetter. r=smaug

--HG--
rename : dom/interfaces/base/nsIDOMSpeechSynthesisGetter.idl => dom/interfaces/base/nsISpeechSynthesisGetter.idl

dom/base/nsDOMClassInfo.cpp

@@ -1764,7 +1764,7 @@ nsDOMClassInfo::Init()
   DOM_CLASSINFO_MAP_BEGIN(Window, nsIDOMWindow)
     DOM_CLASSINFO_WINDOW_MAP_ENTRIES(nsGlobalWindow::HasIndexedDBSupport())
 #ifdef MOZ_WEBSPEECH
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSpeechSynthesisGetter)
+    DOM_CLASSINFO_MAP_ENTRY(nsISpeechSynthesisGetter)
 #endif
   DOM_CLASSINFO_MAP_END
 
@@ -2108,7 +2108,7 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_WINDOW_MAP_ENTRIES(true)
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMChromeWindow)
 #ifdef MOZ_WEBSPEECH
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSpeechSynthesisGetter)
+    DOM_CLASSINFO_MAP_ENTRY(nsISpeechSynthesisGetter)
 #endif
   DOM_CLASSINFO_MAP_END
 
@@ -2299,7 +2299,7 @@ nsDOMClassInfo::Init()
     DOM_CLASSINFO_WINDOW_MAP_ENTRIES(nsGlobalWindow::HasIndexedDBSupport())
     DOM_CLASSINFO_MAP_ENTRY(nsIDOMModalContentWindow)
 #ifdef MOZ_WEBSPEECH
-    DOM_CLASSINFO_MAP_ENTRY(nsIDOMSpeechSynthesisGetter)
+    DOM_CLASSINFO_MAP_ENTRY(nsISpeechSynthesisGetter)
 #endif
   DOM_CLASSINFO_MAP_END
 

dom/base/nsGlobalWindow.cpp

@@ -1493,7 +1493,7 @@ NS_INTERFACE_MAP_BEGIN_CYCLE_COLLECTION(nsGlobalWindow)
   NS_INTERFACE_MAP_ENTRY(nsIDOMWindowB2G)
 #endif // MOZ_B2G
 #ifdef MOZ_WEBSPEECH
-  NS_INTERFACE_MAP_ENTRY(nsIDOMSpeechSynthesisGetter)
+  NS_INTERFACE_MAP_ENTRY(nsISpeechSynthesisGetter)
 #endif // MOZ_B2G
   NS_INTERFACE_MAP_ENTRY(nsIDOMJSWindow)
   if (aIID.Equals(NS_GET_IID(nsIDOMWindowInternal))) {
@@ -3307,7 +3307,7 @@ nsPIDOMWindow::CreatePerformanceObjectIfNeeded()
   }
 }
 
-// nsIDOMSpeechSynthesisGetter
+// nsISpeechSynthesisGetter
 
 #ifdef MOZ_WEBSPEECH
 NS_IMETHODIMP

dom/base/nsGlobalWindow.h

@@ -73,7 +73,7 @@
 #endif // MOZ_B2G
 
 #ifdef MOZ_WEBSPEECH
-#include "nsIDOMSpeechSynthesisGetter.h"
+#include "nsISpeechSynthesisGetter.h"
 #endif // MOZ_WEBSPEECH
 
 #define DEFAULT_HOME_PAGE "www.mozilla.org"
@@ -271,7 +271,7 @@ class nsGlobalWindow : public mozilla::dom::EventTarget,
                      , public nsIDOMWindowB2G
 #endif // MOZ_B2G
 #ifdef MOZ_WEBSPEECH
-                     , public nsIDOMSpeechSynthesisGetter
+                     , public nsISpeechSynthesisGetter
 #endif // MOZ_WEBSPEECH
 {
 public:
@@ -328,8 +328,8 @@ public:
 #endif // MOZ_B2G
 
 #ifdef MOZ_WEBSPEECH
-  // nsIDOMSpeechSynthesisGetter
-  NS_DECL_NSIDOMSPEECHSYNTHESISGETTER
+  // nsISpeechSynthesisGetter
+  NS_DECL_NSISPEECHSYNTHESISGETTER
 #endif // MOZ_WEBSPEECH
 
   // nsIDOMWindowPerformance

dom/interfaces/base/moz.build

@@ -60,7 +60,7 @@ if CONFIG['MOZ_B2G']:
 
 if CONFIG['MOZ_WEBSPEECH']:
     XPIDL_SOURCES += [
-        'nsIDOMSpeechSynthesisGetter.idl'
+        'nsISpeechSynthesisGetter.idl'
     ]
 
 XPIDL_MODULE = 'dom_base'

dom/interfaces/base/nsISpeechSynthesisGetter.idl

@@ -10,8 +10,8 @@
  * http://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html#tts-section
  */
 
-[scriptable, uuid(9fe60496-8356-430e-bf38-2debec45711e)]
-interface nsIDOMSpeechSynthesisGetter : nsISupports
+[scriptable, uuid(31e6c818-0279-4948-843c-930043f6bafd)]
+interface nsISpeechSynthesisGetter : nsISupports
 {
   readonly attribute nsISupports speechSynthesis;
 };

dom/tests/mochitest/general/test_interfaces.html

@@ -548,7 +548,6 @@ var interfaceNamesInGlobalScope =
     "SpeechRecognitionEvent",
     "SpeechRecognitionError",
     "SpeechSynthesisEvent",
-    "SpeechSynthesisGetter",
     "PushManager",
     "StyleSheetAddedEvent",
     "StyleSheetRemovedEvent"

js/xpconnect/src/dom_quickstubs.qsconf

@@ -46,7 +46,7 @@ members = [
     'nsIDOMWindow.onmouseleave',
     'nsIDOMWindowPerformance.performance',
     'nsIDOMJSWindow.dump',
-    'nsIDOMSpeechSynthesisGetter.speechSynthesis',
+    'nsISpeechSynthesisGetter.speechSynthesis',
     # nsLocationSH has ~ALLOW_PROP_MODS_TO_PROTOTYPE, so don't try.
     #'nsIDOMLocation.hostname',
     #'nsIDOMLocation.href',