diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 20:04:13 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-06 20:04:13 +0000 |
| commit | 820d851f56e3712a2f9ac7db545601d1b0355718 (patch) | |
| tree | 18f4af5173da3f78086b409fa4ae9ceefb3f9f71 /chrome_frame/chrome_frame_activex.cc | |
| parent | 91c3c300069d27c6ec8749636fec1c4c9018b29f (diff) | |
| download | chromium_src-820d851f56e3712a2f9ac7db545601d1b0355718.zip chromium_src-820d851f56e3712a2f9ac7db545601d1b0355718.tar.gz chromium_src-820d851f56e3712a2f9ac7db545601d1b0355718.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
Review URL: http://codereview.chromium.org/6862002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84486 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_activex.cc')
| -rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index 62bae43..425cc2f 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -148,7 +148,7 @@ void GetMiniContextMenuData(UINT cmd, ChromeFrameActivex::ChromeFrameActivex() : chrome_wndproc_hook_(NULL) { - TRACE_EVENT_BEGIN("chromeframe.createactivex", this, ""); + TRACE_EVENT_BEGIN_ETW("chromeframe.createactivex", this, ""); } HRESULT ChromeFrameActivex::FinalConstruct() { @@ -177,7 +177,7 @@ ChromeFrameActivex::~ChromeFrameActivex() { // ChromeFramePlugin::Uninitialize() Base::Uninitialize(); - TRACE_EVENT_END("chromeframe.createactivex", this, ""); + TRACE_EVENT_END_ETW("chromeframe.createactivex", this, ""); } LRESULT ChromeFrameActivex::OnCreate(UINT message, WPARAM wparam, LPARAM lparam, |