content/browser/renderer_host/render_widget_host.cc - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host.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:

Index: content/browser/renderer_host/render_widget_host.cc

diff --git a/content/browser/renderer_host/render_widget_host.cc b/content/browser/renderer_host/render_widget_host.cc

index 339b3106cb1d3698b2dc80456a87294a34e2dfcb..7250dded28754192d4fa57fc1aa440fc83a5c9b2 100644

--- a/content/browser/renderer_host/render_widget_host.cc

+++ b/content/browser/renderer_host/render_widget_host.cc

@@ -6,6 +6,7 @@

#include "base/auto_reset.h"

#include "base/command_line.h"

+#include "base/debug/trace_event.h"

#include "base/message_loop.h"

#include "base/metrics/histogram.h"

#include "chrome/browser/accessibility/browser_accessibility_state.h"

@@ -22,7 +23,6 @@

#include "content/common/notification_service.h"

#include "content/common/result_codes.h"

#include "content/common/view_messages.h"

-#include "gpu/common/gpu_trace_event.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebCompositionUnderline.h"

#include "ui/base/keycodes/keyboard_codes.h"

#include "webkit/glue/webcursor.h"

@@ -837,7 +837,7 @@ void RenderWidgetHost::OnMsgPaintAtSizeAck(int tag, const gfx::Size& size) {

void RenderWidgetHost::OnMsgUpdateRect(

const ViewHostMsg_UpdateRect_Params& params) {

- GPU_TRACE_EVENT0("renderer_host", "RenderWidgetHost::OnMsgUpdateRect");

+ TRACE_EVENT0("renderer_host", "RenderWidgetHost::OnMsgUpdateRect");

TimeTicks paint_start = TimeTicks::Now();

NotificationService::current()->Notify(