| OLD | NEW |
| 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 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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() override { | 206 void InitializeGPU() override { |
| 207 InitParams default_params; | 207 InitParams default_params; |
| 208 InitializeGPU(default_params); | 208 InitializeGPU(default_params); |
| 209 } | 209 } |
| 210 void InitializeGPU(const InitParams& args) override { | 210 void InitializeGPU(const InitParams& args) override { |
| 211 // TODO(rjkroege): services/ui should initalize this with a connector. | 211 // TODO(rjkroege): services/ui should initialize this with a connector. |
| 212 // However, in-progress refactorings in services/ui make it difficult to | 212 // However, in-progress refactorings in services/ui make it difficult to |
| 213 // require this at present. Set using_mojo_ like below once this is | 213 // require this at present. Set using_mojo_ like below once this is |
| 214 // complete. | 214 // complete. |
| 215 // using_mojo_ = args.connector != nullptr; | 215 // using_mojo_ = args.connector != nullptr; |
| 216 | 216 |
| 217 InterThreadMessagingProxy* itmp; | 217 InterThreadMessagingProxy* itmp; |
| 218 if (using_mojo_ || single_process_) { | 218 if (using_mojo_ || single_process_) { |
| 219 itmp = mus_thread_proxy_.get(); | 219 itmp = mus_thread_proxy_.get(); |
| 220 } else { | 220 } else { |
| 221 gl_api_loader_.reset(new GlApiLoader()); | 221 gl_api_loader_.reset(new GlApiLoader()); |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 267 DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm); | 267 DISALLOW_COPY_AND_ASSIGN(OzonePlatformGbm); |
| 268 }; | 268 }; |
| 269 | 269 |
| 270 } // namespace | 270 } // namespace |
| 271 | 271 |
| 272 OzonePlatform* CreateOzonePlatformGbm() { | 272 OzonePlatform* CreateOzonePlatformGbm() { |
| 273 return new OzonePlatformGbm; | 273 return new OzonePlatformGbm; |
| 274 } | 274 } |
| 275 | 275 |
| 276 } // namespace ui | 276 } // namespace ui |
| OLD | NEW |