With the overlay path moving back to passing AcceleratedWidgets, move the implementation back into …

ui/ozone/platform/dri/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/dri/hardware_display_controller.h"
 
 #include <drm.h>
 #include <errno.h>
 #include <string.h>
 #include <xf86drm.h>
@@ skipping 93 matching lines @@
   // Since a subset of controllers may be actively using |primary|, just keep
   // track of it.
   current_planes_ = std::vector<OverlayPlane>(1, primary);
   pending_planes_.clear();
   mode_ = mode;
   return status;
 }
 
 bool HardwareDisplayController::Enable() {
   TRACE_EVENT0("dri", "HDC::Enable");
+  DCHECK(!current_planes_.empty());
   OverlayPlane primary = GetPrimaryPlane(current_planes_);
   DCHECK(primary.buffer);
   pending_page_flips_ = 0;
   bool status = true;
   for (size_t i = 0; i < crtc_states_.size(); ++i)
     status &= ModesetCrtc(primary.buffer, mode_, crtc_states_[i]);
 
   return status;
 }
 
 void HardwareDisplayController::Disable() {
   TRACE_EVENT0("dri", "HDC::Disable");
   pending_page_flips_ = 0;
   for (size_t i = 0; i < crtc_states_.size(); ++i) {
     drm_->DisableCrtc(crtc_states_[i]->crtc());
     crtc_states_[i]->set_is_disabled(true);
   }
 }
 
-bool HardwareDisplayController::SchedulePageFlip(
-    const OverlayPlaneList& overlays) {
-  DCHECK_LE(1u, overlays.size());
+void HardwareDisplayController::QueueOverlayPlane(const OverlayPlane& plane) {
+  pending_planes_.push_back(plane);
+}
+
+bool HardwareDisplayController::SchedulePageFlip() {
+  DCHECK(!pending_planes_.empty());
   DCHECK_EQ(0u, pending_page_flips_);
 
-  pending_planes_ = overlays;
   bool status = true;
   for (size_t i = 0; i < crtc_states_.size(); ++i) {
     if (crtc_states_[i]->is_disabled())
       continue;
 
-    status &= SchedulePageFlipOnCrtc(overlays, crtc_states_[i]);
+    status &= SchedulePageFlipOnCrtc(pending_planes_, crtc_states_[i]);
   }
 
   return status;
 }
 
 void HardwareDisplayController::WaitForPageFlipEvent() {
   TRACE_EVENT1("dri", "HDC::WaitForPageFlipEvent",
                "pending_pageflips", pending_page_flips_);
 
   bool has_pending_page_flips = pending_page_flips_ != 0;
@@ skipping 155 matching lines @@
                                plane.overlay_plane)) {
       LOG(ERROR) << "Cannot display on overlay: " << strerror(errno);
       return false;
     }
   }
 
   return true;
 }
 
 }  // namespace ui