| 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 "ui/compositor/compositor.h" | 16 #include "ui/compositor/compositor.h" |
| 17 | 17 |
| 18 namespace base { | 18 namespace base { |
| 19 class Thread; | 19 class Thread; |
| 20 } | 20 } |
| 21 | 21 |
| 22 namespace cc { |
| 23 class SurfaceManager; |
| 24 } |
| 25 |
| 22 namespace content { | 26 namespace content { |
| 23 class BrowserCompositorOutputSurface; | 27 class BrowserCompositorOutputSurface; |
| 24 class BrowserCompositorOutputSurfaceProxy; | 28 class BrowserCompositorOutputSurfaceProxy; |
| 25 class CompositorSwapClient; | 29 class CompositorSwapClient; |
| 26 class ContextProviderCommandBuffer; | 30 class ContextProviderCommandBuffer; |
| 27 class ReflectorImpl; | 31 class ReflectorImpl; |
| 28 class WebGraphicsContext3DCommandBufferImpl; | 32 class WebGraphicsContext3DCommandBufferImpl; |
| 29 | 33 |
| 30 class GpuProcessTransportFactory | 34 class GpuProcessTransportFactory |
| 31 : public ui::ContextFactory, | 35 : public ui::ContextFactory, |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 void OnLostMainThreadSharedContextInsideCallback(); | 75 void OnLostMainThreadSharedContextInsideCallback(); |
| 72 void OnLostMainThreadSharedContext(); | 76 void OnLostMainThreadSharedContext(); |
| 73 | 77 |
| 74 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; | 78 typedef std::map<ui::Compositor*, PerCompositorData*> PerCompositorDataMap; |
| 75 scoped_ptr<base::Thread> compositor_thread_; | 79 scoped_ptr<base::Thread> compositor_thread_; |
| 76 PerCompositorDataMap per_compositor_data_; | 80 PerCompositorDataMap per_compositor_data_; |
| 77 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; | 81 scoped_refptr<ContextProviderCommandBuffer> shared_main_thread_contexts_; |
| 78 scoped_ptr<GLHelper> gl_helper_; | 82 scoped_ptr<GLHelper> gl_helper_; |
| 79 ObserverList<ImageTransportFactoryObserver> observer_list_; | 83 ObserverList<ImageTransportFactoryObserver> observer_list_; |
| 80 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; | 84 base::WeakPtrFactory<GpuProcessTransportFactory> callback_factory_; |
| 85 scoped_ptr<cc::SurfaceManager> surface_manager_; |
| 81 | 86 |
| 82 // The contents of this map and its methods may only be used on the compositor | 87 // The contents of this map and its methods may only be used on the compositor |
| 83 // thread. | 88 // thread. |
| 84 IDMap<BrowserCompositorOutputSurface> output_surface_map_; | 89 IDMap<BrowserCompositorOutputSurface> output_surface_map_; |
| 85 | 90 |
| 86 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; | 91 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; |
| 87 | 92 |
| 88 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 93 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
| 89 }; | 94 }; |
| 90 | 95 |
| 91 } // namespace content | 96 } // namespace content |
| 92 | 97 |
| 93 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 98 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| OLD | NEW |