| Index: ui/gl/gl_surface_wgl.cc
|
| diff --git a/ui/gl/gl_surface_wgl.cc b/ui/gl/gl_surface_wgl.cc
|
| index 698539fe7ff1ae7936debf3478f2d4e6bc17d12f..82e34ecf7f55fd0dbfbcfd216495140ad7523d71 100644
|
| --- a/ui/gl/gl_surface_wgl.cc
|
| +++ b/ui/gl/gl_surface_wgl.cc
|
| @@ -250,7 +250,7 @@ bool NativeViewGLSurfaceWGL::IsOffscreen() {
|
| return false;
|
| }
|
|
|
| -bool NativeViewGLSurfaceWGL::SwapBuffers() {
|
| +gfx::SwapResult NativeViewGLSurfaceWGL::SwapBuffers() {
|
| TRACE_EVENT2("gpu", "NativeViewGLSurfaceWGL:RealSwapBuffers",
|
| "width", GetSize().width(),
|
| "height", GetSize().height());
|
| @@ -259,18 +259,19 @@ bool NativeViewGLSurfaceWGL::SwapBuffers() {
|
| // it as it moves.
|
| RECT rect;
|
| if (!GetClientRect(window_, &rect))
|
| - return false;
|
| + return gfx::SwapResult::SWAP_FAILED;
|
| if (!MoveWindow(child_window_,
|
| 0,
|
| 0,
|
| rect.right - rect.left,
|
| rect.bottom - rect.top,
|
| FALSE)) {
|
| - return false;
|
| + return gfx::SwapResult::SWAP_FAILED;
|
| }
|
|
|
| DCHECK(device_context_);
|
| - return ::SwapBuffers(device_context_) == TRUE;
|
| + return ::SwapBuffers(device_context_) == TRUE ? gfx::SwapResult::SWAP_ACK
|
| + : gfx::SwapResult::SWAP_FAILED;
|
| }
|
|
|
| gfx::Size NativeViewGLSurfaceWGL::GetSize() {
|
| @@ -345,9 +346,9 @@ bool PbufferGLSurfaceWGL::IsOffscreen() {
|
| return true;
|
| }
|
|
|
| -bool PbufferGLSurfaceWGL::SwapBuffers() {
|
| +gfx::SwapResult PbufferGLSurfaceWGL::SwapBuffers() {
|
| NOTREACHED() << "Attempted to call SwapBuffers on a pbuffer.";
|
| - return false;
|
| + return gfx::SwapResult::SWAP_FAILED;
|
| }
|
|
|
| gfx::Size PbufferGLSurfaceWGL::GetSize() {
|
|
|