Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2272)

Unified Diff: content/renderer/pepper/host_dispatcher_wrapper.cc

Issue 589213003: PPAPI: Never re-enter JavaScript for PostMessage. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make MessageChannel observer clean up more reliably, guarantee HungPluginFilter stays alive long en… Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/pepper/host_dispatcher_wrapper.h ('k') | content/renderer/pepper/message_channel.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/pepper/host_dispatcher_wrapper.cc
diff --git a/content/renderer/pepper/host_dispatcher_wrapper.cc b/content/renderer/pepper/host_dispatcher_wrapper.cc
index 606d2815c41967537eb549d784711f091bed69d9..df05521fbca704ed987604dc6d95f498e4197ceb 100644
--- a/content/renderer/pepper/host_dispatcher_wrapper.cc
+++ b/content/renderer/pepper/host_dispatcher_wrapper.cc
@@ -32,7 +32,7 @@ HostDispatcherWrapper::~HostDispatcherWrapper() {}
bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& channel_handle,
PP_GetInterface_Func local_get_interface,
const ppapi::Preferences& preferences,
- PepperHungPluginFilter* filter) {
+ scoped_refptr<PepperHungPluginFilter> filter) {
if (channel_handle.name.empty())
return false;
@@ -44,7 +44,13 @@ bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& channel_handle,
dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
dispatcher_.reset(new ppapi::proxy::HostDispatcher(
- module_->pp_module(), local_get_interface, filter, permissions_));
+ module_->pp_module(), local_get_interface, permissions_));
+ // The HungPluginFilter needs to know when we are blocked on a sync message
+ // to the plugin. Note the filter outlives the dispatcher, so there is no
+ // need to remove it as an observer.
+ dispatcher_->AddSyncMessageStatusObserver(filter.get());
+ // Guarantee the hung_plugin_filter_ outlives |dispatcher_|.
+ hung_plugin_filter_ = filter;
if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(),
peer_pid_,
@@ -55,6 +61,9 @@ bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& channel_handle,
dispatcher_delegate_.reset();
return false;
}
+ // HungPluginFilter needs to listen for some messages on the IO thread.
+ dispatcher_->AddIOThreadMessageFilter(filter);
+
dispatcher_->channel()->SetRestrictDispatchChannelGroup(
kRendererRestrictDispatchGroup_Pepper);
return true;
« no previous file with comments | « content/renderer/pepper/host_dispatcher_wrapper.h ('k') | content/renderer/pepper/message_channel.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698