[Ozone-DRI] Convert HardwareDisplayController to use scanout buffers

ui/ozone/platform/dri/screen_manager.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/screen_manager.h"
 
 #include <xf86drmMode.h>
 
 #include "ui/gfx/geometry/point.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/ozone/platform/dri/dri_util.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
-#include "ui/ozone/platform/dri/scanout_surface.h"
+#include "ui/ozone/platform/dri/scanout_buffer.h"
 
 namespace ui {
 
 ScreenManager::ScreenManager(
-    DriWrapper* dri, ScanoutSurfaceGenerator* surface_generator)
-    : dri_(dri), surface_generator_(surface_generator), last_added_widget_(0) {
+    DriWrapper* dri, ScanoutBufferGenerator* buffer_generator)
+    : dri_(dri), buffer_generator_(buffer_generator), last_added_widget_(0) {
 }
 
 ScreenManager::~ScreenManager() {
   STLDeleteContainerPairSecondPointers(
       controllers_.begin(), controllers_.end());
 }
 
 void ScreenManager::RemoveDisplayController(uint32_t crtc, uint32_t connector) {
   HardwareDisplayControllerMap::iterator it =
       FindDisplayController(crtc, connector);
   if (it != controllers_.end()) {
     delete it->second;
     controllers_.erase(it);
   }
 }
 
 bool ScreenManager::ConfigureDisplayController(uint32_t crtc,
                                                uint32_t connector,
                                                const drmModeModeInfo& mode) {
   HardwareDisplayControllerMap::iterator it =
       FindDisplayController(crtc, connector);
   HardwareDisplayController* controller = NULL;
   if (it != controllers_.end()) {
     if (SameMode(mode, it->second->get_mode()))
       return it->second->Enable();
 
     controller = it->second;
-    controller->UnbindSurfaceFromController();
   }
 
   if (it == controllers_.end()) {
     controller = new HardwareDisplayController(dri_, connector, crtc);
     controllers_.insert(std::make_pair(++last_added_widget_, controller));
   }
 
   // Create a surface suitable for the current controller.
-  scoped_ptr<ScanoutSurface> surface(
-      surface_generator_->Create(gfx::Size(mode.hdisplay, mode.vdisplay)));
+  scoped_refptr<ScanoutBuffer> buffer =
+      buffer_generator_->Create(gfx::Size(mode.hdisplay, mode.vdisplay));
 
-  if (!surface->Initialize()) {
-    LOG(ERROR) << "Failed to initialize surface";
+  if (!buffer) {
+    LOG(ERROR) << "Failed to create scanout buffer";
     return false;
   }
 
-  // Bind the surface to the controller. This will register the backing buffers
-  // with the hardware CRTC such that we can show the buffers and performs the
-  // initial modeset. The controller takes ownership of the surface.
-  if (!controller->BindSurfaceToController(surface.Pass(), mode)) {
-    LOG(ERROR) << "Failed to bind surface to controller";
+  if (!controller->Modeset(OverlayPlane(buffer), mode)) {
+    LOG(ERROR) << "Failed to modeset controller";
     return false;
   }
 
   return true;
 }
 
 bool ScreenManager::DisableDisplayController(uint32_t crtc,
                                              uint32_t connector) {
   HardwareDisplayControllerMap::iterator it =
       FindDisplayController(crtc, connector);
@@ skipping 45 matching lines @@
     dri_->SetProperty(displays[0]->connector()->connector_id,
                       dpms->prop_id,
                       DRM_MODE_DPMS_ON);
 
   ConfigureDisplayController(displays[0]->crtc()->crtc_id,
                              displays[0]->connector()->connector_id,
                              displays[0]->connector()->modes[0]);
 }
 
 }  // namespace ui