| Index: ui/gl/gl_surface_egl.cc
|
| diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
|
| index 61c3c055bd0a573a3d541fd34c6ec054d7bf1507..1de15b352a56e9240d79924160bd39d94b709fb9 100644
|
| --- a/ui/gl/gl_surface_egl.cc
|
| +++ b/ui/gl/gl_surface_egl.cc
|
| @@ -532,7 +532,7 @@ bool NativeViewGLSurfaceEGL::IsOffscreen() {
|
| return false;
|
| }
|
|
|
| -bool NativeViewGLSurfaceEGL::SwapBuffers() {
|
| +gfx::SwapResult NativeViewGLSurfaceEGL::SwapBuffers() {
|
| TRACE_EVENT2("gpu", "NativeViewGLSurfaceEGL:RealSwapBuffers",
|
| "width", GetSize().width(),
|
| "height", GetSize().height());
|
| @@ -575,10 +575,10 @@ bool NativeViewGLSurfaceEGL::SwapBuffers() {
|
| if (!eglSwapBuffers(GetDisplay(), surface_)) {
|
| DVLOG(1) << "eglSwapBuffers failed with error "
|
| << GetLastEGLErrorString();
|
| - return false;
|
| + return gfx::SWAP_FAILED;
|
| }
|
|
|
| - return true;
|
| + return gfx::SWAP_ACK;
|
| }
|
|
|
| gfx::Size NativeViewGLSurfaceEGL::GetSize() {
|
| @@ -637,15 +637,17 @@ bool NativeViewGLSurfaceEGL::SupportsPostSubBuffer() {
|
| return supports_post_sub_buffer_;
|
| }
|
|
|
| -bool NativeViewGLSurfaceEGL::PostSubBuffer(
|
| - int x, int y, int width, int height) {
|
| +gfx::SwapResult NativeViewGLSurfaceEGL::PostSubBuffer(int x,
|
| + int y,
|
| + int width,
|
| + int height) {
|
| DCHECK(supports_post_sub_buffer_);
|
| if (!eglPostSubBufferNV(GetDisplay(), surface_, x, y, width, height)) {
|
| DVLOG(1) << "eglPostSubBufferNV failed with error "
|
| << GetLastEGLErrorString();
|
| - return false;
|
| + return gfx::SWAP_FAILED;
|
| }
|
| - return true;
|
| + return gfx::SWAP_ACK;
|
| }
|
|
|
| VSyncProvider* NativeViewGLSurfaceEGL::GetVSyncProvider() {
|
| @@ -726,9 +728,9 @@ bool PbufferGLSurfaceEGL::IsOffscreen() {
|
| return true;
|
| }
|
|
|
| -bool PbufferGLSurfaceEGL::SwapBuffers() {
|
| +gfx::SwapResult PbufferGLSurfaceEGL::SwapBuffers() {
|
| NOTREACHED() << "Attempted to call SwapBuffers on a PbufferGLSurfaceEGL.";
|
| - return false;
|
| + return gfx::SWAP_FAILED;
|
| }
|
|
|
| gfx::Size PbufferGLSurfaceEGL::GetSize() {
|
| @@ -812,9 +814,9 @@ bool SurfacelessEGL::IsSurfaceless() const {
|
| return true;
|
| }
|
|
|
| -bool SurfacelessEGL::SwapBuffers() {
|
| +gfx::SwapResult SurfacelessEGL::SwapBuffers() {
|
| LOG(ERROR) << "Attempted to call SwapBuffers with SurfacelessEGL.";
|
| - return false;
|
| + return gfx::SWAP_FAILED;
|
| }
|
|
|
| gfx::Size SurfacelessEGL::GetSize() {
|
|
|