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

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

Issue 2920613002: ozone: fix broken overlay promotion bug at start-up time. (Closed)
Patch Set: move to GpuConfiguredDisplay Created 3 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
« no previous file with comments | « ui/ozone/platform/drm/host/drm_display_host_manager.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 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
184 mus_thread_proxy_.reset(new MusThreadProxy()); 184 mus_thread_proxy_.reset(new MusThreadProxy());
185 adapter = mus_thread_proxy_.get(); 185 adapter = mus_thread_proxy_.get();
186 cursor_->SetDrmCursorProxy( 186 cursor_->SetDrmCursorProxy(
187 new CursorProxyThread(mus_thread_proxy_.get())); 187 new CursorProxyThread(mus_thread_proxy_.get()));
188 } else { 188 } else {
189 gpu_platform_support_host_.reset( 189 gpu_platform_support_host_.reset(
190 new DrmGpuPlatformSupportHost(cursor_.get())); 190 new DrmGpuPlatformSupportHost(cursor_.get()));
191 adapter = gpu_platform_support_host_.get(); 191 adapter = gpu_platform_support_host_.get();
192 } 192 }
193 193
194 display_manager_.reset(
195 new DrmDisplayHostManager(adapter, device_manager_.get(),
196 event_factory_ozone_->input_controller()));
197 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
198 overlay_manager_.reset( 194 overlay_manager_.reset(
199 new DrmOverlayManager(adapter, window_manager_.get())); 195 new DrmOverlayManager(adapter, window_manager_.get()));
196 display_manager_.reset(new DrmDisplayHostManager(
197 adapter, device_manager_.get(), overlay_manager_.get(),
198 event_factory_ozone_->input_controller()));
199 cursor_factory_ozone_.reset(new BitmapCursorFactoryOzone);
200 200
201 if (using_mojo_ || single_process_) { 201 if (using_mojo_ || single_process_) {
202 mus_thread_proxy_->ProvideManagers(display_manager_.get(), 202 mus_thread_proxy_->ProvideManagers(display_manager_.get(),
203 overlay_manager_.get()); 203 overlay_manager_.get());
204 } 204 }
205 } 205 }
206 void InitializeGPU(const InitParams& args) override { 206 void InitializeGPU(const InitParams& args) override {
207 // TODO(rjkroege): services/ui should initialize this with a connector. 207 // TODO(rjkroege): services/ui should initialize this with a connector.
208 // However, in-progress refactorings in services/ui make it difficult to 208 // However, in-progress refactorings in services/ui make it difficult to
209 // require this at present. Set using_mojo_ like below once this is 209 // require this at present. Set using_mojo_ like below once this is
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm); 269 DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm);
270 }; 270 };
271 271
272 } // namespace 272 } // namespace
273 273
274 OzonePlatform* CreateOzonePlatformGbm() { 274 OzonePlatform* CreateOzonePlatformGbm() {
275 return new OzonePlatformGbm; 275 return new OzonePlatformGbm;
276 } 276 }
277 277
278 } // namespace ui 278 } // namespace ui
OLDNEW
« no previous file with comments | « ui/ozone/platform/drm/host/drm_display_host_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698