| Index: ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| index 370e5b44acae7a0546c463fd37e4b4209050b2b8..a4ad4cfcc72544ce455ed685916bdf535cde2a6c 100644
|
| --- a/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| +++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
|
| @@ -154,12 +154,11 @@ class OzonePlatformGbm : public OzonePlatform {
|
| if (!surface_factory_ozone_)
|
| surface_factory_ozone_.reset(new GbmSurfaceFactory(use_surfaceless_));
|
| device_manager_ = CreateDeviceManager();
|
| - gpu_platform_support_host_.reset(new DrmGpuPlatformSupportHost());
|
| + cursor_.reset(new DrmCursor(window_manager_.get()));
|
| + gpu_platform_support_host_.reset(
|
| + new DrmGpuPlatformSupportHost(cursor_.get()));
|
| window_manager_.reset(new DrmWindowHostManager());
|
| cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
|
| - cursor_.reset(
|
| - new DrmCursor(window_manager_.get(), gpu_platform_support_host_.get()));
|
| - cursor_->Init();
|
| #if defined(USE_XKBCOMMON)
|
| KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
|
| new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
|
| @@ -218,13 +217,13 @@ class OzonePlatformGbm : public OzonePlatform {
|
| scoped_ptr<DrmGpuPlatformSupport> gpu_platform_support_;
|
| scoped_ptr<DrmWindowManager> window_delegate_manager_;
|
|
|
| - // Obejcts in the Browser process.
|
| + // Objects in the Browser process.
|
| base::FilePath primary_graphics_card_path_;
|
| scoped_ptr<DeviceManager> device_manager_;
|
| scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
|
| + scoped_ptr<DrmCursor> cursor_;
|
| scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
|
| scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_;
|
| - scoped_ptr<DrmCursor> cursor_;
|
| scoped_ptr<DrmWindowHostManager> window_manager_;
|
| scoped_ptr<DisplayManager> display_manager_;
|
|
|
|
|