[2/4]Allow hotplugging of primary DRM device

ui/ozone/platform/drm/ozone_platform_drm.cc

 // Copyright 2013 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/ozone_platform_drm.h"
 
 #include "base/at_exit.h"
 #include "base/thread_task_runner_handle.h"
 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
 #include "ui/events/ozone/device/device_manager.h"
@@ skipping 31 matching lines @@
 
 namespace {
 
 // OzonePlatform for Linux DRM (Direct Rendering Manager)
 //
 // This platform is Linux without any display server (no X, wayland, or
 // anything). This means chrome alone owns the display and input devices.
 class OzonePlatformDrm : public OzonePlatform {
  public:
   OzonePlatformDrm()
-      : drm_(new DrmDevice(GetPrimaryDisplayCardPath())),
-        buffer_generator_(new DrmBufferGenerator()),
+      : buffer_generator_(new DrmBufferGenerator()),
         screen_manager_(new ScreenManager(buffer_generator_.get())),
         device_manager_(CreateDeviceManager()) {}
   ~OzonePlatformDrm() override {}
 
   // OzonePlatform:
   ui::SurfaceFactoryOzone* GetSurfaceFactoryOzone() override {
     return surface_factory_ozone_.get();
   }
   CursorFactoryOzone* GetCursorFactoryOzone() override {
     return cursor_factory_ozone_.get();
@@ skipping 16 matching lines @@
     scoped_ptr<DrmWindowHost> platform_window(
         new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(),
                           event_factory_ozone_.get(), cursor_.get(),
                           window_manager_.get(), display_manager_.get()));
     platform_window->Initialize();
     return platform_window.Pass();
   }
   scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
     return make_scoped_ptr(new DrmNativeDisplayDelegate(
         gpu_platform_support_host_.get(), device_manager_.get(),
-        display_manager_.get(), drm_->device_path()));
+        display_manager_.get(), GetPrimaryDisplayCardPath()));
   }
   void InitializeUI() override {
 #if defined(OS_CHROMEOS)
     gpu_lock_.reset(new GpuLock());
 #endif
-    if (!drm_->Initialize())
-      LOG(FATAL) << "Failed to initialize primary DRM device";
-
-    // This makes sure that simple targets that do not handle display
-    // configuration can still use the primary display.
-    ForceInitializationOfPrimaryDisplay(drm_, screen_manager_.get());
-    drm_device_manager_.reset(new DrmDeviceManager(drm_));
+    drm_device_manager_.reset(new DrmDeviceManager(
+        scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
     display_manager_.reset(new DisplayManager());
     window_manager_.reset(new DrmWindowHostManager());
     cursor_.reset(new DrmCursor(window_manager_.get()));
     surface_factory_ozone_.reset(new DrmSurfaceFactory(screen_manager_.get()));
     scoped_ptr<DrmGpuDisplayManager> ndd(new DrmGpuDisplayManager(
-        screen_manager_.get(), drm_,
-        scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
+        screen_manager_.get(), drm_device_manager_.get()));
     gpu_platform_support_.reset(new DrmGpuPlatformSupport(
         drm_device_manager_.get(), screen_manager_.get(), ndd.Pass()));
     gpu_platform_support_host_.reset(
         new DrmGpuPlatformSupportHost(cursor_.get()));
     cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
 #if defined(USE_XKBCOMMON)
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
         new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
 #else
     KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
         make_scoped_ptr(new StubKeyboardLayoutEngine()));
 #endif
     event_factory_ozone_.reset(new EventFactoryEvdev(
         cursor_.get(), device_manager_.get(),
         KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
 
     if (!gpu_helper_.Initialize(base::ThreadTaskRunnerHandle::Get(),
                                 base::ThreadTaskRunnerHandle::Get()))
       LOG(FATAL) << "Failed to initialize dummy channel.";
   }
 
   void InitializeGPU() override {}
 
  private:
   // Objects in the "GPU" process.
   scoped_ptr<GpuLock> gpu_lock_;
-  scoped_refptr<DrmDevice> drm_;
   scoped_ptr<DrmDeviceManager> drm_device_manager_;
   scoped_ptr<DrmBufferGenerator> buffer_generator_;
   scoped_ptr<ScreenManager> screen_manager_;
   scoped_ptr<DrmGpuPlatformSupport> gpu_platform_support_;
 
   // Objects in the "Browser" process.
   scoped_ptr<DeviceManager> device_manager_;
   scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
   scoped_ptr<DrmWindowHostManager> window_manager_;
   scoped_ptr<DrmCursor> cursor_;
@@ skipping 17 matching lines @@
 
 OzonePlatform* CreateOzonePlatformDri() {
   return new OzonePlatformDrm;
 }
 
 OzonePlatform* CreateOzonePlatformDrm() {
   return new OzonePlatformDrm;
 }
 
 }  // namespace ui