| 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 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <map> | 10 #include <map> |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 bool create_gpu_output_surface, | 98 bool create_gpu_output_surface, |
| 99 int num_attempts, | 99 int num_attempts, |
| 100 scoped_refptr<gpu::GpuChannelHost> established_channel_host); | 100 scoped_refptr<gpu::GpuChannelHost> established_channel_host); |
| 101 | 101 |
| 102 void OnLostMainThreadSharedContextInsideCallback(); | 102 void OnLostMainThreadSharedContextInsideCallback(); |
| 103 void OnLostMainThreadSharedContext(); | 103 void OnLostMainThreadSharedContext(); |
| 104 | 104 |
| 105 scoped_refptr<cc::VulkanInProcessContextProvider> | 105 scoped_refptr<cc::VulkanInProcessContextProvider> |
| 106 SharedVulkanContextProvider(); | 106 SharedVulkanContextProvider(); |
| 107 | 107 |
| 108 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; | 108 typedef std::map<ui::Compositor*, std::unique_ptr<PerCompositorData>> |
| 109 PerCompositorDataMap; |
| 109 PerCompositorDataMap per_compositor_data_; | 110 PerCompositorDataMap per_compositor_data_; |
| 110 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; | 111 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; |
| 111 std::unique_ptr<display_compositor::GLHelper> gl_helper_; | 112 std::unique_ptr<display_compositor::GLHelper> gl_helper_; |
| 112 base::ObserverList<ui::ContextFactoryObserver> observer_list_; | 113 base::ObserverList<ui::ContextFactoryObserver> observer_list_; |
| 113 std::unique_ptr<cc::SurfaceManager> surface_manager_; | 114 std::unique_ptr<cc::SurfaceManager> surface_manager_; |
| 114 uint32_t next_surface_client_id_; | 115 uint32_t next_surface_client_id_; |
| 115 std::unique_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_; | 116 std::unique_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_; |
| 116 scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_; | 117 scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_; |
| 117 | 118 |
| 118 bool shared_vulkan_context_provider_initialized_ = false; | 119 bool shared_vulkan_context_provider_initialized_ = false; |
| 119 scoped_refptr<cc::VulkanInProcessContextProvider> | 120 scoped_refptr<cc::VulkanInProcessContextProvider> |
| 120 shared_vulkan_context_provider_; | 121 shared_vulkan_context_provider_; |
| 121 | 122 |
| 122 gpu::GpuChannelEstablishFactory* gpu_channel_factory_ = nullptr; | 123 gpu::GpuChannelEstablishFactory* gpu_channel_factory_ = nullptr; |
| 123 | 124 |
| 124 #if defined(OS_WIN) | 125 #if defined(OS_WIN) |
| 125 std::unique_ptr<OutputDeviceBacking> software_backing_; | 126 std::unique_ptr<OutputDeviceBacking> software_backing_; |
| 126 #endif | 127 #endif |
| 127 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; | 128 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; |
| 128 | 129 |
| 129 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 130 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
| 130 }; | 131 }; |
| 131 | 132 |
| 132 } // namespace content | 133 } // namespace content |
| 133 | 134 |
| 134 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 135 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| OLD | NEW |