chrome_frame/chrome_active_document.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: chrome_frame/chrome_active_document.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: chrome_frame/chrome_active_document.cc

diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc

index 98c4d766e084a6ef12d4f6383622f5452ab057d8..0a9d3a9157dfc9a7e5ce151c15ca964add943992 100644

--- a/chrome_frame/chrome_active_document.cc

+++ b/chrome_frame/chrome_active_document.cc

@@ -66,7 +66,7 @@ ChromeActiveDocument::ChromeActiveDocument()

is_automation_client_reused_(false),

popup_allowed_(false),

accelerator_table_(NULL) {

- TRACE_EVENT_BEGIN("chromeframe.createactivedocument", this, "");

+ TRACE_EVENT_BEGIN_ETW("chromeframe.createactivedocument", this, "");

url_fetcher_->set_frame_busting(false);

memset(navigation_info_.get(), 0, sizeof(NavigationInfo));

@@ -133,7 +133,7 @@ ChromeActiveDocument::~ChromeActiveDocument() {

// ChromeFramePlugin

BaseActiveX::Uninitialize();

- TRACE_EVENT_END("chromeframe.createactivedocument", this, "");

+ TRACE_EVENT_END_ETW("chromeframe.createactivedocument", this, "");

}

// Override DoVerb