[Ozone-DRM] Remove bool return value for SchedulePageFlip call

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_request.h"
@@ skipping 14 matching lines @@
         drm_->plane_manager()->planes();
     for (auto* plane : all_planes) {
       if (plane->owning_crtc() == crtc_) {
         plane->set_owning_crtc(0);
         plane->set_in_use(false);
       }
     }
 
     SetCursor(nullptr);
     drm_->DisableCrtc(crtc_);
-    SignalPageFlipRequest();
+    SignalPageFlipRequest(gfx::SwapResult::SWAP_ACK);
   }
 }
 
 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_
                 << " connector=" << connector_
                 << " framebuffer_id=" << plane.buffer->GetFramebufferId()
                 << " mode=" << mode.hdisplay << "x" << mode.vdisplay << "@"
@@ skipping 19 matching lines @@
 }
 
 bool CrtcController::Disable() {
   if (is_disabled_)
     return true;
 
   is_disabled_ = true;
   return drm_->DisableCrtc(crtc_);
 }
 
 bool CrtcController::SchedulePageFlip(

[spang, 2015/10/29 20:59:20]

Still two statuses being returned here.

     HardwareDisplayPlaneList* plane_list,
     const OverlayPlaneList& overlays,
     bool test_only,
     scoped_refptr<PageFlipRequest> page_flip_request) {
   DCHECK(!page_flip_request_.get() || test_only);
   DCHECK(!is_disabled_);
   const OverlayPlane* primary = OverlayPlane::GetPrimaryPlane(overlays);
   if (!primary) {
     LOG(ERROR) << "No primary plane to display on crtc " << crtc_;
     page_flip_request->Signal(gfx::SwapResult::SWAP_ACK);
@@ skipping 25 matching lines @@
   }
 
   return true;
 }
 
 std::vector<uint32_t> CrtcController::GetCompatibleHardwarePlaneIds(
     const OverlayPlane& plane) const {
   return drm_->plane_manager()->GetCompatibleHardwarePlaneIds(plane, crtc_);
 }
 
-void CrtcController::PageFlipFailed() {
-  pending_planes_.clear();
-  SignalPageFlipRequest();
-}
-
 void CrtcController::OnPageFlipEvent(unsigned int frame,
                                      unsigned int seconds,
                                      unsigned int useconds) {
   time_of_last_flip_ =
       static_cast<uint64_t>(seconds) * base::Time::kMicrosecondsPerSecond +
       useconds;
 
   current_planes_.clear();
   current_planes_.swap(pending_planes_);

[spang, 2015/10/29 20:59:20]

I think it should be moved to SignalPageFlipRequest().

void CrtcController::SignalPageFlipRequest(gfx::SwapResult result) {
  if (result == gfx::SwapResult::SWAP_ACK)
    current_planes_ = pending_planes_;
  pending_planes_.clear();

  if (page_flip_request_.get()) {
    // ...
  }
}

[dnicoara, 2015/10/30 14:59:31]

Acknowledged.

 
-  SignalPageFlipRequest();
+  SignalPageFlipRequest(gfx::SwapResult::SWAP_ACK);
 }
 
 bool CrtcController::SetCursor(const scoped_refptr<ScanoutBuffer>& buffer) {
   DCHECK(!is_disabled_ || !buffer);
   cursor_buffer_ = buffer;
 
   return ResetCursor();
 }
 
 bool CrtcController::MoveCursor(const gfx::Point& location) {
@@ skipping 13 matching lines @@
   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;
 }
 
-void CrtcController::SignalPageFlipRequest() {
+void CrtcController::SignalPageFlipRequest(gfx::SwapResult result) {
+  pending_planes_.clear();
   if (page_flip_request_.get()) {

[spang, 2015/10/29 20:59:20]

When is this false?

[dnicoara, 2015/10/30 14:59:31]

This was needed when HDC::SchedulePageFlip() was re-entrant. Shouldn't be
possible anymore. I'll remove this in a separate change just in case.

[dnicoara, 2015/10/30 17:21:59]

Actually, sorry, you're right, it shouldn't be possible due to re-entrancy. I
guess it was just the call from the dtor that needed this.

     // If another frame is queued up and available immediately, calling Signal()
     // may result in a call to SchedulePageFlip(), which will override
     // page_flip_request_ and possibly release the ref. Stash previous request
     // locally to  avoid deleting the object we are making a call on.
     scoped_refptr<PageFlipRequest> last_request;
     last_request.swap(page_flip_request_);
-    last_request->Signal(gfx::SwapResult::SWAP_ACK);
+    last_request->Signal(result);
   }
 }
 
 }  // namespace ui