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 <map> | 8 #include <map> |
9 | 9 |
10 #include "base/id_map.h" | 10 #include "base/id_map.h" |
11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
12 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
13 #include "base/memory/weak_ptr.h" | 13 #include "base/memory/weak_ptr.h" |
14 #include "base/observer_list.h" | 14 #include "base/observer_list.h" |
15 #include "content/browser/compositor/image_transport_factory.h" | 15 #include "content/browser/compositor/image_transport_factory.h" |
16 #include "content/common/gpu/client/gpu_channel_host.h" | 16 #include "content/common/gpu/client/gpu_channel_host.h" |
17 #include "ui/compositor/compositor.h" | 17 #include "ui/compositor/compositor.h" |
18 | 18 |
19 namespace base { | 19 namespace base { |
20 class SimpleThread; | 20 class SimpleThread; |
21 class Thread; | 21 class Thread; |
22 } | 22 } |
23 | 23 |
24 namespace cc { | 24 namespace cc { |
| 25 class SingleThreadTaskGraphRunner; |
25 class SoftwareOutputDevice; | 26 class SoftwareOutputDevice; |
26 class SurfaceManager; | 27 class SurfaceManager; |
27 } | 28 } |
28 | 29 |
29 namespace content { | 30 namespace content { |
30 class BrowserCompositorOutputSurface; | 31 class BrowserCompositorOutputSurface; |
31 class CompositorSwapClient; | 32 class CompositorSwapClient; |
32 class ContextProviderCommandBuffer; | 33 class ContextProviderCommandBuffer; |
33 class OutputDeviceBacking; | 34 class OutputDeviceBacking; |
34 class ReflectorImpl; | 35 class ReflectorImpl; |
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
95 void OnLostMainThreadSharedContextInsideCallback(); | 96 void OnLostMainThreadSharedContextInsideCallback(); |
96 void OnLostMainThreadSharedContext(); | 97 void OnLostMainThreadSharedContext(); |
97 | 98 |
98 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; | 99 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; |
99 PerCompositorDataMap per_compositor_data_; | 100 PerCompositorDataMap per_compositor_data_; |
100 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; | 101 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; |
101 scoped_ptr<GLHelper> gl_helper_; | 102 scoped_ptr<GLHelper> gl_helper_; |
102 base::ObserverList<ImageTransportFactoryObserver> observer_list_; | 103 base::ObserverList<ImageTransportFactoryObserver> observer_list_; |
103 scoped_ptr<cc::SurfaceManager> surface_manager_; | 104 scoped_ptr<cc::SurfaceManager> surface_manager_; |
104 uint32_t next_surface_id_namespace_; | 105 uint32_t next_surface_id_namespace_; |
105 scoped_ptr<cc::TaskGraphRunner> task_graph_runner_; | 106 scoped_ptr<cc::SingleThreadTaskGraphRunner> task_graph_runner_; |
106 scoped_ptr<base::SimpleThread> raster_thread_; | |
107 scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_; | 107 scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_; |
108 | 108 |
109 #if defined(OS_WIN) | 109 #if defined(OS_WIN) |
110 scoped_ptr<OutputDeviceBacking> software_backing_; | 110 scoped_ptr<OutputDeviceBacking> software_backing_; |
111 #endif | 111 #endif |
112 | 112 |
113 // The contents of this map and its methods may only be used on the compositor | 113 // The contents of this map and its methods may only be used on the compositor |
114 // thread. | 114 // thread. |
115 IDMap<BrowserCompositorOutputSurface> output_surface_map_; | 115 IDMap<BrowserCompositorOutputSurface> output_surface_map_; |
116 | 116 |
117 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; | 117 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; |
118 | 118 |
119 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 119 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
120 }; | 120 }; |
121 | 121 |
122 } // namespace content | 122 } // namespace content |
123 | 123 |
124 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 124 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
OLD | NEW |