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

Unified Diff: ui/gl/gl_surface_egl.cc

Issue 1166463004: Revert of Adding status to swap complete (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gl/gl_surface_egl.h ('k') | ui/gl/gl_surface_glx.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_egl.cc
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc
index 4d64da7880a2a7d31fddadc8fd1c457dabbe06bc..b6cf38f88b348d0709298d92cfbfe4bc2efe2a37 100644
--- a/ui/gl/gl_surface_egl.cc
+++ b/ui/gl/gl_surface_egl.cc
@@ -661,7 +661,7 @@
return false;
}
-gfx::SwapResult NativeViewGLSurfaceEGL::SwapBuffers() {
+bool NativeViewGLSurfaceEGL::SwapBuffers() {
TRACE_EVENT2("gpu", "NativeViewGLSurfaceEGL:RealSwapBuffers",
"width", GetSize().width(),
"height", GetSize().height());
@@ -704,10 +704,10 @@
if (!eglSwapBuffers(GetDisplay(), surface_)) {
DVLOG(1) << "eglSwapBuffers failed with error "
<< GetLastEGLErrorString();
- return gfx::SwapResult::SWAP_FAILED;
- }
-
- return gfx::SwapResult::SWAP_ACK;
+ return false;
+ }
+
+ return true;
}
gfx::Size NativeViewGLSurfaceEGL::GetSize() {
@@ -766,17 +766,15 @@
return supports_post_sub_buffer_;
}
-gfx::SwapResult NativeViewGLSurfaceEGL::PostSubBuffer(int x,
- int y,
- int width,
- int height) {
+bool 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 gfx::SwapResult::SWAP_FAILED;
- }
- return gfx::SwapResult::SWAP_ACK;
+ return false;
+ }
+ return true;
}
VSyncProvider* NativeViewGLSurfaceEGL::GetVSyncProvider() {
@@ -857,9 +855,9 @@
return true;
}
-gfx::SwapResult PbufferGLSurfaceEGL::SwapBuffers() {
+bool PbufferGLSurfaceEGL::SwapBuffers() {
NOTREACHED() << "Attempted to call SwapBuffers on a PbufferGLSurfaceEGL.";
- return gfx::SwapResult::SWAP_FAILED;
+ return false;
}
gfx::Size PbufferGLSurfaceEGL::GetSize() {
@@ -943,9 +941,9 @@
return true;
}
-gfx::SwapResult SurfacelessEGL::SwapBuffers() {
+bool SurfacelessEGL::SwapBuffers() {
LOG(ERROR) << "Attempted to call SwapBuffers with SurfacelessEGL.";
- return gfx::SwapResult::SWAP_FAILED;
+ return false;
}
gfx::Size SurfacelessEGL::GetSize() {
« no previous file with comments | « ui/gl/gl_surface_egl.h ('k') | ui/gl/gl_surface_glx.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698