GBM Ozone implementation

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>
 
 #include "base/basictypes.h"
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/time/time.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/size.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
-#include "ui/ozone/platform/dri/dri_surface.h"
 #include "ui/ozone/platform/dri/dri_wrapper.h"
+#include "ui/ozone/platform/dri/scanout_surface.h"
 
 namespace ui {
 
 namespace {
 
 // DRM callback on page flip events. This callback is triggered after the
 // page flip has happened and the backbuffer is now the new frontbuffer
 // The old frontbuffer is no longer used by the hardware and can be used for
 // future draw operations.
 //
-// |device| will contain a reference to the |DriSurface| object which
+// |device| will contain a reference to the |ScanoutSurface| object which
 // the event belongs to.
 //
 // TODO(dnicoara) When we have a FD handler for the DRM calls in the message
 // loop, we can move this function in the handler.
 void HandlePageFlipEvent(int fd,
                          unsigned int frame,
                          unsigned int seconds,
                          unsigned int useconds,
                          void* controller) {
   TRACE_EVENT0("dri", "HandlePageFlipEvent");
@@ skipping 14 matching lines @@
       time_of_last_flip_(0) {}
 
 HardwareDisplayController::~HardwareDisplayController() {
   // Reset the cursor.
   UnsetCursor();
   UnbindSurfaceFromController();
 }
 
 bool
 HardwareDisplayController::BindSurfaceToController(
-    scoped_ptr<DriSurface> surface, drmModeModeInfo mode) {
+    scoped_ptr<ScanoutSurface> surface, drmModeModeInfo mode) {
   CHECK(surface);
 
   if (!drm_->SetCrtc(crtc_id_,
                      surface->GetFramebufferId(),
                      &connector_id_,
                      &mode)) {
     LOG(ERROR) << "Failed to modeset: error='" << strerror(errno)
                << "' crtc=" << crtc_id_ << " connector=" << connector_id_
                << " framebuffer_id=" << surface->GetFramebufferId()
                << " mode=" << mode.hdisplay << "x" << mode.vdisplay << "@"
@@ skipping 10 matching lines @@
   drm_->SetCrtc(crtc_id_, 0, 0, NULL);
   surface_.reset();
 }
 
 void HardwareDisplayController::Disable() {
   UnbindSurfaceFromController();
 }
 
 bool HardwareDisplayController::SchedulePageFlip() {
   CHECK(surface_);
-
   if (!drm_->PageFlip(crtc_id_,
                       surface_->GetFramebufferId(),
                       this)) {
     LOG(ERROR) << "Cannot page flip: " << strerror(errno);
     return false;
   }
 
   return true;
 }
 
@@ skipping 12 matching lines @@
 void HardwareDisplayController::OnPageFlipEvent(unsigned int frame,
                                                 unsigned int seconds,
                                                 unsigned int useconds) {
   time_of_last_flip_ =
       static_cast<uint64_t>(seconds) * base::Time::kMicrosecondsPerSecond +
       useconds;
 
   surface_->SwapBuffers();
 }
 
-bool HardwareDisplayController::SetCursor(DriSurface* surface) {
+bool HardwareDisplayController::SetCursor(ScanoutSurface* surface) {
   bool ret = drm_->SetCursor(crtc_id_,
                          surface->GetHandle(),
-                         surface->size().width(),
-                         surface->size().height());
+                         surface->Size().width(),
+                         surface->Size().height());
   surface->SwapBuffers();
   return ret;
 }
 
 bool HardwareDisplayController::UnsetCursor() {
   return drm_->SetCursor(crtc_id_, 0, 0, 0);
 }
 
 bool HardwareDisplayController::MoveCursor(const gfx::Point& location) {
   return drm_->MoveCursor(crtc_id_, location.x(), location.y());
 }
 
 }  // namespace ui