corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1127374 - Make ContentParent::RecvLoadPlugin less failure prone. r=billm

Browse Source
This commit is contained in:
Jim Mathies
2015-01-30 10:37:03 -06:00
parent 04f236d0d3
commit c393878aed
6 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
dom/ipc/ContentChild.cpp
View File

@@ -2484,7 +2484,10 @@ ContentChild::RecvGetProfile(nsCString* aProfile)
bool bool
ContentChild::RecvLoadPluginResult(const uint32_t& aPluginId, const bool& aResult) ContentChild::RecvLoadPluginResult(const uint32_t& aPluginId, const bool& aResult)
{ {
bool finalResult = aResult && SendConnectPluginBridge(aPluginId); nsresult rv;
bool finalResult = aResult &&
SendConnectPluginBridge(aPluginId, &rv) &&
NS_SUCCEEDED(rv);
plugins::PluginModuleContentParent::OnLoadPluginResult(aPluginId, plugins::PluginModuleContentParent::OnLoadPluginResult(aPluginId,
finalResult); finalResult);
return true; return true;

10
dom/ipc/ContentParent.cpp
View File

@@ -975,15 +975,17 @@ static nsIDocShell* GetOpenerDocShellHelper(Element* aFrameElement)
} }
bool bool
ContentParent::RecvLoadPlugin(const uint32_t& aPluginId) ContentParent::RecvLoadPlugin(const uint32_t& aPluginId, nsresult* aRv)
{ {
return mozilla::plugins::SetupBridge(aPluginId, this); *aRv = NS_OK;
return mozilla::plugins::SetupBridge(aPluginId, this, false, aRv);
} }
bool bool
ContentParent::RecvConnectPluginBridge(const uint32_t& aPluginId) ContentParent::RecvConnectPluginBridge(const uint32_t& aPluginId, nsresult* aRv)
{ {
return mozilla::plugins::SetupBridge(aPluginId, this, true); *aRv = NS_OK;
return mozilla::plugins::SetupBridge(aPluginId, this, true, aRv);
} }
bool bool

4
dom/ipc/ContentParent.h
View File

@@ -153,8 +153,8 @@ public:
TabId* aTabId) MOZ_OVERRIDE; TabId* aTabId) MOZ_OVERRIDE;
virtual bool RecvBridgeToChildProcess(const ContentParentId& aCpId) MOZ_OVERRIDE; virtual bool RecvBridgeToChildProcess(const ContentParentId& aCpId) MOZ_OVERRIDE;
virtual bool RecvLoadPlugin(const uint32_t& aPluginId) MOZ_OVERRIDE; virtual bool RecvLoadPlugin(const uint32_t& aPluginId, nsresult* aRv) MOZ_OVERRIDE;
virtual bool RecvConnectPluginBridge(const uint32_t& aPluginId) MOZ_OVERRIDE; virtual bool RecvConnectPluginBridge(const uint32_t& aPluginId, nsresult* aRv) MOZ_OVERRIDE;
virtual bool RecvFindPlugins(const uint32_t& aPluginEpoch, virtual bool RecvFindPlugins(const uint32_t& aPluginEpoch,
nsTArray<PluginTag>* aPlugins, nsTArray<PluginTag>* aPlugins,
uint32_t* aNewPluginEpoch) MOZ_OVERRIDE; uint32_t* aNewPluginEpoch) MOZ_OVERRIDE;

4
dom/ipc/PContent.ipdl
View File

@@ -592,7 +592,7 @@ parent:
* process. We use intr semantics here to ensure that the PluginModuleParent * process. We use intr semantics here to ensure that the PluginModuleParent
* allocation message is dispatched before LoadPlugin returns. * allocation message is dispatched before LoadPlugin returns.
*/ */
sync LoadPlugin(uint32_t pluginId); sync LoadPlugin(uint32_t pluginId) returns (nsresult rv);
/** /**
* This call is used by asynchronous plugin instantiation to notify the * This call is used by asynchronous plugin instantiation to notify the
@@ -600,7 +600,7 @@ parent:
* the specified plugin id. When this call returns, the requested bridge * the specified plugin id. When this call returns, the requested bridge
* connection has been made. * connection has been made.
*/ */
sync ConnectPluginBridge(uint32_t aPluginId); sync ConnectPluginBridge(uint32_t aPluginId) returns (nsresult rv);
/** /**
* This call returns the set of plugins loaded in the chrome * This call returns the set of plugins loaded in the chrome

2
dom/plugins/ipc/PluginBridge.h
View File

@@ -17,7 +17,7 @@ namespace plugins {
bool bool
SetupBridge(uint32_t aPluginId, dom::ContentParent* aContentParent, SetupBridge(uint32_t aPluginId, dom::ContentParent* aContentParent,
bool aForceBridgeNow = false); bool aForceBridgeNow, nsresult* rv);
bool bool
FindPluginsForContent(uint32_t aPluginEpoch, FindPluginsForContent(uint32_t aPluginEpoch,

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

@@ -94,13 +94,14 @@ struct RunnableMethodTraits<mozilla::plugins::PluginModuleParent>
bool bool
mozilla::plugins::SetupBridge(uint32_t aPluginId, mozilla::plugins::SetupBridge(uint32_t aPluginId,
dom::ContentParent* aContentParent, dom::ContentParent* aContentParent,
bool aForceBridgeNow) bool aForceBridgeNow,
nsresult* rv)
{ {
nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst(); nsRefPtr<nsPluginHost> host = nsPluginHost::GetInst();
nsRefPtr<nsNPAPIPlugin> plugin; nsRefPtr<nsNPAPIPlugin> plugin;
nsresult rv = host->GetPluginForContentProcess(aPluginId, getter_AddRefs(plugin)); *rv = host->GetPluginForContentProcess(aPluginId, getter_AddRefs(plugin));
if (NS_FAILED(rv)) { if (NS_FAILED(*rv)) {
return false; return true;
} }
PluginModuleChromeParent* chromeParent = static_cast<PluginModuleChromeParent*>(plugin->GetLibrary()); PluginModuleChromeParent* chromeParent = static_cast<PluginModuleChromeParent*>(plugin->GetLibrary());
chromeParent->SetContentParent(aContentParent); chromeParent->SetContentParent(aContentParent);
@@ -293,7 +294,9 @@ PluginModuleContentParent::LoadModule(uint32_t aPluginId)
* its module mapping. We fetch it from there after LoadPlugin finishes. * its module mapping. We fetch it from there after LoadPlugin finishes.
*/ */
dom::ContentChild* cp = dom::ContentChild::GetSingleton(); dom::ContentChild* cp = dom::ContentChild::GetSingleton();
if (!cp->SendLoadPlugin(aPluginId)) { nsresult rv;
if (!cp->SendLoadPlugin(aPluginId, &rv) ||
NS_FAILED(rv)) {
return nullptr; return nullptr;
} }