Bug 1172396 - Fix for ContentParent on non-EME builds on a CLOSED TREE - r=bustage
authorEdwin Flores <edwin@mozilla.com>
Tue, 01 Sep 2015 18:06:57 +1200
changeset 260220 4085ce7f545953258bad1e12c6f146ee381b2215
parent 260219 4843e223c10e0614a89602eb0f2a4b1f237d4122
child 260221 8294d86c241d09d866235f7883a84efcff8b0cb4
push id64445
push usereflores@mozilla.com
push dateTue, 01 Sep 2015 06:07:08 +0000
treeherdermozilla-inbound@4085ce7f5459 [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 for ContentParent on non-EME builds on a CLOSED TREE - r=bustage
dom/ipc/ContentParent.cpp
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -37,17 +37,19 @@
 #include "mozilla/dom/DataStoreService.h"
 #include "mozilla/dom/DataTransfer.h"
 #include "mozilla/dom/DOMStorageIPC.h"
 #include "mozilla/dom/Element.h"
 #include "mozilla/dom/File.h"
 #include "mozilla/dom/ExternalHelperAppParent.h"
 #include "mozilla/dom/FileSystemRequestParent.h"
 #include "mozilla/dom/GeolocationBinding.h"
+#ifdef MOZ_EME
 #include "mozilla/dom/MediaKeySystemAccess.h"
+#endif
 #include "mozilla/dom/NuwaParent.h"
 #include "mozilla/dom/PContentBridgeParent.h"
 #include "mozilla/dom/PContentPermissionRequestParent.h"
 #include "mozilla/dom/PCycleCollectWithLogsParent.h"
 #include "mozilla/dom/PFMRadioParent.h"
 #include "mozilla/dom/PMemoryReportRequestParent.h"
 #include "mozilla/dom/ServiceWorkerRegistrar.h"
 #include "mozilla/dom/bluetooth/PBluetoothParent.h"
@@ -1100,19 +1102,23 @@ ContentParent::RecvGetGMPPluginVersionFo
 }
 
 bool
 ContentParent::RecvIsGMPPresentOnDisk(const nsString& aKeySystem,
                                       const nsCString& aVersion,
                                       bool* aIsPresent,
                                       nsCString* aMessage)
 {
+#ifdef MOZ_EME
     *aIsPresent = MediaKeySystemAccess::IsGMPPresentOnDisk(aKeySystem,
                                                            aVersion,
                                                            *aMessage);
+#else
+    *aIsPresent = false;
+#endif
 
     return true;
 }
 
 bool
 ContentParent::RecvLoadPlugin(const uint32_t& aPluginId, nsresult* aRv, uint32_t* aRunID)
 {
     *aRv = NS_OK;