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(); |
} |