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

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 NativePixmapClient Created 5 years, 6 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"
(...skipping 10 matching lines...) Expand all
21 #include "ui/ozone/platform/drm/gpu/drm_surface_factory.h" 21 #include "ui/ozone/platform/drm/gpu/drm_surface_factory.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_overlay_manager.h" 28 #include "ui/ozone/platform/drm/host/drm_overlay_manager.h"
29 #include "ui/ozone/platform/drm/host/drm_window_host.h" 29 #include "ui/ozone/platform/drm/host/drm_window_host.h"
30 #include "ui/ozone/platform/drm/host/drm_window_host_manager.h" 30 #include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
31 #include "ui/ozone/public/native_pixmap_client.h"
31 #include "ui/ozone/public/ozone_gpu_test_helper.h" 32 #include "ui/ozone/public/ozone_gpu_test_helper.h"
32 #include "ui/ozone/public/ozone_platform.h" 33 #include "ui/ozone/public/ozone_platform.h"
33 34
34 #if defined(USE_XKBCOMMON) 35 #if defined(USE_XKBCOMMON)
35 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h" 36 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
36 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h" 37 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
37 #else 38 #else
38 #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" 39 #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
39 #endif 40 #endif
40 41
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
147 #endif 148 #endif
148 149
149 // Objects on both processes. 150 // Objects on both processes.
150 scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_; 151 scoped_ptr<DrmSurfaceFactory> surface_factory_ozone_;
151 152
152 OzoneGpuTestHelper gpu_helper_; 153 OzoneGpuTestHelper gpu_helper_;
153 154
154 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDrm); 155 DISALLOW_COPY_AND_ASSIGN(OzonePlatformDrm);
155 }; 156 };
156 157
158 class NativePixmapClientDrm : public NativePixmapClient {
159 public:
160 NativePixmapClientDrm() {}
161 ~NativePixmapClientDrm() override {}
162
163 private:
164 DISALLOW_COPY_AND_ASSIGN(NativePixmapClientDrm);
165 };
166
157 } // namespace 167 } // namespace
158 168
159 OzonePlatform* CreateOzonePlatformDri() { 169 OzonePlatform* CreateOzonePlatformDri() {
160 return new OzonePlatformDrm; 170 return new OzonePlatformDrm;
161 } 171 }
162 172
163 OzonePlatform* CreateOzonePlatformDrm() { 173 OzonePlatform* CreateOzonePlatformDrm() {
164 return new OzonePlatformDrm; 174 return new OzonePlatformDrm;
165 } 175 }
166 176
177 NativePixmapClient* CreateNativePixmapClientDri() {
178 return new NativePixmapClientDrm;
179 }
180
181 NativePixmapClient* CreateNativePixmapClientDrm() {
182 return new NativePixmapClientDrm;
183 }
184
167 } // namespace ui 185 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698