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

Unified Diff: content/plugin/plugin_thread.cc

Issue 10908078: Code to collect issue 97285 debugging info for crash reports. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase against r155094. Created 8 years, 3 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/content_tests.gypi ('k') | content/public/common/content_debug_logging.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/plugin/plugin_thread.cc
diff --git a/content/plugin/plugin_thread.cc b/content/plugin/plugin_thread.cc
index 75a692e63ee8a700c10409d88df7335c88c21a72..3f90eb7ed5e9550784fb749f5a54a0035c09ea5a 100644
--- a/content/plugin/plugin_thread.cc
+++ b/content/plugin/plugin_thread.cc
@@ -23,6 +23,7 @@
#include "content/common/child_process.h"
#include "content/common/npobject_util.h"
#include "content/common/plugin_messages.h"
+#include "content/public/common/content_debug_logging.h"
#include "content/public/common/content_switches.h"
#include "content/public/plugin/content_plugin_client.h"
#include "ipc/ipc_channel_handle.h"
@@ -68,6 +69,19 @@ class EnsureTerminateMessageFilter : public IPC::ChannelProxy::MessageFilter {
}
};
+void RecordMsg(int bug_id, const std::string& msg) {
+ PluginThread::current()->Send(
+ new PluginProcessHostMsg_ContentDebugRecordMsg(bug_id, msg));
+}
+
+bool GetMessages(int bug_id, std::vector<std::string>* msgs) {
+ bool handled = false;
+ PluginThread::current()->Send(
+ new PluginProcessHostMsg_ContentDebugGetMessages(
+ bug_id, &handled, msgs));
+ return handled;
+}
+
} // namespace
static base::LazyInstance<base::ThreadLocalPointer<PluginThread> > lazy_tls =
@@ -107,6 +121,8 @@ PluginThread::PluginThread()
ui::SetDefaultX11ErrorHandlers();
#endif
+ content::debug::RegisterMessageHandlers(RecordMsg, GetMessages);
+
PatchNPNFunctions();
// Preload the library to avoid loading, unloading then reloading
@@ -177,6 +193,11 @@ void PluginThread::OnCreateChannel(int renderer_id,
channel->set_incognito(incognito);
}
+#if defined(OS_MACOSX)
+ content::debug::RecordMsg(97285, base::StringPrintf(
+ "OnCreateChannel({%s, %d})",
+ channel_handle.name.c_str(), channel_handle.socket.fd));
+#endif
Send(new PluginProcessHostMsg_ChannelCreated(channel_handle));
}
« no previous file with comments | « content/content_tests.gypi ('k') | content/public/common/content_debug_logging.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698