diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 02:23:58 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 02:23:58 +0000 |
| commit | 366ae2448ddfcd11eb827205aa56c8c0c00442bb (patch) | |
| tree | e86ee956eabead718e6f0fdf0e2f64bd6292688f /chrome_frame/chrome_active_document.cc | |
| parent | dc2bfb7bfa996045733f6afc849a4923589a53b7 (diff) | |
| download | chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.zip chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.tar.gz chromium_src-366ae2448ddfcd11eb827205aa56c8c0c00442bb.tar.bz2 | |
Merge gpu_trace_event back into base/debug/trace_event.
Initial land attempt at http://codereview.chromium.org/6551019/
gpu_trace_event fork at http://codereview.chromium.org/6691013
- gpu_trace_event renamed to base/debug/trace_event and modified as appropriate for base::debug
- Unit Tests implemented for trace_event
- gpu_common library removed (was added only for gpu_trace_event)
- Existing calls to trace_event suffixed with _ETW to make ETW calls (see decisions and incremental plans at end of 6551019)
- GPU trace calls renamed to new calls.
- Tracing switch removed from test_shell, as linux log file support removed.
BUG=79509
TEST=trace_event_win_unittest and about:gpu
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84284
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84486
Review URL: http://codereview.chromium.org/6862002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84739 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_active_document.cc')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 98c4d76..0a9d3a9 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 |