[Ozone-DRI] Listen for swap events

ui/ozone/platform/dri/gbm_surface.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/ozone/platform/dri/gbm_surface.h"
 
 #include <gbm.h>
 
+#include "base/bind.h"
 #include "base/logging.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_window_delegate.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/gbm_buffer_base.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/scanout_buffer.h"
 
 namespace ui {
 
@@ skipping 56 matching lines @@
 
 }  // namespace
 
 GbmSurface::GbmSurface(DriWindowDelegate* window_delegate,
                        gbm_device* device,
                        DriWrapper* dri)
     : GbmSurfaceless(window_delegate),
       gbm_device_(device),
       dri_(dri),
       native_surface_(NULL),
-      current_buffer_(NULL) {
+      current_buffer_(NULL),
+      weak_factory_(this) {
 }
 
 GbmSurface::~GbmSurface() {
   if (current_buffer_)
     gbm_surface_release_buffer(native_surface_, current_buffer_);
 
   if (native_surface_)
     gbm_surface_destroy(native_surface_);
 }
 
@@ skipping 27 matching lines @@
 }
 
 bool GbmSurface::ResizeNativeWindow(const gfx::Size& viewport_size) {
   if (size_ == viewport_size)
     return true;
 
   return false;
 }
 
 bool GbmSurface::OnSwapBuffers() {
+  NOTREACHED();
+  return false;
+}
+
+bool GbmSurface::OnSwapBuffersAsync(const SwapCompletionCallback& callback) {
   DCHECK(native_surface_);
 
   gbm_bo* pending_buffer = gbm_surface_lock_front_buffer(native_surface_);
   scoped_refptr<GbmSurfaceBuffer> primary =
       GbmSurfaceBuffer::GetBuffer(pending_buffer);
   if (!primary.get()) {
     primary = GbmSurfaceBuffer::CreateBuffer(dri_, pending_buffer);
     if (!primary.get()) {
       LOG(ERROR) << "Failed to associate the buffer with the controller";
+      callback.Run();
       return false;
     }
   }
 
   // The primary buffer is a special case.
   if (window_delegate_->GetController())
     window_delegate_->GetController()->QueueOverlayPlane(OverlayPlane(primary));
 
-  if (!GbmSurfaceless::OnSwapBuffers())
+  if (!GbmSurfaceless::OnSwapBuffersAsync(
+          base::Bind(&GbmSurface::OnSwapBuffersCallback,
+                     weak_factory_.GetWeakPtr(), callback, pending_buffer))) {
+    callback.Run();
     return false;
+  }
 
+  return true;
+}
+
+void GbmSurface::OnSwapBuffersCallback(const SwapCompletionCallback& callback,
+                                       gbm_bo* pending_buffer) {
   // If there was a frontbuffer, it is no longer active. Release it back to GBM.
   if (current_buffer_)
     gbm_surface_release_buffer(native_surface_, current_buffer_);
 
   current_buffer_ = pending_buffer;
-  return true;
-}
-
-bool GbmSurface::OnSwapBuffersAsync(const SwapCompletionCallback& callback) {
-  bool success = OnSwapBuffers();
   callback.Run();
-  return success;
 }
 
 }  // namespace ui