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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/renderer/render_thread.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: merge to 84062 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
« content/common/child_trace_message_filter.cc ('K') | « content/renderer/command_buffer_proxy.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/render_thread.cc
diff --git a/content/renderer/render_thread.cc b/content/renderer/render_thread.cc
index 9471a99a23fcfc259465b8ae231cde76ab873456..c9a7052570fdae88ec811fdffb5f88eb3cf3a1c5 100644
--- a/content/renderer/render_thread.cc
+++ b/content/renderer/render_thread.cc
@@ -137,7 +137,7 @@ RenderThread::RenderThread(const std::string& channel_name)
}
void RenderThread::Init() {
- TRACE_EVENT_BEGIN("RenderThread::Init", 0, "");
+ TRACE_EVENT_BEGIN_ETW("RenderThread::Init", 0, "");
#if defined(OS_MACOSX)
// On Mac, the select popups are rendered by the browser.
@@ -169,7 +169,7 @@ void RenderThread::Init() {
content::GetContentClient()->renderer()->RenderThreadStarted();
- TRACE_EVENT_END("RenderThread::Init", 0, "");
+ TRACE_EVENT_END_ETW("RenderThread::Init", 0, "");
}
RenderThread::~RenderThread() {
« content/common/child_trace_message_filter.cc ('K') | « content/renderer/command_buffer_proxy.cc ('k') | content/renderer/render_widget.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698