Remove return bool in SurfaceOzoneEGL::OnSwapBuffersAsync

ui/gl/gl_surface_ozone.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/gl/gl_surface.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 370 matching lines @@
 }
 
 void GLSurfaceOzoneSurfaceless::SubmitFrame() {
   DCHECK(!unsubmitted_frames_.empty());
 
   if (unsubmitted_frames_.front()->ready && !swap_buffers_pending_) {
     scoped_ptr<PendingFrame> frame(unsubmitted_frames_.front());
     unsubmitted_frames_.weak_erase(unsubmitted_frames_.begin());
     swap_buffers_pending_ = true;
 
-    last_swap_buffers_result_ =
-        frame->ScheduleOverlayPlanes(widget_) &&
-        ozone_surface_->OnSwapBuffersAsync(frame->callback);
+    if (!frame->ScheduleOverlayPlanes(widget_)) {
+      // |callback| is a wrapper for SwapCompleted(). Call it to properly
+      // propagate the failed state.
+      frame->callback.Run(gfx::SwapResult::SWAP_FAILED);
+    } else {
+      ozone_surface_->OnSwapBuffersAsync(frame->callback);

[spang, 2015/11/12 01:34:07]

I think you should return in the error path instead of putting the success path
inside else {}.

[dnicoara, 2015/11/12 15:16:52]

Done.

+    }
   }
 }
 
 EGLSyncKHR GLSurfaceOzoneSurfaceless::InsertFence() {
   const EGLint attrib_list[] = {EGL_SYNC_CONDITION_KHR,
                                 EGL_SYNC_PRIOR_COMMANDS_IMPLICIT_EXTERNAL_ARM,
                                 EGL_NONE};
   return eglCreateSyncKHR(GetDisplay(), EGL_SYNC_FENCE_KHR, attrib_list);
 }
 
 void GLSurfaceOzoneSurfaceless::FenceRetired(EGLSyncKHR fence,
                                              PendingFrame* frame) {
   eglDestroySyncKHR(GetDisplay(), fence);
   frame->ready = true;
   SubmitFrame();
 }
 
 void GLSurfaceOzoneSurfaceless::SwapCompleted(
     const SwapCompletionCallback& callback,
     gfx::SwapResult result) {
   callback.Run(result);
   swap_buffers_pending_ = false;
-
-  SubmitFrame();
+  if (result == gfx::SwapResult::SWAP_FAILED)
+    last_swap_buffers_result_ = false;
+  else
+    SubmitFrame();

[spang, 2015/11/12 01:34:07]

same comment, avoid putting success path flow into else {} when you could just
return

[dnicoara, 2015/11/12 15:16:52]

Done.

 }
 
 // This provides surface-like semantics implemented through surfaceless.
 // A framebuffer is bound automatically.
 class GL_EXPORT GLSurfaceOzoneSurfacelessSurfaceImpl
     : public GLSurfaceOzoneSurfaceless {
  public:
   GLSurfaceOzoneSurfacelessSurfaceImpl(
       scoped_ptr<ui::SurfaceOzoneEGL> ozone_surface,
       AcceleratedWidget widget);
@@ skipping 286 matching lines @@
   }
 }
 
 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
   return ui::OzonePlatform::GetInstance()
       ->GetSurfaceFactoryOzone()
       ->GetNativeDisplay();
 }
 
 }  // namespace gfx