PPAPI: Never re-enter JavaScript for PostMessage.

content/renderer/pepper/host_dispatcher_wrapper.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/pepper/host_dispatcher_wrapper.h"
 
 #include "content/common/view_messages.h"
 #include "content/renderer/pepper/pepper_hung_plugin_filter.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/pepper/pepper_proxy_channel_delegate_impl.h"
@@ skipping 14 matching lines @@
       peer_pid_(peer_pid),
       plugin_child_id_(plugin_child_id),
       permissions_(perms),
       is_external_(is_external) {}
 
 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;
 
 #if defined(OS_POSIX)
   DCHECK_NE(-1, channel_handle.socket.fd);
   if (channel_handle.socket.fd == -1)
     return false;
 #endif
 
   dispatcher_delegate_.reset(new PepperProxyChannelDelegateImpl);
+  // TODO/FIXME(dmichael): Should we really be passing the filter to
+  // InitHostWithChannel? What about Init instead?

[raymes, 2014/09/23 02:57:09]

I'm not sure I understand this comment. Aren't we in Init() here?

[dmichael (off chromium), 2014/09/23 17:38:42]

Sorry, this is one of the things I meant when I said it was rough around the
edges :)

I was thinking of moving the filter parameter to InitHostWithChannel. But I also
was thinking about removing the filter member. Turns out...  I can remove it as
a member of HostDispatcher *and* as a parameter. I think the new way's a bit
cleaner.

   dispatcher_.reset(new ppapi::proxy::HostDispatcher(
       module_->pp_module(), local_get_interface, filter, 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 is as an observer.

[raymes, 2014/09/23 02:57:09]

is->it

[dmichael (off chromium), 2014/09/23 17:38:42]

Done.

+  dispatcher_->AddSyncMessageStatusObserver(filter.get());
 
   if (!dispatcher_->InitHostWithChannel(dispatcher_delegate_.get(),
                                         peer_pid_,
                                         channel_handle,
                                         true,  // Client.
                                         preferences)) {
     dispatcher_.reset();
     dispatcher_delegate_.reset();
     return false;
   }
@@ skipping 39 matching lines @@
   if (host) {
     RenderFrame* render_frame = host->GetRenderFrameForInstance(instance);
     if (render_frame) {
       render_frame->Send(new ViewHostMsg_DidDeleteOutOfProcessPepperInstance(
           plugin_child_id_, instance, is_external_));
     }
   }
 }
 
 }  // namespace content