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

Unified Diff: content/renderer/render_widget.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/render_widget.cc
diff --git a/content/renderer/render_widget.cc b/content/renderer/render_widget.cc
index 6b190b3883230f2741af65b02127141d943de3df..2597ad621ae524f5415bca80279b58061911565a 100644
--- a/content/renderer/render_widget.cc
+++ b/content/renderer/render_widget.cc
@@ -5,6 +5,7 @@
#include "content/renderer/render_widget.h"
#include "base/command_line.h"
+#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
@@ -15,7 +16,6 @@
#include "content/renderer/render_process.h"
#include "content/renderer/render_thread.h"
#include "content/renderer/renderer_webkitclient_impl.h"
-#include "gpu/common/gpu_trace_event.h"
#include "ipc/ipc_sync_message.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/skia/include/core/SkShader.h"
@@ -305,7 +305,7 @@ void RenderWidget::OnRequestMoveAck() {
}
void RenderWidget::OnUpdateRectAck() {
- GPU_TRACE_EVENT0("renderer", "RenderWidget::OnUpdateRectAck");
+ TRACE_EVENT0("renderer", "RenderWidget::OnUpdateRectAck");
DCHECK(update_reply_pending());
update_reply_pending_ = false;
@@ -553,7 +553,7 @@ void RenderWidget::CallDoDeferredUpdate() {
}
void RenderWidget::DoDeferredUpdate() {
- GPU_TRACE_EVENT0("renderer", "RenderWidget::DoDeferredUpdate");
+ TRACE_EVENT0("renderer", "RenderWidget::DoDeferredUpdate");
if (!webwidget_ || update_reply_pending())
return;

Powered by Google App Engine
This is Rietveld 408576698