diff options
| author | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 21:37:55 +0000 |
|---|---|---|
| committer | jbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-03 21:37:55 +0000 |
| commit | 6eb6be9ceb3e2a0eb93b93a82d22f7c9b8dbd243 (patch) | |
| tree | 6254c0d288fe76039d0f8d878a38bacc6d4d7bcd /gpu | |
| parent | 99077dded8d0a32d0a2ab0f3671428e27cbfec31 (diff) | |
| download | chromium_src-6eb6be9ceb3e2a0eb93b93a82d22f7c9b8dbd243.zip chromium_src-6eb6be9ceb3e2a0eb93b93a82d22f7c9b8dbd243.tar.gz chromium_src-6eb6be9ceb3e2a0eb93b93a82d22f7c9b8dbd243.tar.bz2 | |
Revert 116191 - Input latency performance test that uses tracing.
This CL adds a new gyp target called performance_browser_tests to run the new input latency test as a browser test.
See the comments in latency_tests.cc for an overview of how latency is measured.
Review URL: http://codereview.chromium.org/8883005
TBR=jbates@chromium.org
Review URL: http://codereview.chromium.org/9071018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116202 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/command_buffer/service/gles2_cmd_decoder.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc index 814e454..10c1c5d0 100644 --- a/gpu/command_buffer/service/gles2_cmd_decoder.cc +++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -3913,8 +3913,6 @@ error::Error GLES2DecoderImpl::HandleRegisterSharedIdsCHROMIUM( void GLES2DecoderImpl::DoClear(GLbitfield mask) { if (CheckBoundFramebuffersValid("glClear")) { - UNSHIPPED_TRACE_EVENT_INSTANT2("test_gpu", "DoClear", "red", clear_red_, - "green", clear_green_); ApplyDirtyState(); glClear(mask); } @@ -4224,7 +4222,6 @@ void GLES2DecoderImpl::DoBlitFramebufferEXT( glBlitFramebufferEXT( srcX0, srcY0, srcX1, srcY1, dstX0, dstY0, dstX1, dstY1, mask, filter); } - UNSHIPPED_TRACE_EVENT_INSTANT1("test_gpu", "DoBlit", "width", srcX1 - srcX0); } void GLES2DecoderImpl::DoRenderbufferStorageMultisample( @@ -7341,10 +7338,8 @@ error::Error GLES2DecoderImpl::HandleSwapBuffers( bool is_offscreen = !!offscreen_target_frame_buffer_.get(); int this_frame_number = frame_number_++; // TRACE_EVENT for gpu tests: - TRACE_EVENT_INSTANT2("test_gpu", "SwapBuffers", - "GLImpl", static_cast<int>(gfx::GetGLImplementation()), - "width", (is_offscreen ? offscreen_size_.width() : - surface_->GetSize().width())); + TRACE_EVENT_INSTANT1("test_gpu", "SwapBuffers", + "GLImpl", static_cast<int>(gfx::GetGLImplementation())); TRACE_EVENT2("gpu", "GLES2DecoderImpl::HandleSwapBuffers", "offscreen", is_offscreen, "frame", this_frame_number); |