Backed out changeset 4f21884b0c36 (bug 1160844) for apparently causing the Gip(a) permafail CLOSED TREE
authorWes Kocher <wkocher@mozilla.com>
Fri, 08 May 2015 18:10:00 -0700
changeset 274444 24378757d86c7a85d6f1195416f47d391a8d6d5a
parent 274443 05e4643b27ec2d7474bc20ba6d12f64526fe58ab
child 274445 e6d93b374a9bc80e87553c36d6555dfa97a669b7
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1160844
milestone40.0a1
backs out4f21884b0c36b5a3e136991d515cbb33f9da621f
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
Backed out changeset 4f21884b0c36 (bug 1160844) for apparently causing the Gip(a) permafail CLOSED TREE
dom/media/webspeech/synth/pico/nsPicoService.cpp
testing/profiles/prefs_general.js
--- a/dom/media/webspeech/synth/pico/nsPicoService.cpp
+++ b/dom/media/webspeech/synth/pico/nsPicoService.cpp
@@ -12,17 +12,17 @@
 #include "nsISimpleEnumerator.h"
 
 #include "mozilla/dom/nsSynthVoiceRegistry.h"
 #include "mozilla/dom/nsSpeechTask.h"
 
 #include "nsIFile.h"
 #include "nsThreadUtils.h"
 #include "prenv.h"
-#include "mozilla/Preferences.h"
+
 #include "mozilla/DebugOnly.h"
 #include <dlfcn.h>
 
 // Pico API constants
 
 // Size of memory allocated for pico engine and voice resources.
 // We only have one voice and its resources loaded at once, so this
 // should always be enough.
@@ -448,21 +448,16 @@ nsPicoService::~nsPicoService()
 
 NS_IMETHODIMP
 nsPicoService::Observe(nsISupports* aSubject, const char* aTopic,
                        const char16_t* aData)
 {
   MOZ_ASSERT(NS_IsMainThread());
   NS_ENSURE_TRUE(!strcmp(aTopic, "profile-after-change"), NS_ERROR_UNEXPECTED);
 
-  if (!Preferences::GetBool("media.webspeech.synth.enabled") ||
-      Preferences::GetBool("media.webspeech.synth.test")) {
-    return NS_OK;
-  }
-
   DebugOnly<nsresult> rv = NS_NewNamedThread("Pico Worker", getter_AddRefs(mThread));
   MOZ_ASSERT(NS_SUCCEEDED(rv));
   return mThread->Dispatch(
     NS_NewRunnableMethod(this, &nsPicoService::Init), NS_DISPATCH_NORMAL);
 }
 // nsISpeechService
 
 NS_IMETHODIMP
--- a/testing/profiles/prefs_general.js
+++ b/testing/profiles/prefs_general.js
@@ -313,11 +313,8 @@ user_pref("network.proxy.pac_generator",
 
 // Make tests run consistently on DevEdition (which has a lightweight theme
 // selected by default).
 user_pref("lightweightThemes.selectedThemeID", "");
 user_pref("browser.devedition.theme.enabled", false);
 
 // Disable periodic updates of service workers.
 user_pref("dom.serviceWorkers.periodic-updates.enabled", false);
-
-// Enable speech synth test service, and disable built in platform services.
-user_pref("media.webspeech.synth.test", true);