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

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: NativePixmapManager is singleton Created 5 years, 5 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/file_descriptor_posix.h"
8 #include "base/thread_task_runner_handle.h" 9 #include "base/thread_task_runner_handle.h"
9 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h" 10 #include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
10 #include "ui/events/ozone/device/device_manager.h" 11 #include "ui/events/ozone/device/device_manager.h"
11 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h" 12 #include "ui/events/ozone/evdev/cursor_delegate_evdev.h"
12 #include "ui/events/ozone/evdev/event_factory_evdev.h" 13 #include "ui/events/ozone/evdev/event_factory_evdev.h"
13 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h" 14 #include "ui/events/ozone/layout/keyboard_layout_engine_manager.h"
14 #include "ui/ozone/platform/drm/common/drm_util.h" 15 #include "ui/ozone/platform/drm/common/drm_util.h"
15 #include "ui/ozone/platform/drm/gpu/drm_buffer.h" 16 #include "ui/ozone/platform/drm/gpu/drm_buffer.h"
16 #include "ui/ozone/platform/drm/gpu/drm_device.h" 17 #include "ui/ozone/platform/drm/gpu/drm_device.h"
17 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h" 18 #include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
18 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h" 19 #include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
19 #include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h" 20 #include "ui/ozone/platform/drm/gpu/drm_gpu_display_manager.h"
20 #include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h" 21 #include "ui/ozone/platform/drm/gpu/drm_gpu_platform_support.h"
21 #include "ui/ozone/platform/drm/gpu/drm_surface_factory.h" 22 #include "ui/ozone/platform/drm/gpu/drm_surface_factory.h"
22 #include "ui/ozone/platform/drm/gpu/drm_window.h" 23 #include "ui/ozone/platform/drm/gpu/drm_window.h"
23 #include "ui/ozone/platform/drm/gpu/screen_manager.h" 24 #include "ui/ozone/platform/drm/gpu/screen_manager.h"
24 #include "ui/ozone/platform/drm/host/drm_cursor.h" 25 #include "ui/ozone/platform/drm/host/drm_cursor.h"
25 #include "ui/ozone/platform/drm/host/drm_display_host_manager.h" 26 #include "ui/ozone/platform/drm/host/drm_display_host_manager.h"
26 #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h" 27 #include "ui/ozone/platform/drm/host/drm_gpu_platform_support_host.h"
27 #include "ui/ozone/platform/drm/host/drm_native_display_delegate.h" 28 #include "ui/ozone/platform/drm/host/drm_native_display_delegate.h"
28 #include "ui/ozone/platform/drm/host/drm_overlay_manager.h" 29 #include "ui/ozone/platform/drm/host/drm_overlay_manager.h"
29 #include "ui/ozone/platform/drm/host/drm_window_host.h" 30 #include "ui/ozone/platform/drm/host/drm_window_host.h"
30 #include "ui/ozone/platform/drm/host/drm_window_host_manager.h" 31 #include "ui/ozone/platform/drm/host/drm_window_host_manager.h"
32 #include "ui/ozone/public/native_pixmap_manager.h"
31 #include "ui/ozone/public/ozone_gpu_test_helper.h" 33 #include "ui/ozone/public/ozone_gpu_test_helper.h"
32 #include "ui/ozone/public/ozone_platform.h" 34 #include "ui/ozone/public/ozone_platform.h"
33 35
34 #if defined(USE_XKBCOMMON) 36 #if defined(USE_XKBCOMMON)
35 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h" 37 #include "ui/events/ozone/layout/xkb/xkb_evdev_codes.h"
36 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h" 38 #include "ui/events/ozone/layout/xkb/xkb_keyboard_layout_engine.h"
37 #else 39 #else
38 #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h" 40 #include "ui/events/ozone/layout/stub/stub_keyboard_layout_engine.h"
39 #endif 41 #endif
40 42
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(), 85 new DrmWindowHost(delegate, bounds, gpu_platform_support_host_.get(),
84 event_factory_ozone_.get(), cursor_.get(), 86 event_factory_ozone_.get(), cursor_.get(),
85 window_manager_.get(), display_manager_.get())); 87 window_manager_.get(), display_manager_.get()));
86 platform_window->Initialize(); 88 platform_window->Initialize();
87 return platform_window.Pass(); 89 return platform_window.Pass();
88 } 90 }
89 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override { 91 scoped_ptr<NativeDisplayDelegate> CreateNativeDisplayDelegate() override {
90 return make_scoped_ptr( 92 return make_scoped_ptr(
91 new DrmNativeDisplayDelegate(display_manager_.get())); 93 new DrmNativeDisplayDelegate(display_manager_.get()));
92 } 94 }
95 base::FileDescriptor GetVirtualDeviceFd() override {
96 return base::FileDescriptor();
97 }
93 void InitializeUI() override { 98 void InitializeUI() override {
94 drm_device_manager_.reset(new DrmDeviceManager( 99 drm_device_manager_.reset(new DrmDeviceManager(
95 scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator()))); 100 scoped_ptr<DrmDeviceGenerator>(new DrmDeviceGenerator())));
96 window_manager_.reset(new DrmWindowHostManager()); 101 window_manager_.reset(new DrmWindowHostManager());
97 cursor_.reset(new DrmCursor(window_manager_.get())); 102 cursor_.reset(new DrmCursor(window_manager_.get()));
98 #if defined(USE_XKBCOMMON) 103 #if defined(USE_XKBCOMMON)
99 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr( 104 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(make_scoped_ptr(
100 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_))); 105 new XkbKeyboardLayoutEngine(xkb_evdev_code_converter_)));
101 #else 106 #else
102 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine( 107 KeyboardLayoutEngineManager::SetKeyboardLayoutEngine(
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 } // namespace 163 } // namespace
159 164
160 OzonePlatform* CreateOzonePlatformDri() { 165 OzonePlatform* CreateOzonePlatformDri() {
161 return new OzonePlatformDrm; 166 return new OzonePlatformDrm;
162 } 167 }
163 168
164 OzonePlatform* CreateOzonePlatformDrm() { 169 OzonePlatform* CreateOzonePlatformDrm() {
165 return new OzonePlatformDrm; 170 return new OzonePlatformDrm;
166 } 171 }
167 172
173 NativePixmapManager* CreateNativePixmapManagerDri() {
174 return CreateStubNativePixmapManager();
175 }
176
177 NativePixmapManager* CreateNativePixmapManagerDrm() {
178 return CreateStubNativePixmapManager();
179 }
180
168 } // namespace ui 181 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698