Add the page url to plugin crashes to aid debugging.

chrome/plugin/webplugin_delegate_stub.cc

 // Copyright (c) 2006-2008 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 "chrome/plugin/webplugin_delegate_stub.h"
 
 #include "build/build_config.h"
 
 #include "base/command_line.h"
+#include "chrome/common/child_process_logging.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/plugin_messages.h"
 #include "chrome/plugin/npobject_stub.h"
 #include "chrome/plugin/plugin_channel.h"
 #include "chrome/plugin/plugin_thread.h"
 #include "chrome/plugin/webplugin_proxy.h"
 #include "printing/native_metafile.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npruntime.h"
 #include "skia/ext/platform_device.h"
@@ skipping 22 matching lines @@
     const std::string& mime_type, int instance_id, PluginChannel* channel) :
     mime_type_(mime_type),
     instance_id_(instance_id),
     channel_(channel),
     delegate_(NULL),
     webplugin_(NULL) {
   DCHECK(channel);
 }
 
 WebPluginDelegateStub::~WebPluginDelegateStub() {
+  child_process_logging::ScopedActiveURLSetter url_setter(page_url_);
+
   if (channel_->in_send()) {
     // The delegate or an npobject is in the callstack, so don't delete it
     // right away.
     MessageLoop::current()->PostNonNestableTask(FROM_HERE,
         new FinishDestructionTask(delegate_, webplugin_));
   } else {
     // Safe to delete right away.
     if (delegate_)
       delegate_->PluginDestroyed();
 
     delete webplugin_;
   }
 }
 
 void WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
+  child_process_logging::ScopedActiveURLSetter url_setter(page_url_);
+
   // A plugin can execute a script to delete itself in any of its NPP methods.
   // Hold an extra reference to ourself so that if this does occur and we're
   // handling a sync message, we don't crash when attempting to send a reply.
   AddRef();
 
   IPC_BEGIN_MESSAGE_MAP(WebPluginDelegateStub, msg)
     IPC_MESSAGE_HANDLER(PluginMsg_Init, OnInit)
     IPC_MESSAGE_HANDLER(PluginMsg_WillSendRequest, OnWillSendRequest)
     IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveResponse, OnDidReceiveResponse)
     IPC_MESSAGE_HANDLER(PluginMsg_DidReceiveData, OnDidReceiveData)
@@ skipping 26 matching lines @@
 
   Release();
 }
 
 bool WebPluginDelegateStub::Send(IPC::Message* msg) {
   return channel_->Send(msg);
 }
 
 void WebPluginDelegateStub::OnInit(const PluginMsg_Init_Params& params,
                                    bool* result) {
+  page_url_ = params.page_url;
+  child_process_logging::ScopedActiveURLSetter url_setter(page_url_);
+
   *result = false;
   int argc = static_cast<int>(params.arg_names.size());
   if (argc != static_cast<int>(params.arg_values.size())) {
     NOTREACHED();
     return;
   }
 
   char **argn = new char*[argc];
   char **argv = new char*[argc];
   for (int i = 0; i < argc; ++i) {
     argn[i] = const_cast<char*>(params.arg_names[i].c_str());
     argv[i] = const_cast<char*>(params.arg_values[i].c_str());
   }
 
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   FilePath path = FilePath::FromWStringHack(
       command_line.GetSwitchValue(switches::kPluginPath));
 
 
   gfx::PluginWindowHandle parent = NULL;
 #if defined(OS_WIN)
   parent = gfx::NativeViewFromId(params.containing_window);
 #elif defined(OS_LINUX)
   PluginThread::current()->Send(new PluginProcessHostMsg_MapNativeViewId(
       params.containing_window, &parent));
 #endif
   delegate_ = WebPluginDelegate::Create(path, mime_type_, parent);
 
   if (delegate_) {
-    webplugin_ = new WebPluginProxy(channel_, instance_id_, delegate_);
+    webplugin_ = new WebPluginProxy(
+        channel_, instance_id_, delegate_, page_url_);
 #if defined(OS_WIN)
     if (!webplugin_->SetModalDialogEvent(params.modal_dialog_event))
       return;
 #endif
     *result = delegate_->Initialize(
         params.url, argn, argv, argc, webplugin_, params.load_manually);
   }
 
   delete[] argn;
   delete[] argv;
@@ skipping 118 matching lines @@
   if (!object) {
     *route_id = MSG_ROUTING_NONE;
     return;
   }
 
   *route_id = channel_->GenerateRouteID();
   *npobject_ptr = reinterpret_cast<intptr_t>(object);
   // The stub will delete itself when the proxy tells it that it's released, or
   // otherwise when the channel is closed.
   new NPObjectStub(
-      object, channel_.get(), *route_id, webplugin_->modal_dialog_event());
+      object, channel_.get(), *route_id, webplugin_->modal_dialog_event(),
+      page_url_);
 
   // Release ref added by GetPluginScriptableObject (our stub holds its own).
   NPN_ReleaseObject(object);
 }
 
 void WebPluginDelegateStub::OnSendJavaScriptStream(const std::string& url,
                                                    const std::wstring& result,
                                                    bool success,
                                                    bool notify_needed,
                                                    intptr_t notify_data) {
@@ skipping 66 matching lines @@
                                       params.notify_data,
                                       params.stream);
   webplugin_->OnResourceCreated(params.resource_id, resource_client);
 }
 
 void WebPluginDelegateStub::OnURLRequestRouted(const std::string& url,
                                                bool notify_needed,
                                                intptr_t notify_data) {
   delegate_->URLRequestRouted(url, notify_needed, notify_data);
 }