| 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 dd69789961e70acf51cf916f0d6a1faeaef41f99..606d2815c41967537eb549d784711f091bed69d9 100644
|
| --- a/content/renderer/pepper/host_dispatcher_wrapper.cc
|
| +++ b/content/renderer/pepper/host_dispatcher_wrapper.cc
|
| @@ -32,7 +32,7 @@
|
| bool HostDispatcherWrapper::Init(const IPC::ChannelHandle& channel_handle,
|
| PP_GetInterface_Func local_get_interface,
|
| const ppapi::Preferences& preferences,
|
| - scoped_refptr<PepperHungPluginFilter> filter) {
|
| + PepperHungPluginFilter* filter) {
|
| if (channel_handle.name.empty())
|
| return false;
|
|
|
| @@ -44,11 +44,7 @@
|
|
|
| dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
|
| dispatcher_.reset(new ppapi::proxy::HostDispatcher(
|
| - 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());
|
| + module_->pp_module(), local_get_interface, filter, permissions_));
|
|
|
| if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(),
|
| peer_pid_,
|
| @@ -59,9 +55,6 @@
|
| 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;
|
|
|