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

Unified Diff: content/renderer/renderer_main.cc

Issue 153063002: plumbing for skia trace events into Chrome's about://tracing framework (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 11 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 | « no previous file | skia/ext/trace_event.h » ('j') | skia/ext/trace_event.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index 634684c58fe2fabf8f591cbaf00159ea557d58d0..363fae871a99c065dc1798581dbe0ce67774633e 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -30,6 +30,7 @@
#include "content/renderer/render_process_impl.h"
#include "content/renderer/render_thread_impl.h"
#include "content/renderer/renderer_main_platform_delegate.h"
+#include "skia/ext/trace_event.h"
#include "ui/base/ui_base_switches.h"
#include "webkit/child/webkit_child_helpers.h"
@@ -237,6 +238,11 @@ int RendererMain(const MainFunctionParams& parameters) {
platform.RunSandboxTests(no_sandbox);
+ // Initialize the binding beteween Chrome's tracing events
+ // and Chrome's. Skia will take ownership of and clean up
+ // the memory allocated here.
+ SkEventTracer::SetInstance(new skia::SkChromiumEventTracer());
piman 2014/02/03 22:25:02 nit: should we do this in the RenderThreadImpl ini
nduca 2014/02/04 01:15:19 yea definitely reder thread impl
humper 2014/02/04 19:58:08 Sure, I'd be happy to move it -- this place was su
humper 2014/02/04 19:58:08 Done.
+
startup_timer.Stop(); // End of Startup Time Measurement.
if (run_loop) {
« no previous file with comments | « no previous file | skia/ext/trace_event.h » ('j') | skia/ext/trace_event.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698