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

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

Issue 1863113002: Wire up cursor proxy on MUS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@oxygen
Patch Set: Reparent Created 4 years, 8 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
« no previous file with comments | « ui/ozone/platform/drm/mus_thread_proxy.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_gbm.h" 5 #include "ui/ozone/platform/drm/ozone_platform_gbm.h"
6 6
7 #include <dlfcn.h> 7 #include <dlfcn.h>
8 #include <fcntl.h> 8 #include <fcntl.h>
9 #include <gbm.h> 9 #include <gbm.h>
10 #include <stdlib.h> 10 #include <stdlib.h>
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
142 #endif 142 #endif
143 event_factory_ozone_.reset(new EventFactoryEvdev( 143 event_factory_ozone_.reset(new EventFactoryEvdev(
144 cursor_.get(), device_manager_.get(), 144 cursor_.get(), device_manager_.get(),
145 KeyboardLayoutEngineManager::GetKeyboardLayoutEngine())); 145 KeyboardLayoutEngineManager::GetKeyboardLayoutEngine()));
146 146
147 GpuThreadAdapter* adapter; 147 GpuThreadAdapter* adapter;
148 if (RunningInsideMus()) { 148 if (RunningInsideMus()) {
149 gl_api_loader_.reset(new GlApiLoader()); 149 gl_api_loader_.reset(new GlApiLoader());
150 mus_thread_proxy_.reset(new MusThreadProxy()); 150 mus_thread_proxy_.reset(new MusThreadProxy());
151 adapter = mus_thread_proxy_.get(); 151 adapter = mus_thread_proxy_.get();
152 cursor_->SetDrmCursorProxy(mus_thread_proxy_.get());
152 } else { 153 } else {
153 gpu_platform_support_host_.reset( 154 gpu_platform_support_host_.reset(
154 new DrmGpuPlatformSupportHost(cursor_.get())); 155 new DrmGpuPlatformSupportHost(cursor_.get()));
155 adapter = gpu_platform_support_host_.get(); 156 adapter = gpu_platform_support_host_.get();
156 } 157 }
157 158
158 display_manager_.reset( 159 display_manager_.reset(
159 new DrmDisplayHostManager(adapter, device_manager_.get(), 160 new DrmDisplayHostManager(adapter, device_manager_.get(),
160 event_factory_ozone_->input_controller())); 161 event_factory_ozone_->input_controller()));
161 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone); 162 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
219 DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm); 220 DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
220 }; 221 };
221 222
222 } // namespace 223 } // namespace
223 224
224 OzonePlatform* CreateOzonePlatformGbm() { 225 OzonePlatform* CreateOzonePlatformGbm() {
225 return new OzonePlatformGbm; 226 return new OzonePlatformGbm;
226 } 227 }
227 228
228 } // namespace ui 229 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/mus_thread_proxy.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698