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

Unified Diff: content/renderer/renderer_main.cc

Issue 6933035: Revert 84284 - Merge gpu_trace_event back into base/debug/trace_event.Initial land attempt at htt... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 8 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/renderer_gl_context.cc ('k') | gpu/command_buffer/client/cmd_buffer_helper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/renderer_main.cc
===================================================================
--- content/renderer/renderer_main.cc (revision 84291)
+++ content/renderer/renderer_main.cc (working copy)
@@ -129,7 +129,7 @@
// mainline routine for running as the Renderer process
int RendererMain(const MainFunctionParams& parameters) {
- TRACE_EVENT_BEGIN_ETW("RendererMain", 0, "");
+ TRACE_EVENT_BEGIN("RendererMain", 0, "");
const CommandLine& parsed_command_line = parameters.command_line_;
base::mac::ScopedNSAutoreleasePool* pool = parameters.autorelease_pool_;
@@ -231,12 +231,12 @@
if (run_loop) {
if (pool)
pool->Recycle();
- TRACE_EVENT_BEGIN_ETW("RendererMain.START_MSG_LOOP", 0, 0);
+ TRACE_EVENT_BEGIN("RendererMain.START_MSG_LOOP", 0, 0);
MessageLoop::current()->Run();
- TRACE_EVENT_END_ETW("RendererMain.START_MSG_LOOP", 0, 0);
+ TRACE_EVENT_END("RendererMain.START_MSG_LOOP", 0, 0);
}
}
platform.PlatformUninitialize();
- TRACE_EVENT_END_ETW("RendererMain", 0, "");
+ TRACE_EVENT_END("RendererMain", 0, "");
return 0;
}
« no previous file with comments | « content/renderer/renderer_gl_context.cc ('k') | gpu/command_buffer/client/cmd_buffer_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698