Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: ui/ozone/platform/drm/ozone_platform_drm.cc

Issue 1024083002: [Ozone-Drm] Notify cursor of channel established last (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/ozone/platform/drm/ozone_platform_drm.cc
diff --git a/ui/ozone/platform/drm/ozone_platform_drm.cc b/ui/ozone/platform/drm/ozone_platform_drm.cc
index 98bba6e59997d9612a93f9e6d9a947cc3f199a02..09c6d3aa410de6740d7de1e605dee1f791973c10 100644
--- a/ui/ozone/platform/drm/ozone_platform_drm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_drm.cc
@@ -103,6 +103,7 @@ class OzonePlatformDrm : public OzonePlatform {
ForceInitializationOfPrimaryDisplay(drm_, screen_manager_.get());
drm_device_manager_.reset(new DrmDeviceManager(drm_));
display_manager_.reset(new DisplayManager());
+ cursor_.reset(new DrmCursor(window_manager_.get()));
surface_factory_ozone_.reset(
new DrmSurfaceFactory(&window_delegate_manager_));
scoped_ptr<DrmGpuDisplayManager> ndd(new DrmGpuDisplayManager(
@@ -111,12 +112,10 @@ class OzonePlatformDrm : public OzonePlatform {
gpu_platform_support_.reset(new DrmGpuPlatformSupport(
drm_device_manager_.get(), &window_delegate_manager_,
screen_manager_.get(), ndd.Pass()));
- gpu_platform_support_host_.reset(new DrmGpuPlatformSupportHost());
+ 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_)));
@@ -148,8 +147,8 @@ class OzonePlatformDrm : public OzonePlatform {
// Objects in the "Browser" process.
scoped_ptr<DeviceManager> device_manager_;
scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
- scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
scoped_ptr<DrmCursor> cursor_;
+ scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
scoped_ptr<DrmWindowHostManager> window_manager_;
scoped_ptr<DisplayManager> display_manager_;
scoped_ptr<DrmGpuPlatformSupportHost> gpu_platform_support_host_;

Powered by Google App Engine
This is Rietveld 408576698