| 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 | 95 |
| 96 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; | 96 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; |
| 97 PerCompositorDataMap per_compositor_data_; | 97 PerCompositorDataMap per_compositor_data_; |
| 98 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; | 98 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; |
| 99 scoped_ptr<GLHelper> gl_helper_; | 99 scoped_ptr<GLHelper> gl_helper_; |
| 100 base::ObserverList<ImageTransportFactoryObserver> observer_list_; | 100 base::ObserverList<ImageTransportFactoryObserver> observer_list_; |
| 101 scoped_ptr<cc::SurfaceManager> surface_manager_; | 101 scoped_ptr<cc::SurfaceManager> surface_manager_; |
| 102 uint32_t next_surface_id_namespace_; | 102 uint32_t next_surface_id_namespace_; |
| 103 scoped_ptr<cc::TaskGraphRunner> task_graph_runner_; | 103 scoped_ptr<cc::TaskGraphRunner> task_graph_runner_; |
| 104 scoped_ptr<base::SimpleThread> raster_thread_; | 104 scoped_ptr<base::SimpleThread> raster_thread_; |
| 105 scoped_refptr<ContextProviderCommandBuffer> shared_worker_context_provider_; | |
| 106 | 105 |
| 107 #if defined(OS_WIN) | 106 #if defined(OS_WIN) |
| 108 scoped_ptr<OutputDeviceBacking> software_backing_; | 107 scoped_ptr<OutputDeviceBacking> software_backing_; |
| 109 #endif | 108 #endif |
| 110 | 109 |
| 111 // The contents of this map and its methods may only be used on the compositor | 110 // The contents of this map and its methods may only be used on the compositor |
| 112 // thread. | 111 // thread. |
| 113 IDMap<BrowserCompositorOutputSurface> output_surface_map_; | 112 IDMap<BrowserCompositorOutputSurface> output_surface_map_; |
| 114 | 113 |
| 115 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; | 114 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; |
| 116 | 115 |
| 117 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 116 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
| 118 }; | 117 }; |
| 119 | 118 |
| 120 } // namespace content | 119 } // namespace content |
| 121 | 120 |
| 122 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 121 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| OLD | NEW |