Disable crashing code in the pepper plugin code.

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 84 matching lines @@
 #include "webkit/plugins/ppapi/resource_helper.h"
 #include "webkit/plugins/webplugininfo.h"
 
 using WebKit::WebView;
 using WebKit::WebFrame;
 
 namespace content {
 
 namespace {
 
+// 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(RenderViewImpl* rv,
-                        webkit::ppapi::PluginModule* module,
+  HostDispatcherWrapper(webkit::ppapi::PluginModule* module,
                         int plugin_child_id,
                         const ppapi::PpapiPermissions& perms)
-      : render_view_(rv),
-        module_(module),
-        plugin_child_id_(plugin_child_id),
+      : module_(module),
+        /*TODO(brettw) bug 149850 put this back.
+          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()));
+    */
   }
   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));
+    */
   }
 
   ppapi::proxy::HostDispatcher* dispatcher() { return dispatcher_.get(); }
 
  private:
-  RenderViewImpl* render_view_;
-
   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.
-  int plugin_child_id_;
+  // TODO(brettw) bug 149850 put this back with crash fix.
+  //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 182 matching lines @@
 
   // Create a new HostDispatcher for the proxying, and hook it to a new
   // PluginModule. Note that AddLiveModule must be called before any early
   // returns since the module's destructor will remove itself.
   module = new webkit::ppapi::PluginModule(
       info->name, path,
       PepperPluginRegistry::GetInstance(),
       permissions);
   PepperPluginRegistry::GetInstance()->AddLiveModule(path, module);
   scoped_ptr<HostDispatcherWrapper> dispatcher(
-      new HostDispatcherWrapper(render_view_, module, plugin_child_id,
-                                permissions));
+      new HostDispatcherWrapper(module, plugin_child_id, permissions));
   if (!dispatcher->Init(
           channel_handle,
           webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc(),
           GetPreferences(),
           permissions,
           hung_filter.get()))
     return scoped_refptr<webkit::ppapi::PluginModule>();
 
   RendererPpapiHostImpl* host_impl =
       content::RendererPpapiHostImpl::CreateOnModuleForOutOfProcess(
@@ skipping 24 matching lines @@
                                  guest_process_id));
   // Create a new HostDispatcher for the proxying, and hook it to a new
   // PluginModule.
   module = new webkit::ppapi::PluginModule(kBrowserPluginName,
                                            path,
                                            registry,
                                            permissions);
   RenderThreadImpl::current()->browser_plugin_registry()->AddModule(
       guest_process_id, module);
   scoped_ptr<HostDispatcherWrapper> dispatcher(
-      new HostDispatcherWrapper(render_view_, module, 0, permissions));
+      new HostDispatcherWrapper(module, 0, permissions));
   if (!dispatcher->Init(
           channel_handle,
           webkit::ppapi::PluginModule::GetLocalGetInterfaceFunc(),
           GetPreferences(),
           permissions,
           hung_filter.get()))
     return scoped_refptr<webkit::ppapi::PluginModule>();
   module->InitAsProxied(dispatcher.release());
   return module;
 }
@@ skipping 1414 matching lines @@
   else
     return render_view_->mouse_lock_dispatcher();
 }
 
 webkit_glue::ClipboardClient*
     PepperPluginDelegateImpl::CreateClipboardClient() const {
   return new RendererClipboardClient;
 }
 
 }  // namespace content