Bug 1172396 - Use GMPVideoDecoderTrialCreator when e10s is enabled - r=cpearce
authorEdwin Flores <edwin@mozilla.com>
Tue, 01 Sep 2015 17:31:48 +1200
changeset 260254 eb81c8e930d636ffe0fe5019150546a8ef16dff8
parent 260253 66a7b65bdff9a6b844b0e37aa93eb375098ba835
child 260255 a305c15a41024aa47279f91ae06355e583d7cc0f
push id29304
push usercbook@mozilla.com
push dateTue, 01 Sep 2015 12:32:25 +0000
treeherdermozilla-central@dd509db16a13 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerscpearce
bugs1172396
milestone43.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 1172396 - Use GMPVideoDecoderTrialCreator when e10s is enabled - r=cpearce
dom/media/eme/GMPVideoDecoderTrialCreator.cpp
--- a/dom/media/eme/GMPVideoDecoderTrialCreator.cpp
+++ b/dom/media/eme/GMPVideoDecoderTrialCreator.cpp
@@ -493,22 +493,16 @@ TestGMPVideoDecoder::CreateGMPVideoDecod
 
 void
 GMPVideoDecoderTrialCreator::MaybeAwaitTrialCreate(const nsAString& aKeySystem,
                                                    AbstractPromiseLike* aPromisey,
                                                    nsPIDOMWindow* aParent)
 {
   MOZ_ASSERT(NS_IsMainThread());
 
-  if (XRE_GetProcessType() == GeckoProcessType_Content) {
-    // Currently broken with e10s...
-    aPromisey->Resolve();
-    return;
-  }
-
   if (!mTestCreate.Contains(aKeySystem)) {
     mTestCreate.Put(aKeySystem, new TrialCreateData(aKeySystem));
   }
   TrialCreateData* data = mTestCreate.Get(aKeySystem);
   MOZ_ASSERT(data);
 
   switch (data->mStatus) {
     case TrialCreateState::Succeeded: {