Chromium Code Reviews| Index: ui/gl/gl_surface_win.cc |
| diff --git a/ui/gl/gl_surface_win.cc b/ui/gl/gl_surface_win.cc |
| index 8d55009a0efc0662c4d4c43d2254fa307c1b2f2e..578cd76eab6073d7cca5fa686291be73baad9db3 100644 |
| --- a/ui/gl/gl_surface_win.cc |
| +++ b/ui/gl/gl_surface_win.cc |
| @@ -39,8 +39,8 @@ class NativeViewGLSurfaceOSMesa : public GLSurfaceOSMesa { |
| bool Initialize() override; |
| void Destroy() override; |
| bool IsOffscreen() override; |
| - bool SwapBuffers() override; |
| - bool SupportsPostSubBuffer() override; |
| + gfx::SwapResult SwapBuffers() override; |
| + gfx::SwapResult SupportsPostSubBuffer() override; |
| bool PostSubBuffer(int x, int y, int width, int height) override; |
| private: |
| @@ -190,7 +190,7 @@ bool NativeViewGLSurfaceOSMesa::IsOffscreen() { |
| return false; |
| } |
| -bool NativeViewGLSurfaceOSMesa::SwapBuffers() { |
| +gfx::SwapResult NativeViewGLSurfaceOSMesa::SwapBuffers() { |
| DCHECK(device_context_); |
| gfx::Size size = GetSize(); |
| @@ -223,15 +223,17 @@ bool NativeViewGLSurfaceOSMesa::SwapBuffers() { |
| DIB_RGB_COLORS, |
| SRCCOPY); |
| - return true; |
| + return gfx::SWAP_ACK; |
| } |
| bool NativeViewGLSurfaceOSMesa::SupportsPostSubBuffer() { |
| return true; |
| } |
| -bool NativeViewGLSurfaceOSMesa::PostSubBuffer( |
| - int x, int y, int width, int height) { |
| +gfx::SwapResult NativeViewGLSurfaceOSMesa::PostSubBuffer(int x, |
| + int y, |
| + int width, |
| + int height) { |
| DCHECK(device_context_); |
| gfx::Size size = GetSize(); |
| @@ -264,7 +266,7 @@ bool NativeViewGLSurfaceOSMesa::PostSubBuffer( |
| DIB_RGB_COLORS, |
| SRCCOPY); |
| - return true; |
| + return return gfx::SWAP_ACK; |
|
piman
2015/05/14 20:58:54
nit: return return = typo
|
| } |
| scoped_refptr<GLSurface> GLSurface::CreateViewGLSurface( |