Chromium Code Reviews| 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 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 #include "ui/compositor/compositor.h" | 55 #include "ui/compositor/compositor.h" |
| 56 #include "ui/compositor/compositor_constants.h" | 56 #include "ui/compositor/compositor_constants.h" |
| 57 #include "ui/compositor/compositor_switches.h" | 57 #include "ui/compositor/compositor_switches.h" |
| 58 #include "ui/compositor/layer.h" | 58 #include "ui/compositor/layer.h" |
| 59 #include "ui/display/types/display_snapshot.h" | 59 #include "ui/display/types/display_snapshot.h" |
| 60 #include "ui/gfx/geometry/size.h" | 60 #include "ui/gfx/geometry/size.h" |
| 61 | 61 |
| 62 #if defined(USE_AURA) | 62 #if defined(USE_AURA) |
| 63 #include "content/browser/compositor/mus_browser_compositor_output_surface.h" | 63 #include "content/browser/compositor/mus_browser_compositor_output_surface.h" |
| 64 #include "content/public/common/mojo_shell_connection.h" | 64 #include "content/public/common/mojo_shell_connection.h" |
| 65 #include "services/ui/common/gpu_service.h" | 65 #include "services/shell/runner/common/client_util.h" |
| 66 #include "services/ui/public/cpp/gpu_service.h" | |
|
Peng
2016/08/11 14:09:23
Is this header file still necessary?
sadrul
2016/08/11 14:20:38
Good catch, no. Removed.
| |
| 66 #endif | 67 #endif |
| 67 | 68 |
| 68 #if defined(OS_WIN) | 69 #if defined(OS_WIN) |
| 69 #include "content/browser/compositor/software_output_device_win.h" | 70 #include "content/browser/compositor/software_output_device_win.h" |
| 70 #include "ui/gfx/win/rendering_window_manager.h" | 71 #include "ui/gfx/win/rendering_window_manager.h" |
| 71 #elif defined(USE_OZONE) | 72 #elif defined(USE_OZONE) |
| 72 #include "components/display_compositor/compositor_overlay_candidate_validator_o zone.h" | 73 #include "components/display_compositor/compositor_overlay_candidate_validator_o zone.h" |
| 73 #include "content/browser/compositor/software_output_device_ozone.h" | 74 #include "content/browser/compositor/software_output_device_ozone.h" |
| 74 #include "ui/ozone/public/overlay_candidates_ozone.h" | 75 #include "ui/ozone/public/overlay_candidates_ozone.h" |
| 75 #include "ui/ozone/public/overlay_manager_ozone.h" | 76 #include "ui/ozone/public/overlay_manager_ozone.h" |
| (...skipping 783 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 859 shared_vulkan_context_provider_ = | 860 shared_vulkan_context_provider_ = |
| 860 cc::VulkanInProcessContextProvider::Create(); | 861 cc::VulkanInProcessContextProvider::Create(); |
| 861 } | 862 } |
| 862 | 863 |
| 863 shared_vulkan_context_provider_initialized_ = true; | 864 shared_vulkan_context_provider_initialized_ = true; |
| 864 } | 865 } |
| 865 return shared_vulkan_context_provider_; | 866 return shared_vulkan_context_provider_; |
| 866 } | 867 } |
| 867 | 868 |
| 868 } // namespace content | 869 } // namespace content |
| OLD | NEW |