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" |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
80 | 80 |
81 void OnLostMainThreadSharedContextInsideCallback(); | 81 void OnLostMainThreadSharedContextInsideCallback(); |
82 void OnLostMainThreadSharedContext(); | 82 void OnLostMainThreadSharedContext(); |
83 | 83 |
84 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; | 84 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; |
85 scoped_ptr<base::Thread> compositor_thread_; | 85 scoped_ptr<base::Thread> compositor_thread_; |
86 PerCompositorDataMap per_compositor_data_; | 86 PerCompositorDataMap per_compositor_data_; |
87 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; | 87 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; |
88 scoped_ptr<GLHelper> gl_helper_; | 88 scoped_ptr<GLHelper> gl_helper_; |
89 ObserverList<ImageTransportFactoryObserver> observer_list_; | 89 ObserverList<ImageTransportFactoryObserver> observer_list_; |
90 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; | |
91 scoped_ptr<cc::SurfaceManager> surface_manager_; | 90 scoped_ptr<cc::SurfaceManager> surface_manager_; |
92 uint32_t next_surface_id_namespace_; | 91 uint32_t next_surface_id_namespace_; |
93 | 92 |
94 // The contents of this map and its methods may only be used on the compositor | 93 // The contents of this map and its methods may only be used on the compositor |
95 // thread. | 94 // thread. |
96 IDMap<BrowserCompositorOutputSurface> output_surface_map_; | 95 IDMap<BrowserCompositorOutputSurface> output_surface_map_; |
97 | 96 |
98 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; | 97 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; |
99 | 98 |
| 99 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; |
| 100 |
100 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 101 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
101 }; | 102 }; |
102 | 103 |
103 } // namespace content | 104 } // namespace content |
104 | 105 |
105 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 106 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
OLD | NEW |