summaryrefslogtreecommitdiffstats
path: root/ui/gl
diff options
context:
space:
mode:
authorjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 23:25:14 +0000
committerjbates@chromium.org <jbates@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-06-28 23:25:14 +0000
commiteb65e8704f1ee0c887be712d7b252851bdb0f8dc (patch)
tree887e87f2687695beb4c632d28849f2dedcd72b94 /ui/gl
parentc90b02c2f80ef8833cb379a3415c3eaa2e8b8fa9 (diff)
downloadchromium_src-eb65e8704f1ee0c887be712d7b252851bdb0f8dc.zip
chromium_src-eb65e8704f1ee0c887be712d7b252851bdb0f8dc.tar.gz
chromium_src-eb65e8704f1ee0c887be712d7b252851bdb0f8dc.tar.bz2
Fix latency tests.
This moves the SwapBuffers complete trace event from the Echo command to platform-specific locations that should be less prone to breakage in the future. BUG=135023 TBR=shawnsingh Review URL: https://chromiumcodereview.appspot.com/10729002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144832 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
-rw-r--r--ui/gl/gl_surface_glx.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc
index a5609cd..dcafb21 100644
--- a/ui/gl/gl_surface_glx.cc
+++ b/ui/gl/gl_surface_glx.cc
@@ -9,6 +9,7 @@ extern "C" {
#include "ui/gl/gl_surface_glx.h"
#include "base/basictypes.h"
+#include "base/debug/trace_event.h"
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/message_loop.h"
@@ -135,6 +136,8 @@ bool NativeViewGLSurfaceGLX::IsOffscreen() {
bool NativeViewGLSurfaceGLX::SwapBuffers() {
glXSwapBuffers(g_display, window_);
+ // For latency_tests.cc:
+ UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete");
return true;
}