| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/ozone/platform/drm/ozone_platform_drm.h" | 5 #include "ui/ozone/platform/drm/ozone_platform_drm.h" |
| 6 | 6 |
| 7 #include "base/at_exit.h" | 7 #include "base/at_exit.h" |
| 8 #include "base/thread_task_runner_handle.h" | 8 #include "base/thread_task_runner_handle.h" |
| 9 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" | 9 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" |
| 10 #include "ui/events/ozone/device/device_manager.h" | 10 #include "ui/events/ozone/device/device_manager.h" |
| (...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 } | 88 } |
| 89 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { | 89 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { |
| 90 return make_scoped_ptr( | 90 return make_scoped_ptr( |
| 91 new DrmNativeDisplayDelegate(display_manager_.get())); | 91 new DrmNativeDisplayDelegate(display_manager_.get())); |
| 92 } | 92 } |
| 93 void InitializeUI() override { | 93 void InitializeUI() override { |
| 94 drm_device_manager_.reset(new DrmDeviceManager( | 94 drm_device_manager_.reset(new DrmDeviceManager( |
| 95 scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator()))); | 95 scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator()))); |
| 96 window_manager_.reset(new DrmWindowHostManager()); | 96 window_manager_.reset(new DrmWindowHostManager()); |
| 97 cursor_.reset(new DrmCursor(window_manager_.get())); | 97 cursor_.reset(new DrmCursor(window_manager_.get())); |
| 98 overlay_manager_.reset(new DrmOverlayManager(false)); | 98 overlay_manager_.reset(new DrmOverlayManager(false, nullptr)); |
| 99 surface_factory_ozone_.reset(new DrmSurfaceFactory(screen_manager_.get())); | 99 surface_factory_ozone_.reset(new DrmSurfaceFactory(screen_manager_.get())); |
| 100 scoped_ptr<DrmGpuDisplayManager> ndd(new DrmGpuDisplayManager( | 100 scoped_ptr<DrmGpuDisplayManager> ndd(new DrmGpuDisplayManager( |
| 101 screen_manager_.get(), drm_device_manager_.get())); | 101 screen_manager_.get(), drm_device_manager_.get())); |
| 102 gpu_platform_support_.reset(new DrmGpuPlatformSupport( | 102 gpu_platform_support_.reset(new DrmGpuPlatformSupport( |
| 103 drm_device_manager_.get(), screen_manager_.get(), ndd.Pass())); | 103 drm_device_manager_.get(), screen_manager_.get(), |
| 104 buffer_generator_.get(), ndd.Pass())); |
| 104 gpu_platform_support_host_.reset( | 105 gpu_platform_support_host_.reset( |
| 105 new DrmGpuPlatformSupportHost(cursor_.get())); | 106 new DrmGpuPlatformSupportHost(cursor_.get())); |
| 106 display_manager_.reset(new DrmDisplayHostManager( | 107 display_manager_.reset(new DrmDisplayHostManager( |
| 107 gpu_platform_support_host_.get(), device_manager_.get())); | 108 gpu_platform_support_host_.get(), device_manager_.get())); |
| 108 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone); | 109 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone); |
| 109 #if defined(USE_XKBCOMMON) | 110 #if defined(USE_XKBCOMMON) |
| 110 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr( | 111 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr( |
| 111 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_))); | 112 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_))); |
| 112 #else | 113 #else |
| 113 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( | 114 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 157 | 158 |
| 158 OzonePlatform* CreateOzonePlatformDri() { | 159 OzonePlatform* CreateOzonePlatformDri() { |
| 159 return new OzonePlatformDrm; | 160 return new OzonePlatformDrm; |
| 160 } | 161 } |
| 161 | 162 |
| 162 OzonePlatform* CreateOzonePlatformDrm() { | 163 OzonePlatform* CreateOzonePlatformDrm() { |
| 163 return new OzonePlatformDrm; | 164 return new OzonePlatformDrm; |
| 164 } | 165 } |
| 165 | 166 |
| 166 } // namespace ui | 167 } // namespace ui |
| OLD | NEW |