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

Unified Diff: chrome/browser/renderer_host/render_message_filter.cc

Issue 6551019: Trace_event upgrades (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More gooder js thanks to arv. Created 9 years, 10 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
Index: chrome/browser/renderer_host/render_message_filter.cc
diff --git a/chrome/browser/renderer_host/render_message_filter.cc b/chrome/browser/renderer_host/render_message_filter.cc
index 4ae24e0a570043dc04062e88fcefc497a2d50739..d85ecc442c42d514fc9d468b39f078620086365f 100644
--- a/chrome/browser/renderer_host/render_message_filter.cc
+++ b/chrome/browser/renderer_host/render_message_filter.cc
@@ -12,6 +12,7 @@
#include "base/process_util.h"
#include "base/shared_memory.h"
#include "base/sys_string_conversions.h"
+#include "base/debug/trace_event.h"
#include "base/threading/worker_pool.h"
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
@@ -483,6 +484,8 @@ bool RenderMessageFilter::OnMessageReceived(const IPC::Message& message,
#if defined(USE_TCMALLOC)
IPC_MESSAGE_HANDLER(ViewHostMsg_RendererTcmalloc, OnRendererTcmalloc)
#endif
+ IPC_MESSAGE_HANDLER(ViewHostMsg_TraceDataCollectedRemotely,
+ OnTraceDataCollectedRemotely)
IPC_MESSAGE_HANDLER(ViewHostMsg_AsyncOpenFile, OnAsyncOpenFile)
IPC_MESSAGE_UNHANDLED(handled = false)
IPC_END_MESSAGE_MAP_EX()
@@ -1512,6 +1515,23 @@ void RenderMessageFilter::OnRendererTcmalloc(base::ProcessId pid,
}
#endif
+void RenderMessageFilter::OnTraceDataCollectedRemotely(
+ const std::string& json_events) {
+ // Forward to GPU internals UI, on the UI thread
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+ BrowserThread::PostTask(
+ BrowserThread::UI, FROM_HERE,
+ NewRunnableMethod(
+ this, &RenderMessageFilter::OnTraceDataCollectedRemotelyOnUIThread,
+ json_events));
+}
+
+void RenderMessageFilter::OnTraceDataCollectedRemotelyOnUIThread(
+ const std::string& json_events) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ base::debug::TraceLog::GetInstance()->AddRemotelyCollectedData(json_events);
+}
+
void RenderMessageFilter::OnGetExtensionMessageBundle(
const std::string& extension_id, IPC::Message* reply_msg) {
ChromeURLRequestContext* context = static_cast<ChromeURLRequestContext*>(

Powered by Google App Engine
This is Rietveld 408576698