Switch DRM platform to using a separate thread

ui/ozone/platform/drm/gpu/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/drm/gpu/gbm_surface_factory.h"
 
 #include <gbm.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/drm/gpu/drm_device_manager.h"
-#include "ui/ozone/platform/drm/gpu/drm_window.h"
+#include "ui/ozone/platform/drm/gpu/drm_thread.h"
+#include "ui/ozone/platform/drm/gpu/drm_window_proxy.h"
 #include "ui/ozone/platform/drm/gpu/gbm_buffer.h"
 #include "ui/ozone/platform/drm/gpu/gbm_device.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surface.h"
 #include "ui/ozone/platform/drm/gpu/gbm_surfaceless.h"
 #include "ui/ozone/platform/drm/gpu/hardware_display_controller.h"
+#include "ui/ozone/platform/drm/gpu/proxy_helpers.h"
 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
 #include "ui/ozone/public/native_pixmap.h"
 #include "ui/ozone/public/surface_ozone_canvas.h"
 #include "ui/ozone/public/surface_ozone_egl.h"
 
 namespace ui {
 
-GbmSurfaceFactory::GbmSurfaceFactory(bool allow_surfaceless)
-    : DrmSurfaceFactory(nullptr),
-      allow_surfaceless_(allow_surfaceless),
-      drm_device_manager_(nullptr) {}
+GbmSurfaceFactory::GbmSurfaceFactory(bool allow_surfaceless,
+                                     DrmThread* drm_thread)
+    : DrmSurfaceFactory(drm_thread), allow_surfaceless_(allow_surfaceless) {}
 
 GbmSurfaceFactory::~GbmSurfaceFactory() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-void GbmSurfaceFactory::InitializeGpu(DrmDeviceManager* drm_device_manager,
-                                      ScreenManager* screen_manager) {
-  drm_device_manager_ = drm_device_manager;
-  screen_manager_ = screen_manager;
-}
-
 intptr_t GbmSurfaceFactory::GetNativeDisplay() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return EGL_DEFAULT_DISPLAY;
 }
 
 const int32* GbmSurfaceFactory::GetEGLSurfaceProperties(
     const int32* desired_list) {
   DCHECK(thread_checker_.CalledOnValidThread());
   static const int32 kConfigAttribs[] = {EGL_BUFFER_SIZE,
                                          32,
@@ skipping 28 matching lines @@
   return nullptr;
 }
 
 scoped_ptr<SurfaceOzoneEGL> GbmSurfaceFactory::CreateEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
   DCHECK(thread_checker_.CalledOnValidThread());
   scoped_refptr<GbmDevice> gbm = GetGbmDevice(widget);
   DCHECK(gbm);
 
   scoped_ptr<GbmSurface> surface(
-      new GbmSurface(screen_manager_->GetWindow(widget), gbm));
+      new GbmSurface(drm_thread_->CreateWindowProxy(widget), gbm));
   if (!surface->Initialize())
     return nullptr;
 
   return surface.Pass();
 }
 
 scoped_ptr<SurfaceOzoneEGL>
 GbmSurfaceFactory::CreateSurfacelessEGLSurfaceForWidget(
     gfx::AcceleratedWidget widget) {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (!allow_surfaceless_)
     return nullptr;
 
-  return make_scoped_ptr(new GbmSurfaceless(screen_manager_->GetWindow(widget),
-                                            drm_device_manager_));
+  return make_scoped_ptr(
+      new GbmSurfaceless(drm_thread_->CreateWindowProxy(widget)));
 }
 
 scoped_refptr<ui::NativePixmap> GbmSurfaceFactory::CreateNativePixmap(
     gfx::AcceleratedWidget widget,
     gfx::Size size,
     gfx::BufferFormat format,
     gfx::BufferUsage usage) {
 #if !defined(OS_CHROMEOS)
   // Support for memory mapping accelerated buffers requires some
   // CrOS-specific patches (using vgem).
   DCHECK_EQ(gfx::BufferUsage::SCANOUT, usage);
 #endif
 
   scoped_refptr<GbmDevice> gbm = GetGbmDevice(widget);
   DCHECK(gbm);
 
   scoped_refptr<GbmBuffer> buffer =
       GbmBuffer::CreateBuffer(gbm, format, size, usage);
   if (!buffer.get())
     return nullptr;
 
-  scoped_refptr<GbmPixmap> pixmap(new GbmPixmap(buffer, screen_manager_));
+  scoped_refptr<GbmPixmap> pixmap(new GbmPixmap(buffer, drm_thread_));
   if (!pixmap->Initialize())
     return nullptr;
 
   return pixmap;
 }
 
 bool GbmSurfaceFactory::CanShowPrimaryPlaneAsOverlay() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return allow_surfaceless_;
 }
 
 scoped_refptr<GbmDevice> GbmSurfaceFactory::GetGbmDevice(
     gfx::AcceleratedWidget widget) {
   return static_cast<GbmDevice*>(
-      drm_device_manager_->GetDrmDevice(widget).get());
+      drm_thread_->device_manager()->GetDrmDevice(widget).get());
 }
 
 }  // namespace ui