Bug 1382788 - Remove GetBlocklistState IPC message; r=bsmedberg
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
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -1146,41 +1146,16 @@ ContentParent::RecvConnectPluginBridge(c
// pointer and just throw it away.
uint32_t dummy = 0;
if (!mozilla::plugins::SetupBridge(aPluginId, this, aRv, &dummy, aEndpoint)) {
return IPC_FAIL(this, "SetupBridge failed");
}
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*
ContentParent::CreateBrowser(const TabContext& aContext,
Element* aFrameElement,
ContentParent* aOpenerContentParent,
TabParent* aSameTabGroupAs,
uint64_t aNextTabParentId)
{
AUTO_PROFILER_LABEL("ContentParent::CreateBrowser", OTHER);
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -299,19 +299,16 @@ public:
Endpoint<PPluginModuleParent>* aEndpoint) override;
virtual mozilla::ipc::IPCResult RecvMaybeReloadPlugins() override;
virtual mozilla::ipc::IPCResult RecvConnectPluginBridge(const uint32_t& aPluginId,
nsresult* aRv,
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 RecvRemovePermission(const IPC::Principal& aPrincipal,
const nsCString& aPermissionType,
nsresult* aRv) override;
NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(ContentParent, nsIObserver)
--- a/dom/ipc/PContent.ipdl
+++ b/dom/ipc/PContent.ipdl
@@ -634,21 +634,16 @@ parent:
* This call is used by asynchronous plugin instantiation to notify the
* content parent that it is now safe to initiate the plugin bridge for
* the specified plugin id. The endpoint for the content process part of the
* bridge is returned.
*/
sync ConnectPluginBridge(uint32_t aPluginId)
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 PRemoteSpellcheckEngine();
async InitCrashReporter(Shmem shmem, NativeThreadId tid);
/**
* Is this token compatible with the provided version?
--- a/ipc/ipdl/sync-messages.ini
+++ b/ipc/ipdl/sync-messages.ini
@@ -856,18 +856,16 @@ description =
[PContent::CreateChildProcess]
description =
[PContent::BridgeToChildProcess]
description =
[PContent::LoadPlugin]
description =
[PContent::ConnectPluginBridge]
description =
-[PContent::GetBlocklistState]
-description =
[PContent::NSSU2FTokenIsCompatibleVersion]
description =
[PContent::NSSU2FTokenIsRegistered]
description =
[PContent::NSSU2FTokenRegister]
description =
[PContent::NSSU2FTokenSign]
description =