diff options
| author | simonjam@chromium.org <simonjam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 07:42:42 +0000 |
|---|---|---|
| committer | simonjam@chromium.org <simonjam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-26 07:42:42 +0000 |
| commit | c76faeaa3ef76c0cf7560b5fe55ebb58981db4db (patch) | |
| tree | 7b79abca9ef82094cb2f043b0f5050a35355fc20 /ui | |
| parent | dbb091ac13a70f01335a9297dca00ff0e514ec2a (diff) | |
| download | chromium_src-c76faeaa3ef76c0cf7560b5fe55ebb58981db4db.zip chromium_src-c76faeaa3ef76c0cf7560b5fe55ebb58981db4db.tar.gz chromium_src-c76faeaa3ef76c0cf7560b5fe55ebb58981db4db.tar.bz2 | |
Add a |scope| argument to TRACE_EVENT_INSTANT* and require its presence.
The scope indicates how long the vertical line should be in the tracing UI. It
can be global (full screen), process or thread (fill those tracks), or local
(the original style for INSTANT).
BUG=None
Review URL: https://chromiumcodereview.appspot.com/12252058
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@190577 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gl/gl_surface_glx.cc | 5 | ||||
| -rw-r--r-- | ui/surface/accelerated_surface_win.cc | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc index 0a49791..87dffe9 100644 --- a/ui/gl/gl_surface_glx.cc +++ b/ui/gl/gl_surface_glx.cc @@ -197,7 +197,7 @@ class SGIVideoSyncProviderThreadShim if (glXWaitVideoSyncSGI(1, 0, &retrace_count) != 0) return; - TRACE_EVENT_INSTANT0("gpu", "vblank"); + TRACE_EVENT_INSTANT0("gpu", "vblank", TRACE_EVENT_SCOPE_THREAD); now = base::TimeTicks::HighResNow(); glXMakeCurrent(display_, 0, 0); @@ -429,7 +429,8 @@ bool NativeViewGLSurfaceGLX::IsOffscreen() { bool NativeViewGLSurfaceGLX::SwapBuffers() { glXSwapBuffers(g_display, window_); // For latency_tests.cc: - UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete"); + UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete", + TRACE_EVENT_SCOPE_THREAD); return true; } diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc index 3d88f70..92d81d2 100644 --- a/ui/surface/accelerated_surface_win.cc +++ b/ui/surface/accelerated_surface_win.cc @@ -775,7 +775,8 @@ void AcceleratedPresenter::DoPresentAndAcknowledge( hr = swap_chain_->Present(&rect, &rect, window_, NULL, 0); // For latency_tests.cc: - UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete"); + UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete", + TRACE_EVENT_SCOPE_THREAD); if (FAILED(hr)) { if (present_thread_->IsDeviceLost()) @@ -954,7 +955,8 @@ void AcceleratedPresenter::PresentWithGDI(HDC dc) { system_surface->UnlockRect(); // For latency_tests.cc: - UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete"); + UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete", + TRACE_EVENT_SCOPE_THREAD); } gfx::Size AcceleratedPresenter::GetWindowSize() { |