[Ozone-Dri] Create GbmWrapper

ui/ozone/platform/dri/gbm_surface_factory.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_factory.h"
 
 #include <gbm.h>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "third_party/khronos/EGL/egl.h"
 #include "ui/ozone/common/egl_util.h"
 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h"
 #include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
-#include "ui/ozone/platform/dri/dri_wrapper.h"
 #include "ui/ozone/platform/dri/gbm_buffer.h"
 #include "ui/ozone/platform/dri/gbm_surface.h"
 #include "ui/ozone/platform/dri/gbm_surfaceless.h"
+#include "ui/ozone/platform/dri/gbm_wrapper.h"
 #include "ui/ozone/platform/dri/screen_manager.h"
 #include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/overlay_candidates_ozone.h"
 #include "ui/ozone/public/ozone_switches.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 namespace {
 
 class SingleOverlay : public OverlayCandidatesOzone {
@@ skipping 33 matching lines @@
     }
   }
 
   DISALLOW_COPY_AND_ASSIGN(SingleOverlay);
 };
 
 }  // namespace
 
 GbmSurfaceFactory::GbmSurfaceFactory(bool allow_surfaceless)
     : DriSurfaceFactory(NULL, NULL),
-      device_(NULL),
       allow_surfaceless_(allow_surfaceless) {
 }
 
 GbmSurfaceFactory::~GbmSurfaceFactory() {}
 
 void GbmSurfaceFactory::InitializeGpu(
-    DriWrapper* dri,
-    gbm_device* device,
+    GbmWrapper* gbm,
     ScreenManager* screen_manager,
     DriWindowDelegateManager* window_manager) {
-  drm_ = dri;
-  device_ = device;
+  gbm_ = gbm;
   screen_manager_ = screen_manager;
   window_manager_ = window_manager;
 }
 
 intptr_t GbmSurfaceFactory::GetNativeDisplay() {
 #if defined(USE_MESA_PLATFORM_NULL)
   return EGL_DEFAULT_DISPLAY;
 #else
-  return reinterpret_cast<intptr_t>(device_);
+  DCHECK(gbm_);
+  return reinterpret_cast<intptr_t>(gbm_->device());
 #endif
 }
 
 int GbmSurfaceFactory::GetDrmFd() {
-  DCHECK(drm_);
-  return drm_->get_fd();
+  DCHECK(gbm_);
+  return gbm_->get_fd();
 }
 
 const int32* GbmSurfaceFactory::GetEGLSurfaceProperties(
     const int32* desired_list) {
   static const int32 kConfigAttribs[] = {
     EGL_BUFFER_SIZE, 32,
     EGL_ALPHA_SIZE, 8,
     EGL_BLUE_SIZE, 8,
     EGL_GREEN_SIZE, 8,
     EGL_RED_SIZE, 8,
     EGL_RENDERABLE_TYPE, EGL_OPENGL_ES2_BIT,
     EGL_SURFACE_TYPE, EGL_WINDOW_BIT,
     EGL_NONE
   };
 
   return kConfigAttribs;
 }
 
 bool GbmSurfaceFactory::LoadEGLGLES2Bindings(
       AddGLLibraryCallback add_gl_library,
       SetGLGetProcAddressProcCallback set_gl_get_proc_address) {
   return LoadDefaultEGLGLES2Bindings(add_gl_library, set_gl_get_proc_address);
 }
 
 scoped_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
   DriWindowDelegate* delegate = GetOrCreateWindowDelegate(widget);
 
-  scoped_ptr<GbmSurface> surface(new GbmSurface(delegate, device_, drm_));
+  scoped_ptr<GbmSurface> surface(new GbmSurface(delegate, gbm_));
   if (!surface->Initialize())
     return nullptr;
 
   return surface.Pass();
 }
 
 scoped_ptr<SurfaceOzoneEGL>
 GbmSurfaceFactory::CreateSurfacelessEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
   if (!allow_surfaceless_)
     return scoped_ptr<SurfaceOzoneEGL>();
 
   DriWindowDelegate* delegate = GetOrCreateWindowDelegate(widget);
   return scoped_ptr<SurfaceOzoneEGL>(new GbmSurfaceless(delegate));
 }
 
 scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmap(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
     BufferFormat format,
     BufferUsage usage) {
   if (usage == MAP)
     return NULL;
 
   scoped_refptr<GbmBuffer> buffer =
-      GbmBuffer::CreateBuffer(drm_, device_, format, size, true);
+      GbmBuffer::CreateBuffer(gbm_, format, size, true);
   if (!buffer.get())
     return NULL;
 
   scoped_refptr<GbmPixmap> pixmap(new GbmPixmap(buffer));
-  if (!pixmap->Initialize(drm_))
+  if (!pixmap->Initialize(gbm_))
     return NULL;
 
   return pixmap;
 }
 
 OverlayCandidatesOzone* GbmSurfaceFactory::GetOverlayCandidates(
     gfx::AcceleratedWidget w) {
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kOzoneTestSingleOverlaySupport))
     return new SingleOverlay();
@@ skipping 37 matching lines @@
       return true;
   }
   NOTREACHED();
   return false;
 }
 
 DriWindowDelegate* GbmSurfaceFactory::GetOrCreateWindowDelegate(
     gfx::AcceleratedWidget widget) {
   if (!window_manager_->HasWindowDelegate(widget)) {
     scoped_ptr<DriWindowDelegate> delegate(new DriWindowDelegateImpl(
-        widget, drm_, window_manager_, screen_manager_));
+        widget, gbm_, window_manager_, screen_manager_));
     delegate->Initialize();
     window_manager_->AddWindowDelegate(widget, delegate.Pass());
   }
 
   return window_manager_->GetWindowDelegate(widget);
 }
 
 }  // namespace ui