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

Side by Side Diff: ui/ozone/platform/drm/ozone_platform_drm.cc

Issue 1128113011: ozone: Introduce ClientPixmap and ClientPixmapFactory for non-GPU processes. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Introduce OzoneClient Created 5 years, 7 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/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"
11 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" 11 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
12 #include "ui/events/ozone/evdev/event_factory_evdev.h" 12 #include "ui/events/ozone/evdev/event_factory_evdev.h"
13 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" 13 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
14 #include "ui/ozone/platform/drm/common/drm_util.h" 14 #include "ui/ozone/platform/drm/common/drm_util.h"
15 #include "ui/ozone/platform/drm/drm_surface_factory.h" 15 #include "ui/ozone/platform/drm/drm_surface_factory.h"
16 #include "ui/ozone/platform/drm/gpu/drm_buffer.h" 16 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
17 #include "ui/ozone/platform/drm/gpu/drm_device.h" 17 #include "ui/ozone/platform/drm/gpu/drm_device.h"
18 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h" 18 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
19 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h" 19 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
20 #include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h" 20 #include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
21 #include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h" 21 #include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
22 #include "ui/ozone/platform/drm/gpu/drm_window.h" 22 #include "ui/ozone/platform/drm/gpu/drm_window.h"
23 #include "ui/ozone/platform/drm/gpu/screen_manager.h" 23 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
24 #include "ui/ozone/platform/drm/host/drm_cursor.h" 24 #include "ui/ozone/platform/drm/host/drm_cursor.h"
25 #include "ui/ozone/platform/drm/host/drm_display_host_manager.h" 25 #include "ui/ozone/platform/drm/host/drm_display_host_manager.h"
26 #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h" 26 #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
27 #include "ui/ozone/platform/drm/host/drm_native_display_delegate.h" 27 #include "ui/ozone/platform/drm/host/drm_native_display_delegate.h"
28 #include "ui/ozone/platform/drm/host/drm_window_host.h" 28 #include "ui/ozone/platform/drm/host/drm_window_host.h"
29 #include "ui/ozone/platform/drm/host/drm_window_host_manager.h" 29 #include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
30 #include "ui/ozone/public/ozone_client.h"
30 #include "ui/ozone/public/ozone_gpu_test_helper.h" 31 #include "ui/ozone/public/ozone_gpu_test_helper.h"
31 #include "ui/ozone/public/ozone_platform.h" 32 #include "ui/ozone/public/ozone_platform.h"
33 #include "ui/ozone/public/surface_client_factory_ozone.h"
32 34
33 #if defined(USE_XKBCOMMON) 35 #if defined(USE_XKBCOMMON)
34 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h" 36 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
35 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h" 37 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
36 #else 38 #else
37 #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" 39 #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
38 #endif 40 #endif
39 41
40 namespace ui { 42 namespace ui {
41 43
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 #endif 142 #endif
141 143
142 // Objects on both processes. 144 // Objects on both processes.
143 scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_; 145 scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_;
144 146
145 OzoneGpuTestHelper gpu_helper_; 147 OzoneGpuTestHelper gpu_helper_;
146 148
147 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDrm); 149 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDrm);
148 }; 150 };
149 151
152 class OzoneClientDrm : public OzoneClient {
153 public:
154 OzoneClientDrm() {}
155 ~OzoneClientDrm() override {}
156
157 // OzoneClient:
158 SurfaceClientFactoryOzone* GetSurfaceClientFactoryOzone() override {
159 return surface_client_.get();
160 }
161
162 void InitializeUI() override {
163 if (!surface_client_)
164 surface_client_.reset(new SurfaceClientFactoryOzone);
165 }
166
167 void InitializeRenderer() override {
168 if (!surface_client_)
169 surface_client_.reset(new SurfaceClientFactoryOzone);
170 }
171
172 private:
173 scoped_ptr<SurfaceClientFactoryOzone> surface_client_;
174
175 DISALLOW_COPY_AND_ASSIGN(OzoneClientDrm);
176 };
177
150 } // namespace 178 } // namespace
151 179
152 OzonePlatform* CreateOzonePlatformDri() { 180 OzonePlatform* CreateOzonePlatformDri() {
153 return new OzonePlatformDrm; 181 return new OzonePlatformDrm;
154 } 182 }
155 183
156 OzonePlatform* CreateOzonePlatformDrm() { 184 OzonePlatform* CreateOzonePlatformDrm() {
157 return new OzonePlatformDrm; 185 return new OzonePlatformDrm;
158 } 186 }
159 187
188 OzoneClient* CreateOzoneClientDri() {
189 return new OzoneClientDrm;
190 }
191
192 OzoneClient* CreateOzoneClientDrm() {
193 return new OzoneClientDrm;
194 }
195
160 } // namespace ui 196 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698