[ozone] Keep the queue of surfaceless buffers inside gl_surface_ozone

ui/ozone/platform/drm/gpu/crtc_controller.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/drm/gpu/crtc_controller.h"
 
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
-#include "ui/ozone/platform/drm/gpu/page_flip_observer.h"
+#include "ui/ozone/platform/drm/gpu/page_flip_request.h"
 #include "ui/ozone/platform/drm/gpu/scanout_buffer.h"
 
 namespace ui {
 
 CrtcController::CrtcController(const scoped_refptr<DrmDevice>& drm,
                                uint32_t crtc,
                                uint32_t connector)
     : drm_(drm),
       crtc_(crtc),
       connector_(connector),
       saved_crtc_(drm->GetCrtc(crtc)),
       is_disabled_(true),
       page_flip_pending_(false),
       time_of_last_flip_(0) {
 }
 
 CrtcController::~CrtcController() {

[dnicoara, 2015/04/23 15:34:56]

I think you need to ack the request here as well.

   if (!is_disabled_) {
     drm_->SetCrtc(saved_crtc_.get(), std::vector<uint32_t>(1, connector_));
     SetCursor(nullptr);
   }
 }
 
 bool CrtcController::Modeset(const OverlayPlane& plane, drmModeModeInfo mode) {
   if (!drm_->SetCrtc(crtc_, plane.buffer->GetFramebufferId(),
                      std::vector<uint32_t>(1, connector_), &mode)) {
     PLOG(ERROR) << "Failed to modeset: crtc=" << crtc_
@@ skipping 22 matching lines @@
 }
 
 bool CrtcController::Disable() {
   if (is_disabled_)
     return true;
 
   is_disabled_ = true;
   return drm_->DisableCrtc(crtc_);
 }
 
-bool CrtcController::SchedulePageFlip(HardwareDisplayPlaneList* plane_list,
-                                      const OverlayPlaneList& overlays) {
+bool CrtcController::SchedulePageFlip(
+    HardwareDisplayPlaneList* plane_list,
+    const OverlayPlaneList& overlays,
+    scoped_refptr<PageFlipRequest> page_flip_request) {
   DCHECK(!page_flip_pending_);

[dnicoara, 2015/04/23 15:34:56]

Lets just remove page_flip_pending_ and check against page_flip_request_.

   DCHECK(!is_disabled_);
   const OverlayPlane* primary = OverlayPlane::GetPrimaryPlane(overlays);
   if (!primary) {
     LOG(ERROR) << "No primary plane to display on crtc " << crtc_;
-    FOR_EACH_OBSERVER(PageFlipObserver, observers_, OnPageFlipEvent());
+    page_flip_request->callback.Run();
     return true;
   }
   DCHECK(primary->buffer.get());
 
   if (primary->buffer->GetSize() != gfx::Size(mode_.hdisplay, mode_.vdisplay)) {
     VLOG(2) << "Trying to pageflip a buffer with the wrong size. Expected "
             << mode_.hdisplay << "x" << mode_.vdisplay << " got "
             << primary->buffer->GetSize().ToString() << " for"
             << " crtc=" << crtc_ << " connector=" << connector_;
-    FOR_EACH_OBSERVER(PageFlipObserver, observers_, OnPageFlipEvent());
+    page_flip_request->callback.Run();
     return true;
   }
 
   if (!drm_->plane_manager()->AssignOverlayPlanes(plane_list, overlays, crtc_,
                                                   this)) {
     PLOG(ERROR) << "Failed to assign overlay planes for crtc " << crtc_;

[dnicoara, 2015/04/23 15:34:56]

Need to call the page_flip_request here as well.

     return false;
   }
 
   page_flip_pending_ = true;
   pending_planes_ = overlays;
+  page_flip_request_ = page_flip_request;
 
   return true;
 }
 
 void CrtcController::PageFlipFailed() {
   pending_planes_.clear();
   page_flip_pending_ = false;
 }
 
 void CrtcController::OnPageFlipEvent(unsigned int frame,
                                      unsigned int seconds,
                                      unsigned int useconds) {
   page_flip_pending_ = false;
   time_of_last_flip_ =
       static_cast<uint64_t>(seconds) * base::Time::kMicrosecondsPerSecond +
       useconds;
 
   current_planes_.clear();
   current_planes_.swap(pending_planes_);
 
-  FOR_EACH_OBSERVER(PageFlipObserver, observers_, OnPageFlipEvent());
+  scoped_refptr<PageFlipRequest> last_request;
+  last_request.swap(page_flip_request_);
+  last_request->callback.Run();
 }
 
 bool CrtcController::SetCursor(const scoped_refptr<ScanoutBuffer>& buffer) {
   DCHECK(!is_disabled_ || !buffer);
   cursor_buffer_ = buffer;
 
   return ResetCursor();
 }
 
 bool CrtcController::MoveCursor(const gfx::Point& location) {
   DCHECK(!is_disabled_);
   return drm_->MoveCursor(crtc_, location);
 }
 
-void CrtcController::AddObserver(PageFlipObserver* observer) {
-  observers_.AddObserver(observer);
-}
-
-void CrtcController::RemoveObserver(PageFlipObserver* observer) {
-  observers_.RemoveObserver(observer);
-}
-
 bool CrtcController::ResetCursor() {
   uint32_t handle = 0;
   gfx::Size size;
 
   if (cursor_buffer_) {
     handle = cursor_buffer_->GetHandle();
     size = cursor_buffer_->GetSize();
   }
 
   bool status = drm_->SetCursor(crtc_, handle, size);
   if (!status) {
     PLOG(ERROR) << "drmModeSetCursor: device " << drm_->device_path().value()
                 << " crtc " << crtc_ << " handle " << handle << " size "
                 << size.ToString();
   }
 
   return status;
 }
 
 }  // namespace ui