[Ozone-Dri] Rename DriWrapper to DrmDevice

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/drm_device_manager.h"
 #include "ui/ozone/platform/dri/gbm_buffer.h"
+#include "ui/ozone/platform/dri/gbm_device.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/hardware_display_controller.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_canvas.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 namespace {
 
@@ skipping 56 matching lines @@
 #if defined(USE_MESA_PLATFORM_NULL)
   return EGL_DEFAULT_DISPLAY;
 #else
   scoped_refptr<GbmWrapper> gbm = GetGbmDevice(gfx::kNullAcceleratedWidget);
   DCHECK(gbm);
   return reinterpret_cast<intptr_t>(gbm->device());
 #endif
 }
 
 int GbmSurfaceFactory::GetDrmFd() {
-  scoped_refptr<GbmWrapper> gbm = GetGbmDevice(gfx::kNullAcceleratedWidget);
+  scoped_refptr<GbmDevice> gbm = GetGbmDevice(gfx::kNullAcceleratedWidget);
   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,
@@ skipping 14 matching lines @@
 }
 
 scoped_ptr<SurfaceOzoneCanvas> GbmSurfaceFactory::CreateCanvasForWidget(
     gfx::AcceleratedWidget widget) {
   LOG(FATAL) << "Software rendering mode is not supported with GBM platform";
   return nullptr;
 }
 
 scoped_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
-  scoped_refptr<GbmWrapper> gbm = GetGbmDevice(widget);
+  scoped_refptr<GbmDevice> gbm = GetGbmDevice(widget);
   DCHECK(gbm);
 
   scoped_ptr<GbmSurface> surface(
       new GbmSurface(window_manager_->GetWindowDelegate(widget), gbm));
   if (!surface->Initialize())
     return nullptr;
 
   return surface.Pass();
 }
 
 scoped_ptr<SurfaceOzoneEGL>
 GbmSurfaceFactory::CreateSurfacelessEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
   if (!allow_surfaceless_)
     return nullptr;
 
   return make_scoped_ptr(new GbmSurfaceless(
       window_manager_->GetWindowDelegate(widget), drm_device_manager_));
 }
 
 scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmap(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
     BufferFormat format,
     BufferUsage usage) {
   if (usage == MAP)
     return nullptr;
 
-  scoped_refptr<GbmWrapper> gbm = GetGbmDevice(widget);
+  scoped_refptr<GbmDevice> gbm = GetGbmDevice(widget);
   DCHECK(gbm);
 
   scoped_refptr<GbmBuffer> buffer =
       GbmBuffer::CreateBuffer(gbm, format, size, true);
   if (!buffer.get())
     return nullptr;
 
   scoped_refptr<GbmPixmap> pixmap(new GbmPixmap(buffer));
   if (!pixmap->Initialize())
     return nullptr;
@@ skipping 42 matching lines @@
   switch (usage) {
     case MAP:
       return false;
     case SCANOUT:
       return true;
   }
   NOTREACHED();
   return false;
 }
 
-scoped_refptr<GbmWrapper> GbmSurfaceFactory::GetGbmDevice(
+scoped_refptr<GbmDevice> GbmSurfaceFactory::GetGbmDevice(
     gfx::AcceleratedWidget widget) {
-  return static_cast<GbmWrapper*>(
+  return static_cast<GbmDevice*>(
       drm_device_manager_->GetDrmDevice(widget).get());
 }
 
 }  // namespace ui