Bug 1312540 - Remove GetGMPPluginVersionForAPI IPC. r=mconley draft
authorChris Pearce <cpearce@mozilla.com>
Tue, 01 Nov 2016 18:48:18 +1300
changeset 432380 12b18b4606bcd9def508227c0358beffba539469
parent 432379 1c6781ab4814578294722a0037eef76ba06568e8
child 432397 107cdf1337d02cf954b239ba5bcf8a2f000bfc1e
push id34287
push usercpearce@mozilla.com
push dateTue, 01 Nov 2016 21:06:06 +0000
reviewersmconley
bugs1312540
milestone52.0a1
Bug 1312540 - Remove GetGMPPluginVersionForAPI IPC. r=mconley MozReview-Commit-ID: EKtFKd1dgjJ
dom/ipc/ContentParent.cpp
dom/ipc/ContentParent.h
dom/ipc/PContent.ipdl
dom/media/gmp/GMPServiceParent.cpp
dom/media/gmp/GMPServiceParent.h
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -961,27 +961,16 @@ static nsIDocShell* GetOpenerDocShellHel
 
 bool
 ContentParent::RecvCreateGMPService()
 {
   return PGMPService::Open(this);
 }
 
 bool
-ContentParent::RecvGetGMPPluginVersionForAPI(const nsCString& aAPI,
-                                             nsTArray<nsCString>&& aTags,
-                                             bool* aHasVersion,
-                                             nsCString* aVersion)
-{
-  return GMPServiceParent::RecvGetGMPPluginVersionForAPI(aAPI, Move(aTags),
-                                                         aHasVersion,
-                                                         aVersion);
-}
-
-bool
 ContentParent::RecvIsGMPPresentOnDisk(const nsString& aKeySystem,
                                       const nsCString& aVersion,
                                       bool* aIsPresent,
                                       nsCString* aMessage)
 {
   *aIsPresent = MediaKeySystemAccess::IsGMPPresentOnDisk(aKeySystem,
                                                          aVersion,
                                                          *aMessage);
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -243,21 +243,16 @@ public:
                                       bool* aIsForApp,
                                       bool* aIsForBrowser,
                                       TabId* aTabId) override;
 
   virtual bool RecvBridgeToChildProcess(const ContentParentId& aCpId) override;
 
   virtual bool RecvCreateGMPService() override;
 
-  virtual bool RecvGetGMPPluginVersionForAPI(const nsCString& aAPI,
-                                             nsTArray<nsCString>&& aTags,
-                                             bool* aHasPlugin,
-                                             nsCString* aVersion) override;
-
   virtual bool RecvIsGMPPresentOnDisk(const nsString& aKeySystem,
                                       const nsCString& aVersion,
                                       bool* aIsPresent,
                                       nsCString* aMessage) override;
 
   virtual bool RecvLoadPlugin(const uint32_t& aPluginId, nsresult* aRv,
                               uint32_t* aRunID) override;
 
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -705,18 +705,16 @@ parent:
 
     sync CreateChildProcess(IPCTabContext context,
                             ProcessPriority priority,
                             TabId openerTabId)
         returns (ContentParentId cpId, bool isForApp, bool isForBrowser, TabId tabId);
     sync BridgeToChildProcess(ContentParentId cpId);
 
     async CreateGMPService();
-    sync GetGMPPluginVersionForAPI(nsCString api, nsCString[] tags)
-        returns (bool hasPlugin, nsCString version);
     sync IsGMPPresentOnDisk(nsString keySystem, nsCString version)
         returns (bool isPresent, nsCString message);
 
     /**
      * This call connects the content process to a plugin process. While this
      * call runs, a new PluginModuleParent will be created in the ContentChild
      * via bridging. The corresponding PluginModuleChild will live in the plugin
      * process.
--- a/dom/media/gmp/GMPServiceParent.cpp
+++ b/dom/media/gmp/GMPServiceParent.cpp
@@ -2039,30 +2039,16 @@ GMPServiceParent::RecvGetGMPNodeId(const
                                    const bool& aInPrivateBrowsing,
                                    nsCString* aID)
 {
   nsresult rv = mService->GetNodeId(aOrigin, aTopLevelOrigin, aGMPName,
                                     aInPrivateBrowsing, *aID);
   return NS_SUCCEEDED(rv);
 }
 
-/* static */
-bool
-GMPServiceParent::RecvGetGMPPluginVersionForAPI(const nsCString& aAPI,
-                                                nsTArray<nsCString>&& aTags,
-                                                bool* aHasPlugin,
-                                                nsCString* aVersion)
-{
-  RefPtr<GeckoMediaPluginServiceParent> service =
-    GeckoMediaPluginServiceParent::GetSingleton();
-  return service &&
-         NS_SUCCEEDED(service->GetPluginVersionForAPI(aAPI, &aTags, aHasPlugin,
-                                                      *aVersion));
-}
-
 class DeleteGMPServiceParent : public mozilla::Runnable
 {
 public:
   explicit DeleteGMPServiceParent(GMPServiceParent* aToDelete)
     : mToDelete(aToDelete)
   {
   }
 
--- a/dom/media/gmp/GMPServiceParent.h
+++ b/dom/media/gmp/GMPServiceParent.h
@@ -247,20 +247,16 @@ public:
   }
   virtual ~GMPServiceParent();
 
   bool RecvGetGMPNodeId(const nsString& aOrigin,
                         const nsString& aTopLevelOrigin,
                         const nsString& aGMPName,
                         const bool& aInPrivateBrowsing,
                         nsCString* aID) override;
-  static bool RecvGetGMPPluginVersionForAPI(const nsCString& aAPI,
-                                            nsTArray<nsCString>&& aTags,
-                                            bool* aHasPlugin,
-                                            nsCString* aVersion);
   void ActorDestroy(ActorDestroyReason aWhy) override;
 
   static PGMPServiceParent* Create(Transport* aTransport, ProcessId aOtherPid);
 
   bool RecvSelectGMP(const nsCString& aNodeId,
                      const nsCString& aAPI,
                      nsTArray<nsCString>&& aTags,
                      uint32_t* aOutPluginId,