Index: ui/gl/gl_surface_glx.cc |
diff --git a/ui/gl/gl_surface_glx.cc b/ui/gl/gl_surface_glx.cc |
index 0602dfabe0c675752f3c9b373a80948b8cb3462e..b021a4268387e200bad1af7968d2cb24f37c2979 100644 |
--- a/ui/gl/gl_surface_glx.cc |
+++ b/ui/gl/gl_surface_glx.cc |
@@ -540,13 +540,13 @@ bool NativeViewGLSurfaceGLX::IsOffscreen() { |
return false; |
} |
-bool NativeViewGLSurfaceGLX::SwapBuffers() { |
+gfx::SwapResult NativeViewGLSurfaceGLX::SwapBuffers() { |
TRACE_EVENT2("gpu", "NativeViewGLSurfaceGLX:RealSwapBuffers", |
"width", GetSize().width(), |
"height", GetSize().height()); |
glXSwapBuffers(g_display, GetDrawableHandle()); |
- return true; |
+ return gfx::SwapResult::SWAP_ACK; |
} |
gfx::Size NativeViewGLSurfaceGLX::GetSize() { |
@@ -567,11 +567,13 @@ void* NativeViewGLSurfaceGLX::GetConfig() { |
return config_; |
} |
-bool NativeViewGLSurfaceGLX::PostSubBuffer( |
- int x, int y, int width, int height) { |
+gfx::SwapResult NativeViewGLSurfaceGLX::PostSubBuffer(int x, |
+ int y, |
+ int width, |
+ int height) { |
DCHECK(gfx::g_driver_glx.ext.b_GLX_MESA_copy_sub_buffer); |
glXCopySubBufferMESA(g_display, GetDrawableHandle(), x, y, width, height); |
- return true; |
+ return gfx::SwapResult::SWAP_ACK; |
} |
VSyncProvider* NativeViewGLSurfaceGLX::GetVSyncProvider() { |
@@ -617,9 +619,9 @@ bool UnmappedNativeViewGLSurfaceGLX::IsOffscreen() { |
return true; |
} |
-bool UnmappedNativeViewGLSurfaceGLX::SwapBuffers() { |
+gfx::SwapResult UnmappedNativeViewGLSurfaceGLX::SwapBuffers() { |
NOTREACHED() << "Attempted to call SwapBuffers on an unmapped window."; |
- return false; |
+ return gfx::SwapResult::SWAP_FAILED; |
} |
gfx::Size UnmappedNativeViewGLSurfaceGLX::GetSize() { |