Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2546)

Unified Diff: content/renderer/webplugin_delegate_proxy.cc

Issue 10408004: [Mac] Log stack trace for CHECK in bug 97285. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Forgot an OS_MACOSX check. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/renderer/plugin_channel_host.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/webplugin_delegate_proxy.cc
diff --git a/content/renderer/webplugin_delegate_proxy.cc b/content/renderer/webplugin_delegate_proxy.cc
index d319dbdfe64c2b02618c8ce14ecc901bd6fb4825..249d48ef5e26d080c87696fdbbd5726790aa0499 100644
--- a/content/renderer/webplugin_delegate_proxy.cc
+++ b/content/renderer/webplugin_delegate_proxy.cc
@@ -12,6 +12,7 @@
#include <algorithm>
+#include "base/auto_reset.h"
#include "base/basictypes.h"
#include "base/command_line.h"
#include "base/file_util.h"
@@ -276,6 +277,13 @@ bool WebPluginDelegateProxy::Initialize(
const std::vector<std::string>& arg_values,
webkit::npapi::WebPlugin* plugin,
bool load_manually) {
+#if defined(OS_MACOSX)
+ // TODO(shess): Debugging for http://crbug.com/97285 . See comment
+ // in plugin_channel_host.cc.
+ scoped_ptr<AutoReset<bool> > track_nested_removes(new AutoReset<bool>(
+ PluginChannelHost::GetRemoveTrackingFlag(), true));
+#endif
+
IPC::ChannelHandle channel_handle;
if (!RenderThreadImpl::current()->Send(new ViewHostMsg_OpenChannelToPlugin(
render_view_->routing_id(), url, page_url_, mime_type_,
@@ -306,6 +314,9 @@ bool WebPluginDelegateProxy::Initialize(
LOG(ERROR) << "Couldn't get PluginChannelHost";
return false;
}
+#if defined(OS_MACOSX)
+ track_nested_removes.reset();
+#endif
int instance_id;
bool result = channel_host->Send(new PluginMsg_CreateInstance(
« no previous file with comments | « content/renderer/plugin_channel_host.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698