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

Unified Diff: content/renderer/renderer_main.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 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
Index: content/renderer/renderer_main.cc
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc
index dbb0e34b633aec735d58a0f66ee9f3aced38a2ac..e5e6984c18b206d6b9cd951eea435785464e2ba2 100644
--- a/content/renderer/renderer_main.cc
+++ b/content/renderer/renderer_main.cc
@@ -129,7 +129,7 @@ class RendererMessageLoopObserver : public MessageLoop::TaskObserver {
// mainline routine for running as the Renderer process
int RendererMain(const MainFunctionParams& parameters) {
- TRACE_EVENT_BEGIN("RendererMain", 0, "");
+ TRACE_EVENT_BEGIN_ETW("RendererMain", 0, "");
const CommandLine& parsed_command_line = parameters.command_line_;
base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
@@ -229,12 +229,12 @@ int RendererMain(const MainFunctionParams& parameters) {
if (run_loop) {
if (pool)
pool->Recycle();
- TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0);
+ TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
MessageLoop::current()->Run();
- TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0);
+ TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
}
}
platform.PlatformUninitialize();
- TRACE_EVENT_END("RendererMain", 0, "");
+ TRACE_EVENT_END_ETW("RendererMain", 0, "");
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698