[Ozone-Dri] Create GbmWrapper

ui/ozone/platform/dri/gbm_surface.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/gbm_surface.h"
 
 #include <gbm.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "ui/ozone/platform/dri/dri_buffer.h"
 #include "ui/ozone/platform/dri/dri_window_delegate.h"
-#include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/gbm_buffer_base.h"
+#include "ui/ozone/platform/dri/gbm_wrapper.h"
 #include "ui/ozone/platform/dri/hardware_display_controller.h"
 #include "ui/ozone/platform/dri/scanout_buffer.h"
 
 namespace ui {
 
 namespace {
 
 class GbmSurfaceBuffer : public GbmBufferBase {
  public:
   static scoped_refptr<GbmSurfaceBuffer> CreateBuffer(DriWrapper* dri,
@@ skipping 44 matching lines @@
 }
 
 // static
 void GbmSurfaceBuffer::Destroy(gbm_bo* buffer, void* data) {
   GbmSurfaceBuffer* scoped_buffer = static_cast<GbmSurfaceBuffer*>(data);
   scoped_buffer->self_ = NULL;
 }
 
 }  // namespace
 
-GbmSurface::GbmSurface(DriWindowDelegate* window_delegate,
-                       gbm_device* device,
-                       DriWrapper* dri)
+GbmSurface::GbmSurface(DriWindowDelegate* window_delegate, GbmWrapper* gbm)
     : GbmSurfaceless(window_delegate),
-      gbm_device_(device),
-      dri_(dri),
+      gbm_(gbm),
       native_surface_(NULL),
       current_buffer_(NULL),
       weak_factory_(this) {
 }
 
 GbmSurface::~GbmSurface() {
   if (current_buffer_)
     gbm_surface_release_buffer(native_surface_, current_buffer_);
 
   if (native_surface_)
     gbm_surface_destroy(native_surface_);
 }
 
 bool GbmSurface::Initialize() {
   // If we're initializing the surface without a controller (possible on startup
   // where the surface creation can happen before the native window delegate
   // IPCs arrive), initialize the size to a valid value such that surface
   // creation doesn't fail.
   gfx::Size size(1, 1);
   if (window_delegate_->GetController()) {
     size = window_delegate_->GetController()->GetModeSize();
   }
   // TODO(dnicoara) Check underlying system support for pixel format.
-  native_surface_ =
-      gbm_surface_create(gbm_device_,
-                         size.width(),
-                         size.height(),
-                         GBM_BO_FORMAT_XRGB8888,
-                         GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
+  native_surface_ = gbm_surface_create(
+      gbm_->device(), size.width(), size.height(), GBM_BO_FORMAT_XRGB8888,
+      GBM_BO_USE_SCANOUT | GBM_BO_USE_RENDERING);
 
   if (!native_surface_)
     return false;
 
   size_ = size;
   return true;
 }
 
 intptr_t GbmSurface::GetNativeWindow() {
   DCHECK(native_surface_);
@@ skipping 11 matching lines @@
   return OnSwapBuffersAsync(base::Bind(&base::DoNothing));
 }
 
 bool GbmSurface::OnSwapBuffersAsync(const SwapCompletionCallback& callback) {
   DCHECK(native_surface_);
 
   gbm_bo* pending_buffer = gbm_surface_lock_front_buffer(native_surface_);
   scoped_refptr<GbmSurfaceBuffer> primary =
       GbmSurfaceBuffer::GetBuffer(pending_buffer);
   if (!primary.get()) {
-    primary = GbmSurfaceBuffer::CreateBuffer(dri_, pending_buffer);
+    primary = GbmSurfaceBuffer::CreateBuffer(gbm_, pending_buffer);
     if (!primary.get()) {
       LOG(ERROR) << "Failed to associate the buffer with the controller";
       callback.Run();
       return false;
     }
   }
 
   // The primary buffer is a special case.
   if (window_delegate_->GetController())
     window_delegate_->GetController()->QueueOverlayPlane(OverlayPlane(primary));
@@ skipping 12 matching lines @@
                                        gbm_bo* pending_buffer) {
   // If there was a frontbuffer, it is no longer active. Release it back to GBM.
   if (current_buffer_)
     gbm_surface_release_buffer(native_surface_, current_buffer_);
 
   current_buffer_ = pending_buffer;
   callback.Run();
 }
 
 }  // namespace ui