Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 19:04:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset f4c6758e15f9 (bug 1307708) on developers request

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2017-02-09 11:49:38 +01:00
parent 756cf900c9
commit f0343913a8
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/plugins/ipc/PPluginModule.ipdl
View File

@ -160,7 +160,7 @@ parent:
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)

2
dom/plugins/ipc/PluginModuleChild.cpp
View File

@ -2118,7 +2118,7 @@ PMCGetKeyState(int aVirtKey)
PluginModuleChild* chromeInstance = PluginModuleChild::GetChrome();
if (chromeInstance) {
int16_t ret = 0;
if (chromeInstance->SendGetKeyState(aVirtKey, &ret)) {
if (chromeInstance->CallGetKeyState(aVirtKey, &ret)) {
return ret;
}
}

6
dom/plugins/ipc/PluginModuleParent.cpp
View File

@ -3403,19 +3403,19 @@ PluginModuleChromeParent::RecvProfile(const nsCString& aProfile)
}
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
}

4
dom/plugins/ipc/PluginModuleParent.h
View File

@ -213,7 +213,7 @@ protected:
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;
@ -507,7 +507,7 @@ class PluginModuleChromeParent
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