Bug 1172396 - Fix bustage... again. CLOSED TREE. - r=bustage
authorEdwin Flores <eflores@mozilla.com>
Tue, 01 Sep 2015 18:40:36 +1200
changeset 260221 8294d86c241d09d866235f7883a84efcff8b0cb4
parent 260220 4085ce7f545953258bad1e12c6f146ee381b2215
child 260222 dffea8ce8b6073c522d7ea128ad0aee2efdfe66d
push id64446
push usereflores@mozilla.com
push dateTue, 01 Sep 2015 06:42:00 +0000
treeherdermozilla-inbound@8294d86c241d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage
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 - Fix bustage... again. CLOSED TREE. - r=bustage
dom/media/gmp/GMPServiceParent.cpp
--- a/dom/media/gmp/GMPServiceParent.cpp
+++ b/dom/media/gmp/GMPServiceParent.cpp
@@ -4,17 +4,19 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #include "GMPServiceParent.h"
 #include "GMPService.h"
 #include "prio.h"
 #include "mozilla/Logging.h"
 #include "GMPParent.h"
 #include "GMPVideoDecoderParent.h"
+#ifdef MOZ_EME
 #include "mozilla/dom/GMPVideoDecoderTrialCreator.h"
+#endif
 #include "nsIObserverService.h"
 #include "GeckoChildProcessHost.h"
 #include "mozilla/Preferences.h"
 #include "mozilla/ClearOnShutdown.h"
 #include "mozilla/SyncRunnable.h"
 #include "nsXPCOMPrivate.h"
 #include "mozilla/Services.h"
 #include "nsNativeCharsetUtils.h"
@@ -1202,22 +1204,26 @@ GeckoMediaPluginServiceParent::GetNodeId
   aCallback->Done(rv, nodeId);
   return rv;
 }
 
 NS_IMETHODIMP
 GeckoMediaPluginServiceParent::UpdateTrialCreateState(const nsAString& aKeySystem,
                                                       uint32_t aState)
 {
+#ifdef MOZ_EME
   nsString keySystem(aKeySystem);
   NS_DispatchToMainThread(NS_NewRunnableFunction([keySystem, aState] {
     mozilla::dom::GMPVideoDecoderTrialCreator::UpdateTrialCreateState(keySystem, aState);
   }));
 
   return NS_OK;
+#else
+  return NS_ERROR_FAILURE;
+#endif
 }
 
 static bool
 ExtractHostName(const nsACString& aOrigin, nsACString& aOutData)
 {
   nsCString str;
   str.Assign(aOrigin);
   int begin = str.Find("://");