Fix up instance registration with the browser.

content/renderer/pepper/pepper_plugin_delegate_impl.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/pepper_plugin_delegate_impl.h"
 
 #include <cmath>
 #include <cstddef>
 #include <map>
 #include <queue>
@@ skipping 94 matching lines @@
 // This class wraps a dispatcher and has the same lifetime. A dispatcher has
 // the same lifetime as a plugin module, which is longer than any particular
 // RenderView or plugin instance.
 class HostDispatcherWrapper
     : public webkit::ppapi::PluginDelegate::OutOfProcessProxy {
  public:
   HostDispatcherWrapper(webkit::ppapi::PluginModule* module,
                         int plugin_child_id,
                         const ppapi::PpapiPermissions& perms)
       : module_(module),
-        /*TODO(brettw) bug 149850 put this back.
-          plugin_child_id_(plugin_child_id),*/
+        plugin_child_id_(plugin_child_id),
         permissions_(perms) {
   }
   virtual ~HostDispatcherWrapper() {}
 
   bool Init(const IPC::ChannelHandle& channel_handle,
             PP_GetInterface_Func local_get_interface,
             const ppapi::Preferences& preferences,
             const ppapi::PpapiPermissions& permissions,
             PepperHungPluginFilter* filter) {
     if (channel_handle.name.empty())
@@ skipping 22 matching lines @@
     return true;
   }
 
   // OutOfProcessProxy implementation.
   virtual const void* GetProxiedInterface(const char* name) {
     return dispatcher_->GetProxiedInterface(name);
   }
   virtual void AddInstance(PP_Instance instance) {
     ppapi::proxy::HostDispatcher::SetForInstance(instance, dispatcher_.get());
 
-    /* TODO(brettw) bug 149850 put this back with crash fix.
-    render_view_->Send(new ViewHostMsg_DidCreateOutOfProcessPepperInstance(
-        plugin_child_id_,
-        instance,
-        render_view_->routing_id()));
-    */
+    RendererPpapiHostImpl* host =
+        RendererPpapiHostImpl::GetForPPInstance(instance);
+    // TODO(brettw) remove this null check when the old-style pepper-based
+    // browser tag is removed from this file. Getting this notification should
+    // always give us an instance we can find in the map otherwise, but that
+    // isn't true for browser tag support.
+    if (host) {
+      RenderView* render_view = host->GetRenderViewForInstance(instance);
+      render_view->Send(new ViewHostMsg_DidCreateOutOfProcessPepperInstance(
+          plugin_child_id_,
+          instance,
+          render_view->GetRoutingID()));
+    }
   }
   virtual void RemoveInstance(PP_Instance instance) {
     ppapi::proxy::HostDispatcher::RemoveForInstance(instance);
 
-    /* TODO(brettw) bug 149850 put this back with crash fix.
-    render_view_->Send(new ViewHostMsg_DidDeleteOutOfProcessPepperInstance(
-        plugin_child_id_,
-        instance));
-    */
+    RendererPpapiHostImpl* host =
+        RendererPpapiHostImpl::GetForPPInstance(instance);
+    // TODO(brettw) remove null check as described in AddInstance.
+    if (host) {
+      RenderView* render_view = host->GetRenderViewForInstance(instance);
+      render_view->Send(new ViewHostMsg_DidDeleteOutOfProcessPepperInstance(
+          plugin_child_id_,
+          instance));
+    }
   }
 
   ppapi::proxy::HostDispatcher* dispatcher() { return dispatcher_.get(); }
 
  private:
   webkit::ppapi::PluginModule* module_;
 
   // ID that the browser process uses to idetify the child process for the
   // plugin. This isn't directly useful from our process (the renderer) except
   // in messages to the browser to disambiguate plugins.
-  // TODO(brettw) bug 149850 put this back with crash fix.
-  //int plugin_child_id_;
+  int plugin_child_id_;
 
   ppapi::PpapiPermissions permissions_;
 
   scoped_ptr<ppapi::proxy::HostDispatcher> dispatcher_;
   scoped_ptr<ppapi::proxy::ProxyChannel::Delegate> dispatcher_delegate_;
 };
 
 class QuotaCallbackTranslator : public QuotaDispatcher::Callback {
  public:
   typedef webkit::ppapi::PluginDelegate::AvailableSpaceCallback PluginCallback;
@@ skipping 1667 matching lines @@
   else
     return render_view_->mouse_lock_dispatcher();
 }
 
 webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }
 
 }  // namespace content