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

Unified Diff: webkit/glue/webkitclient_impl.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: webkit/glue/webkitclient_impl.cc
diff --git a/webkit/glue/webkitclient_impl.cc b/webkit/glue/webkitclient_impl.cc
index 882cb426fa7abdd2cb6042545a52904270d4dbfe..4244bc3f6ef2fb132edc07d52c0f8440b6b4d21e 100644
--- a/webkit/glue/webkitclient_impl.cc
+++ b/webkit/glue/webkitclient_impl.cc
@@ -25,7 +25,6 @@
#include "base/synchronization/lock.h"
#include "base/time.h"
#include "base/utf_string_conversions.h"
-#include "gpu/common/gpu_trace_event.h"
#include "grit/webkit_chromium_resources.h"
#include "grit/webkit_resources.h"
#include "grit/webkit_strings.h"
@@ -284,16 +283,12 @@ void WebKitClientImpl::histogramEnumeration(
void WebKitClientImpl::traceEventBegin(const char* name, void* id,
const char* extra) {
- TRACE_EVENT_BEGIN(name, id, extra);
- GPU_TRACE_EVENT_BEGIN2("webkit", name,
- "id", id,
- "extra", extra ? extra : "");
+ TRACE_EVENT_BEGIN_ETW(name, id, extra);
}
void WebKitClientImpl::traceEventEnd(const char* name, void* id,
const char* extra) {
- TRACE_EVENT_END(name, id, extra);
- GPU_TRACE_EVENT_END0("webkit", name);
+ TRACE_EVENT_END_ETW(name, id, extra);
}
namespace {

Powered by Google App Engine
This is Rietveld 408576698