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

Bug 1382788 - Remove GetBlocklistState IPC message; r=bsmedberg

Browse Source 
We removed all uses of GetBlocklistState in bug 1350640. This patch
removes the message and supporting functions from the PContent IPDL.

MozReview-Commit-ID: 4JtGAWZ0nPu

--HG--
extra : rebase_source : 4eb3c21e3768e9d8284d4eec129e099be5ef17d0
This commit is contained in:
Kyle Machulis 2017-07-20 12:57:01 -07:00
parent 570c7fcbc6
commit 2c4c8a9654
4 changed files with 0 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
dom/ipc/ContentParent.cpp
View File

@ -1134,31 +1134,6 @@ ContentParent::RecvConnectPluginBridge(const uint32_t& aPluginId,
return IPC_OK(); return IPC_OK();
} }
mozilla::ipc::IPCResult
ContentParent::RecvGetBlocklistState(const uint32_t& aPluginId,
uint32_t* aState)
{
*aState = nsIBlocklistService::STATE_BLOCKED;
RefPtr<nsPluginHost> pluginHost = nsPluginHost::GetInst();
if (!pluginHost) {
NS_WARNING("Plugin host not found");
return IPC_FAIL_NO_REASON(this);
}
nsPluginTag* tag = pluginHost->PluginWithId(aPluginId);
if (!tag) {
// Default state is blocked anyway
NS_WARNING("Plugin tag not found. This should never happen, but to avoid a crash we're forcibly blocking it");
return IPC_OK();
}
if (NS_FAILED(tag->GetBlocklistState(aState))) {
return IPC_FAIL_NO_REASON(this);
}
return IPC_OK();
}
/*static*/ TabParent* /*static*/ TabParent*
ContentParent::CreateBrowser(const TabContext& aContext, ContentParent::CreateBrowser(const TabContext& aContext,
Element* aFrameElement, Element* aFrameElement,

3
dom/ipc/ContentParent.h
View File

@ -304,9 +304,6 @@ public:
nsresult* aRv, nsresult* aRv,
Endpoint<PPluginModuleParent>* aEndpoint) override; Endpoint<PPluginModuleParent>* aEndpoint) override;
virtual mozilla::ipc::IPCResult RecvGetBlocklistState(const uint32_t& aPluginId,
uint32_t* aIsBlocklisted) override;
virtual mozilla::ipc::IPCResult RecvUngrabPointer(const uint32_t& aTime) override; virtual mozilla::ipc::IPCResult RecvUngrabPointer(const uint32_t& aTime) override;
virtual mozilla::ipc::IPCResult RecvRemovePermission(const IPC::Principal& aPrincipal, virtual mozilla::ipc::IPCResult RecvRemovePermission(const IPC::Principal& aPrincipal,

5
dom/ipc/PContent.ipdl
View File

@ -641,11 +641,6 @@ parent:
sync ConnectPluginBridge(uint32_t aPluginId) sync ConnectPluginBridge(uint32_t aPluginId)
returns (nsresult rv, Endpoint<PPluginModuleParent> aEndpoint); returns (nsresult rv, Endpoint<PPluginModuleParent> aEndpoint);
/**
* Return the current blocklist state for a particular plugin.
*/
sync GetBlocklistState(uint32_t aPluginId) returns (uint32_t aState);
async PJavaScript(); async PJavaScript();
async PRemoteSpellcheckEngine(); async PRemoteSpellcheckEngine();

2
ipc/ipdl/sync-messages.ini
View File

@ -858,8 +858,6 @@ description =
description = description =
[PContent::ConnectPluginBridge] [PContent::ConnectPluginBridge]
description = description =
[PContent::GetBlocklistState]
description =
[PContent::NSSU2FTokenIsCompatibleVersion] [PContent::NSSU2FTokenIsCompatibleVersion]
description = description =
[PContent::NSSU2FTokenIsRegistered] [PContent::NSSU2FTokenIsRegistered]