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

Unified Diff: ui/gl/gl_surface_ozone.cc

Issue 1436993002: Remove return bool in SurfaceOzoneEGL::OnSwapBuffersAsync (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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 | « no previous file | ui/ozone/platform/cast/surface_ozone_egl_cast.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gl/gl_surface_ozone.cc
diff --git a/ui/gl/gl_surface_ozone.cc b/ui/gl/gl_surface_ozone.cc
index 978c982315a611baf1cb7daac2851431bae80082..b48c380ee9a348f9c006ba217526ee5c95b6a1ba 100644
--- a/ui/gl/gl_surface_ozone.cc
+++ b/ui/gl/gl_surface_ozone.cc
@@ -388,9 +388,8 @@ void GLSurfaceOzoneSurfaceless::SubmitFrame() {
unsubmitted_frames_.weak_erase(unsubmitted_frames_.begin());
swap_buffers_pending_ = true;
- last_swap_buffers_result_ =
- frame->ScheduleOverlayPlanes(widget_) &&
- ozone_surface_->OnSwapBuffersAsync(frame->callback);
+ last_swap_buffers_result_ = frame->ScheduleOverlayPlanes(widget_);
spang 2015/11/11 20:58:40 Shouldn't this be if (!frame->ScheduleOverlayPlan
dnicoara 2015/11/11 21:07:08 I was thinking about this, but if some overlays ha
dnicoara 2015/11/11 21:33:56 Done.
+ ozone_surface_->OnSwapBuffersAsync(frame->callback);
}
}
@@ -413,6 +412,7 @@ void GLSurfaceOzoneSurfaceless::SwapCompleted(
gfx::SwapResult result) {
callback.Run(result);
swap_buffers_pending_ = false;
+ last_swap_buffers_result_ &= result != gfx::SwapResult::SWAP_FAILED;
spang 2015/11/11 20:58:40 There's no reason to &, just assign. if (result =
dnicoara 2015/11/11 21:33:56 Done.
SubmitFrame();
}
« no previous file with comments | « no previous file | ui/ozone/platform/cast/surface_ozone_egl_cast.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698