Backed out changeset f4c6758e15f9 (bug 1307708) on developers request
authorCarsten "Tomcat" Book <cbook@mozilla.com>
Thu, 09 Feb 2017 11:49:38 +0100
changeset 390526 b772e0f4138540113e91a46c99bb0d14ecc8acca
parent 390525 70debab476881121ddfe92fc60c80cfae0a63bc7
child 390535 4dfd0d2d5dd3b640d46ee405af7523e37545c155
push id1468
push userasasaki@mozilla.com
push dateMon, 05 Jun 2017 19:31:07 +0000
treeherdermozilla-release@0641fc6ee9d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1307708
milestone54.0a1
backs outf4c6758e15f9ac5f35ae6cad5d1c24ba9b9016f0
first release with
nightly linux32
b772e0f41385 / 54.0a1 / 20170209110141 / files
nightly linux64
b772e0f41385 / 54.0a1 / 20170209110141 / files
nightly mac
b772e0f41385 / 54.0a1 / 20170209030214 / files
nightly win32
b772e0f41385 / 54.0a1 / 20170209030214 / files
nightly win64
b772e0f41385 / 54.0a1 / 20170209030214 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset f4c6758e15f9 (bug 1307708) on developers request
dom/plugins/ipc/PPluginModule.ipdl
dom/plugins/ipc/PluginModuleChild.cpp
dom/plugins/ipc/PluginModuleParent.cpp
dom/plugins/ipc/PluginModuleParent.h
--- a/dom/plugins/ipc/PPluginModule.ipdl
+++ b/dom/plugins/ipc/PPluginModule.ipdl
@@ -155,17 +155,17 @@ parent:
 
   async Profile(nsCString aProfile);
 
   // Answers to request about site data
   async ReturnClearSiteData(NPError aRv, uint64_t aCallbackId);
 
   async ReturnSitesWithData(nsCString[] aSites, uint64_t aCallbackId);
 
-  sync GetKeyState(int32_t aVirtKey)
+  intr GetKeyState(int32_t aVirtKey)
     returns (int16_t aState);
 
   intr NPN_SetValue_NPPVpluginRequiresAudioDeviceChanges(bool shouldRegister)
     returns (NPError result);
 };
 
 } // namespace plugins
 } // namespace mozilla
--- a/dom/plugins/ipc/PluginModuleChild.cpp
+++ b/dom/plugins/ipc/PluginModuleChild.cpp
@@ -2113,17 +2113,17 @@ PMCGetKeyState(int aVirtKey)
                           GetLastError()));
         MOZ_ASSERT(err != WAIT_FAILED);
         CloseHandle(semaphore);
         return 0;
     }
     PluginModuleChild* chromeInstance = PluginModuleChild::GetChrome();
     if (chromeInstance) {
         int16_t ret = 0;
-        if (chromeInstance->SendGetKeyState(aVirtKey, &ret)) {
+        if (chromeInstance->CallGetKeyState(aVirtKey, &ret)) {
           return ret;
         }
     }
     return sGetKeyStatePtrStub(aVirtKey);
 }
 #endif
 
 PPluginInstanceChild*
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -3398,24 +3398,24 @@ PluginModuleChromeParent::RecvProfile(co
 
     mProfile = aProfile;
     mGatherer->GatheredOOPProfile();
 #endif
     return IPC_OK();
 }
 
 mozilla::ipc::IPCResult
-PluginModuleParent::RecvGetKeyState(const int32_t& aVirtKey, int16_t* aRet)
+PluginModuleParent::AnswerGetKeyState(const int32_t& aVirtKey, int16_t* aRet)
 {
     return IPC_FAIL_NO_REASON(this);
 }
 
 mozilla::ipc::IPCResult
-PluginModuleChromeParent::RecvGetKeyState(const int32_t& aVirtKey,
+PluginModuleChromeParent::AnswerGetKeyState(const int32_t& aVirtKey,
                                             int16_t* aRet)
 {
 #if defined(XP_WIN)
     *aRet = ::GetKeyState(aVirtKey);
     return IPC_OK();
 #else
-    return PluginModuleParent::RecvGetKeyState(aVirtKey, aRet);
+    return PluginModuleParent::AnswerGetKeyState(aVirtKey, aRet);
 #endif
 }
--- a/dom/plugins/ipc/PluginModuleParent.h
+++ b/dom/plugins/ipc/PluginModuleParent.h
@@ -208,17 +208,17 @@ protected:
     static void TimeoutChanged(const char* aPref, void* aModule);
 
     virtual void UpdatePluginTimeout() {}
 
     virtual mozilla::ipc::IPCResult RecvNotifyContentModuleDestroyed() override { return IPC_OK(); }
 
     virtual mozilla::ipc::IPCResult RecvProfile(const nsCString& aProfile) override { return IPC_OK(); }
 
-    virtual mozilla::ipc::IPCResult RecvGetKeyState(const int32_t& aVirtKey, int16_t* aRet) override;
+    virtual mozilla::ipc::IPCResult AnswerGetKeyState(const int32_t& aVirtKey, int16_t* aRet) override;
 
     virtual mozilla::ipc::IPCResult RecvReturnClearSiteData(const NPError& aRv,
                                                             const uint64_t& aCallbackId) override;
 
     virtual mozilla::ipc::IPCResult RecvReturnSitesWithData(nsTArray<nsCString>&& aSites,
                                                             const uint64_t& aCallbackId) override;
 
     void SetPluginFuncs(NPPluginFuncs* aFuncs);
@@ -502,17 +502,17 @@ class PluginModuleChromeParent
     void StartProfiler(nsIProfilerStartParams* aParams);
     void StopProfiler();
 #endif
 
     virtual mozilla::ipc::IPCResult
     RecvProfile(const nsCString& aProfile) override;
 
     virtual mozilla::ipc::IPCResult
-    RecvGetKeyState(const int32_t& aVirtKey, int16_t* aRet) override;
+    AnswerGetKeyState(const int32_t& aVirtKey, int16_t* aRet) override;
 
 private:
     virtual void
     EnteredCxxStack() override;
 
     void
     ExitedCxxStack() override;