Adding status to swap complete

ui/ozone/platform/drm/gpu/hardware_display_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/hardware_display_controller.h"
 
 #include <drm.h>
 #include <string.h>
 #include <xf86drm.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/size.h"
+#include "ui/gfx/native_widget_types.h"
 #include "ui/ozone/platform/drm/gpu/crtc_controller.h"
 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
 #include "ui/ozone/platform/drm/gpu/drm_device.h"
 #include "ui/ozone/public/native_pixmap.h"
 
 namespace ui {
+namespace {
+void EmptyPageFlipCallback(int result) {
+}
+}  // namespace
 
 HardwareDisplayController::PageFlipRequest::PageFlipRequest(
     const OverlayPlaneList& planes,
     bool is_sync,
-    const base::Closure& callback)
+    const PageFlipCallback& callback)
     : planes(planes), is_sync(is_sync), callback(callback) {
 }
 
 HardwareDisplayController::PageFlipRequest::~PageFlipRequest() {
 }
 
 HardwareDisplayController::HardwareDisplayController(
     scoped_ptr<CrtcController> controller)
     : is_disabled_(true) {
   memset(&mode_, 0, sizeof(mode_));
@@ skipping 11 matching lines @@
   TRACE_EVENT0("drm", "HDC::Modeset");
   DCHECK(primary.buffer.get());
   bool status = true;
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
     status &= crtc_controllers_[i]->Modeset(primary, mode);
 
   is_disabled_ = false;
   mode_ = mode;
 
   current_planes_ = std::vector<OverlayPlane>(1, primary);
+  pending_planes_.clear();
   ClearPendingRequests();
 
   // Because a page flip is pending we need to leave some state for the
   // callback. We use the modeset state since it is the only valid state.
   if (HasPendingPageFlips())
-    requests_.push_back(
-        PageFlipRequest(current_planes_, false, base::Bind(&base::DoNothing)));
+    requests_.push_back(PageFlipRequest(current_planes_, false,
+                                        base::Bind(&EmptyPageFlipCallback)));
 
   return status;
 }
 
 bool HardwareDisplayController::Enable() {
   TRACE_EVENT0("drm", "HDC::Enable");
   DCHECK(!current_planes_.empty());
-
-  const OverlayPlane* primary = nullptr;
-  // Use the last scheduled buffer to modeset to preserve request order.
-  if (!requests_.empty())
-    primary = OverlayPlane::GetPrimaryPlane(requests_.back().planes);
-  else
-    primary = OverlayPlane::GetPrimaryPlane(current_planes_);
+  const OverlayPlane* primary = OverlayPlane::GetPrimaryPlane(current_planes_);
 
   return Modeset(*primary, mode_);
 }
 
 void HardwareDisplayController::Disable() {
   TRACE_EVENT0("drm", "HDC::Disable");
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
     crtc_controllers_[i]->Disable();
 
   is_disabled_ = true;
 }
 
 void HardwareDisplayController::QueueOverlayPlane(const OverlayPlane& plane) {
   pending_planes_.push_back(plane);
 }
 
 bool HardwareDisplayController::SchedulePageFlip(
     bool is_sync,
-    const base::Closure& callback) {
+    const PageFlipCallback& callback) {
   TRACE_EVENT0("drm", "HDC::SchedulePageFlip");
 
   // Ignore requests with no planes to schedule.
   if (pending_planes_.empty()) {
-    callback.Run();
+    callback.Run(gfx::SwapAck);
     return true;
   }
 
   requests_.push_back(PageFlipRequest(pending_planes_, is_sync, callback));
   pending_planes_.clear();
 
   // A request is being serviced right now.
   if (HasPendingPageFlips())
     return true;
 
   bool status = ActualSchedulePageFlip();
 
   // No page flip event on failure so discard failed request.
   if (!status)
     requests_.pop_front();
 
   return status;
 }
 
+bool HardwareDisplayController::SchedulePageFlipWithoutCallback(bool is_sync) {
+  return SchedulePageFlip(is_sync, base::Bind(&EmptyPageFlipCallback));
+}
+
 bool HardwareDisplayController::SetCursor(
     const scoped_refptr<ScanoutBuffer>& buffer) {
   bool status = true;
 
   if (is_disabled_)
     return true;
 
   for (size_t i = 0; i < crtc_controllers_.size(); ++i)
     status &= crtc_controllers_[i]->SetCursor(buffer);
 
@@ skipping 120 matching lines @@
 
   // At this point we still have requests pending, so schedule the next request.
   bool status = ActualSchedulePageFlip();
   if (!status) {
     PageFlipRequest request = requests_.front();
     requests_.pop_front();
 
     // Normally the caller would handle the error call, but because we're in a
     // delayed schedule the initial SchedulePageFlip() already returned true,
     // thus we need to run the callback.
-    request.callback.Run();
+    request.callback.Run(gfx::SwapFailed);
   }
 }
 
 scoped_refptr<DrmDevice> HardwareDisplayController::GetAllocationDrmDevice()
     const {
   DCHECK(!crtc_controllers_.empty());
   // TODO(dnicoara) When we support mirroring across DRM devices, figure out
   // which device should be used for allocations.
   return crtc_controllers_[0]->drm();
 }
@@ skipping 37 matching lines @@
 
   return status;
 }
 
 void HardwareDisplayController::ProcessPageFlipRequest() {
   DCHECK(!requests_.empty());
   PageFlipRequest request = requests_.front();
   requests_.pop_front();
 
   current_planes_.swap(request.planes);
-  request.callback.Run();
+  request.callback.Run(gfx::SwapAck);
 }
 
 void HardwareDisplayController::ClearPendingRequests() {
   while (!requests_.empty()) {
     PageFlipRequest request = requests_.front();
     requests_.pop_front();
-    request.callback.Run();
+    request.callback.Run(gfx::SwapAck);
   }
 }
 
 }  // namespace ui