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

Side by Side Diff: ui/ozone/platform/dri/ozone_platform_dri.cc

Issue 611423002: [WIP][Ozone] Support external touchscreens (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@ozone-touchscreen
Patch Set: . Created 6 years, 2 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 unified diff | Download patch
OLDNEW
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/dri/ozone_platform_dri.h" 5 #include "ui/ozone/platform/dri/ozone_platform_dri.h"
6 6
7 #include "base/at_exit.h" 7 #include "base/at_exit.h"
8 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" 8 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
9 #include "ui/events/ozone/device/device_manager.h" 9 #include "ui/events/ozone/device/device_manager.h"
10 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" 10 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
11 #include "ui/events/ozone/evdev/event_factory_evdev.h" 11 #include "ui/events/ozone/evdev/event_factory_evdev.h"
12 #include "ui/ozone/platform/dri/display_manager.h"
12 #include "ui/ozone/platform/dri/dri_buffer.h" 13 #include "ui/ozone/platform/dri/dri_buffer.h"
13 #include "ui/ozone/platform/dri/dri_cursor.h" 14 #include "ui/ozone/platform/dri/dri_cursor.h"
14 #include "ui/ozone/platform/dri/dri_gpu_platform_support.h" 15 #include "ui/ozone/platform/dri/dri_gpu_platform_support.h"
15 #include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h" 16 #include "ui/ozone/platform/dri/dri_gpu_platform_support_host.h"
16 #include "ui/ozone/platform/dri/dri_surface_factory.h" 17 #include "ui/ozone/platform/dri/dri_surface_factory.h"
17 #include "ui/ozone/platform/dri/dri_window.h" 18 #include "ui/ozone/platform/dri/dri_window.h"
18 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h" 19 #include "ui/ozone/platform/dri/dri_window_delegate_impl.h"
19 #include "ui/ozone/platform/dri/dri_window_delegate_manager.h" 20 #include "ui/ozone/platform/dri/dri_window_delegate_manager.h"
20 #include "ui/ozone/platform/dri/dri_window_manager.h" 21 #include "ui/ozone/platform/dri/dri_window_manager.h"
21 #include "ui/ozone/platform/dri/dri_wrapper.h" 22 #include "ui/ozone/platform/dri/dri_wrapper.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
63 return gpu_platform_support_host_.get(); 64 return gpu_platform_support_host_.get();
64 } 65 }
65 virtual scoped_ptr<PlatformWindow> CreatePlatformWindow( 66 virtual scoped_ptr<PlatformWindow> CreatePlatformWindow(
66 PlatformWindowDelegate* delegate, 67 PlatformWindowDelegate* delegate,
67 const gfx::Rect& bounds) override { 68 const gfx::Rect& bounds) override {
68 scoped_ptr<DriWindow> platform_window( 69 scoped_ptr<DriWindow> platform_window(
69 new DriWindow(delegate, 70 new DriWindow(delegate,
70 bounds, 71 bounds,
71 gpu_platform_support_host_.get(), 72 gpu_platform_support_host_.get(),
72 event_factory_ozone_.get(), 73 event_factory_ozone_.get(),
73 window_manager_.get())); 74 window_manager_.get(),
75 display_manager_.get()));
74 platform_window->Initialize(); 76 platform_window->Initialize();
75 return platform_window.Pass(); 77 return platform_window.Pass();
76 } 78 }
77 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() 79 virtual scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate()
78 override { 80 override {
79 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateDri( 81 return scoped_ptr<NativeDisplayDelegate>(new NativeDisplayDelegateDri(
80 dri_.get(), screen_manager_.get(), device_manager_.get())); 82 dri_.get(), screen_manager_.get(), device_manager_.get()));
81 } 83 }
82 virtual void InitializeUI() override { 84 virtual void InitializeUI() override {
83 dri_->Initialize(); 85 dri_->Initialize();
86 display_manager_.reset(new DisplayManager());
84 surface_factory_ozone_.reset(new DriSurfaceFactory( 87 surface_factory_ozone_.reset(new DriSurfaceFactory(
85 dri_.get(), screen_manager_.get(), &window_delegate_manager_)); 88 dri_.get(), screen_manager_.get(), &window_delegate_manager_));
86 gpu_platform_support_.reset( 89 gpu_platform_support_.reset(
87 new DriGpuPlatformSupport(surface_factory_ozone_.get(), 90 new DriGpuPlatformSupport(surface_factory_ozone_.get(),
88 &window_delegate_manager_, 91 &window_delegate_manager_,
89 screen_manager_.get(), 92 screen_manager_.get(),
90 scoped_ptr<NativeDisplayDelegateDri>())); 93 scoped_ptr<NativeDisplayDelegateDri>()));
91 gpu_platform_support_host_.reset(new DriGpuPlatformSupportHost()); 94 gpu_platform_support_host_.reset(new DriGpuPlatformSupportHost());
92 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone); 95 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
93 window_manager_.reset(new DriWindowManager(surface_factory_ozone_.get())); 96 window_manager_.reset(new DriWindowManager(surface_factory_ozone_.get()));
(...skipping 14 matching lines...) Expand all
108 scoped_ptr<DriWrapper> dri_; 111 scoped_ptr<DriWrapper> dri_;
109 scoped_ptr<DriBufferGenerator> buffer_generator_; 112 scoped_ptr<DriBufferGenerator> buffer_generator_;
110 scoped_ptr<ScreenManager> screen_manager_; 113 scoped_ptr<ScreenManager> screen_manager_;
111 scoped_ptr<DeviceManager> device_manager_; 114 scoped_ptr<DeviceManager> device_manager_;
112 115
113 scoped_ptr<DriSurfaceFactory> surface_factory_ozone_; 116 scoped_ptr<DriSurfaceFactory> surface_factory_ozone_;
114 scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_; 117 scoped_ptr<BitmapCursorFactoryOzone> cursor_factory_ozone_;
115 scoped_ptr<EventFactoryEvdev> event_factory_ozone_; 118 scoped_ptr<EventFactoryEvdev> event_factory_ozone_;
116 119
117 scoped_ptr<DriWindowManager> window_manager_; 120 scoped_ptr<DriWindowManager> window_manager_;
121 scoped_ptr<DisplayManager> display_manager_;
118 122
119 scoped_ptr<DriGpuPlatformSupport> gpu_platform_support_; 123 scoped_ptr<DriGpuPlatformSupport> gpu_platform_support_;
120 scoped_ptr<DriGpuPlatformSupportHost> gpu_platform_support_host_; 124 scoped_ptr<DriGpuPlatformSupportHost> gpu_platform_support_host_;
121 125
122 DriWindowDelegateManager window_delegate_manager_; 126 DriWindowDelegateManager window_delegate_manager_;
123 127
124 UiThreadGpu ui_thread_gpu_; 128 UiThreadGpu ui_thread_gpu_;
125 129
126 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri); 130 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDri);
127 }; 131 };
128 132
129 } // namespace 133 } // namespace
130 134
131 OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; } 135 OzonePlatform* CreateOzonePlatformDri() { return new OzonePlatformDri; }
132 136
133 } // namespace ui 137 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/dri/native_display_delegate_proxy.cc ('k') | ui/ozone/platform/dri/ozone_platform_gbm.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698