Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(312)

Side by Side Diff: ui/gl/gl_surface_glx.cc

Issue 10729002: Fix latency tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove expect that no longer works Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | ui/surface/accelerated_surface_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 extern "C" { 5 extern "C" {
6 #include <X11/Xlib.h> 6 #include <X11/Xlib.h>
7 } 7 }
8 8
9 #include "ui/gl/gl_surface_glx.h" 9 #include "ui/gl/gl_surface_glx.h"
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
12 #include "base/debug/trace_event.h"
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
14 #include "base/message_loop.h" 15 #include "base/message_loop.h"
15 #include "base/process_util.h" 16 #include "base/process_util.h"
16 #include "third_party/mesa/MesaLib/include/GL/osmesa.h" 17 #include "third_party/mesa/MesaLib/include/GL/osmesa.h"
17 #include "ui/base/x/x11_util.h" 18 #include "ui/base/x/x11_util.h"
18 #include "ui/gl/gl_bindings.h" 19 #include "ui/gl/gl_bindings.h"
19 #include "ui/gl/gl_implementation.h" 20 #include "ui/gl/gl_implementation.h"
20 21
21 namespace gfx { 22 namespace gfx {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 size_ = size; 129 size_ = size;
129 return true; 130 return true;
130 } 131 }
131 132
132 bool NativeViewGLSurfaceGLX::IsOffscreen() { 133 bool NativeViewGLSurfaceGLX::IsOffscreen() {
133 return false; 134 return false;
134 } 135 }
135 136
136 bool NativeViewGLSurfaceGLX::SwapBuffers() { 137 bool NativeViewGLSurfaceGLX::SwapBuffers() {
137 glXSwapBuffers(g_display, window_); 138 glXSwapBuffers(g_display, window_);
139 // For latency_tests.cc:
140 UNSHIPPED_TRACE_EVENT_INSTANT0("test_gpu", "CompositorSwapBuffersComplete");
138 return true; 141 return true;
139 } 142 }
140 143
141 gfx::Size NativeViewGLSurfaceGLX::GetSize() { 144 gfx::Size NativeViewGLSurfaceGLX::GetSize() {
142 return size_; 145 return size_;
143 } 146 }
144 147
145 void* NativeViewGLSurfaceGLX::GetHandle() { 148 void* NativeViewGLSurfaceGLX::GetHandle() {
146 return reinterpret_cast<void*>(window_); 149 return reinterpret_cast<void*>(window_);
147 } 150 }
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
315 318
316 void* PbufferGLSurfaceGLX::GetConfig() { 319 void* PbufferGLSurfaceGLX::GetConfig() {
317 return config_; 320 return config_;
318 } 321 }
319 322
320 PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() { 323 PbufferGLSurfaceGLX::~PbufferGLSurfaceGLX() {
321 Destroy(); 324 Destroy();
322 } 325 }
323 326
324 } // namespace gfx 327 } // namespace gfx
OLDNEW
« no previous file with comments | « content/common/gpu/gpu_command_buffer_stub.cc ('k') | ui/surface/accelerated_surface_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698