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 "content/browser/compositor/gpu_process_transport_factory.h" | 5 #include "content/browser/compositor/gpu_process_transport_factory.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
263 } | 263 } |
264 #elif defined(OS_ANDROID) | 264 #elif defined(OS_ANDROID) |
265 validator.reset( | 265 validator.reset( |
266 new display_compositor::CompositorOverlayCandidateValidatorAndroid()); | 266 new display_compositor::CompositorOverlayCandidateValidatorAndroid()); |
267 #endif | 267 #endif |
268 | 268 |
269 return validator; | 269 return validator; |
270 } | 270 } |
271 | 271 |
272 static bool ShouldCreateGpuOutputSurface(ui::Compositor* compositor) { | 272 static bool ShouldCreateGpuOutputSurface(ui::Compositor* compositor) { |
273 #if defined(MOJO_RUNNER_CLIENT) | |
274 if (shell::ShellIsRemote() && !ui::GpuService::UseChromeGpuCommandBuffer()) | |
275 return false; | |
276 #endif | |
277 | |
278 #if defined(OS_CHROMEOS) | 273 #if defined(OS_CHROMEOS) |
279 // Software fallback does not happen on Chrome OS. | 274 // Software fallback does not happen on Chrome OS. |
280 return true; | 275 return true; |
281 #endif | 276 #endif |
282 | 277 |
283 #if defined(OS_WIN) | 278 #if defined(OS_WIN) |
284 if (::GetProp(compositor->widget(), kForceSoftwareCompositor) && | 279 if (::GetProp(compositor->widget(), kForceSoftwareCompositor) && |
285 ::RemoveProp(compositor->widget(), kForceSoftwareCompositor)) | 280 ::RemoveProp(compositor->widget(), kForceSoftwareCompositor)) |
286 return false; | 281 return false; |
287 #endif | 282 #endif |
(...skipping 614 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
902 shared_vulkan_context_provider_ = | 897 shared_vulkan_context_provider_ = |
903 cc::VulkanInProcessContextProvider::Create(); | 898 cc::VulkanInProcessContextProvider::Create(); |
904 } | 899 } |
905 | 900 |
906 shared_vulkan_context_provider_initialized_ = true; | 901 shared_vulkan_context_provider_initialized_ = true; |
907 } | 902 } |
908 return shared_vulkan_context_provider_; | 903 return shared_vulkan_context_provider_; |
909 } | 904 } |
910 | 905 |
911 } // namespace content | 906 } // namespace content |
OLD | NEW |