Backed out changeset b3c8a3a052ea (bug 1452146) for mochitest automation.py failures
authorNoemi Erli <nerli@mozilla.com>
Mon, 03 Dec 2018 05:13:57 +0200
changeset 505624 b1c9fa45f90ee5f26843749557a2fda84581f406
parent 505623 b3c8a3a052ea96b093839b5732661e6c1d006a77
child 505625 53bb18cc23abfddd18b90efedb0f2596ba5293dd
push id10290
push userffxbld-merge
push dateMon, 03 Dec 2018 16:23:23 +0000
treeherdermozilla-beta@700bed2445e6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1452146
milestone65.0a1
backs outb3c8a3a052ea96b093839b5732661e6c1d006a77
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 b3c8a3a052ea (bug 1452146) for mochitest automation.py failures
dom/ipc/ContentParent.cpp
gfx/thebes/gfxPlatform.cpp
modules/libpref/init/StaticPrefList.h
modules/libpref/init/all.js
testing/mochitest/mochitest_options.py
testing/mozbase/mozleak/mozleak/leaklog.py
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -2603,17 +2603,17 @@ void ContentParent::InitInternal(Process
   MOZ_ASSERT(opened);
 
   Unused << SendInitRendering(std::move(compositor), std::move(imageBridge),
                               std::move(vrBridge), std::move(videoManager),
                               namespaces);
 
   gpm->AddListener(this);
 
-  if (StaticPrefs::MediaRddProcessEnabled() && BrowserTabsRemoteAutostart()) {
+  if (StaticPrefs::MediaRddProcessEnabled()) {
     RDDProcessManager* rdd = RDDProcessManager::Get();
 
     Endpoint<PRemoteDecoderManagerChild> remoteManager;
     bool rddOpened = rdd->CreateContentBridge(OtherPid(), &remoteManager);
     MOZ_ASSERT(rddOpened);
 
     if (rddOpened) {
       // not using std::move here (like in SendInitRendering above) because
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -914,17 +914,16 @@ void gfxPlatform::Init() {
   gPlatform->InitOMTPConfig();
 
   if (gfxConfig::IsEnabled(Feature::GPU_PROCESS)) {
     GPUProcessManager* gpu = GPUProcessManager::Get();
     gpu->LaunchGPUProcess();
   }
 
   if (XRE_IsParentProcess() &&
-      BrowserTabsRemoteAutostart() &&  // only do rdd process if e10s on
       Preferences::GetBool("media.rdd-process.enabled", false)) {
     RDDProcessManager* rdd = RDDProcessManager::Get();
     if (rdd) {
       rdd->LaunchRDDProcess();
     }
   }
 
   if (XRE_IsParentProcess() || recordreplay::IsRecordingOrReplaying()) {
--- a/modules/libpref/init/StaticPrefList.h
+++ b/modules/libpref/init/StaticPrefList.h
@@ -1098,27 +1098,21 @@ VARCACHE_PREF(
 #endif
 VARCACHE_PREF(
   "media.gpu-process-decoder",
    MediaGpuProcessDecoder,
   RelaxedAtomicBool, PREF_VALUE
 )
 #undef PREF_VALUE
 
-#if defined(XP_WIN) || defined(XP_MACOSX)
-# define PREF_VALUE true
-#else
-# define PREF_VALUE false
-#endif
 VARCACHE_PREF(
   "media.rdd-process.enabled",
    MediaRddProcessEnabled,
-  RelaxedAtomicBool, PREF_VALUE
+  RelaxedAtomicBool, false
 )
-#undef PREF_VALUE
 
 VARCACHE_PREF(
   "media.rdd-process.startup_timeout_ms",
    MediaRddProcessStartupTimeoutMs,
   RelaxedAtomicInt32, 5000
 )
 
 #ifdef ANDROID
@@ -1419,27 +1413,21 @@ VARCACHE_PREF(
 // WebM
 VARCACHE_PREF(
   "media.webm.enabled",
    MediaWebMEnabled,
   RelaxedAtomicBool, true
 )
 
 // AV1
-#if defined(XP_WIN) || defined(XP_MACOSX)
-# define PREF_VALUE true
-#else
-# define PREF_VALUE false
-#endif
 VARCACHE_PREF(
   "media.av1.enabled",
    MediaAv1Enabled,
-  RelaxedAtomicBool, PREF_VALUE
+  RelaxedAtomicBool, false
 )
-#undef PREF_VALUE
 VARCACHE_PREF(
   "media.av1.use-dav1d",
    MediaAv1UseDav1d,
   RelaxedAtomicBool, false
 )
 
 VARCACHE_PREF(
   "media.flac.enabled",
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -637,21 +637,17 @@ pref("media.cubeb.sandbox", true);
 pref("media.audioipc.pool_size", 2);
 // 64 * 4 kB stack per pool thread.
 pref("media.audioipc.stack_size", 262144);
 #else
 pref("media.cubeb.sandbox", false);
 #endif
 
 #ifdef MOZ_AV1
-#if defined(XP_MACOSX) || defined(XP_WIN)
-pref("media.av1.enabled", true);
-#else
 pref("media.av1.enabled", false);
-#endif
 // Use libdav1d instead of libaom
 pref("media.av1.use-dav1d", false);
 #endif
 
 pref("media.webaudio.audiocontextoptions-samplerate.enabled", true);
 
 // setSinkId expected to be unconditionally enabled in 63. Till then the
 // implementation will remain hidden behind this pref (Bug 1152401, Bug 934425).
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -837,17 +837,16 @@ class MochitestArguments(ArgumentContain
         if options.nested_oop:
             options.e10s = True
 
         options.leakThresholds = {
             "default": options.defaultLeakThreshold,
             "tab": options.defaultLeakThreshold,
             # GMP rarely gets a log, but when it does, it leaks a little.
             "geckomediaplugin": 20000,
-            "rdd": 400,
         }
 
         # See the dependencies of bug 1401764.
         if mozinfo.isWin:
             options.leakThresholds["tab"] = 1000
 
         # XXX We can't normalize test_paths in the non build_obj case here,
         # because testRoot depends on the flavor, which is determined by the
--- a/testing/mozbase/mozleak/mozleak/leaklog.py
+++ b/testing/mozbase/mozleak/mozleak/leaklog.py
@@ -166,17 +166,17 @@ def process_leak_log(leak_log_file, leak
             "leakcheck | refcount logging is off, so leaks can't be detected!")
         return
 
     leakThresholds = leak_thresholds or {}
     ignoreMissingLeaks = ignore_missing_leaks or []
 
     # This list is based on kGeckoProcessTypeString. ipdlunittest processes likely
     # are not going to produce leak logs we will ever see.
-    knownProcessTypes = ["default", "plugin", "tab", "geckomediaplugin", "gpu", "rdd"]
+    knownProcessTypes = ["default", "plugin", "tab", "geckomediaplugin", "gpu"]
 
     for processType in knownProcessTypes:
         log.info("TEST-INFO | leakcheck | %s process: leak threshold set at %d bytes"
                  % (processType, leakThresholds.get(processType, 0)))
 
     for processType in leakThresholds:
         if processType not in knownProcessTypes:
             log.error("TEST-UNEXPECTED-FAIL | leakcheck | "