| OLD | NEW |
| 1 // Copyright (c) 2013 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_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| 6 #define CONTENT_BROWSER_AURA_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/aura/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 content { | 18 namespace content { |
| 19 class BrowserCompositorOutputSurface; | 19 class BrowserCompositorOutputSurface; |
| 20 class BrowserCompositorOutputSurfaceProxy; | 20 class BrowserCompositorOutputSurfaceProxy; |
| 21 class CompositorSwapClient; | 21 class CompositorSwapClient; |
| 22 class ContextProviderCommandBuffer; | 22 class ContextProviderCommandBuffer; |
| 23 class ReflectorImpl; | 23 class ReflectorImpl; |
| 24 class WebGraphicsContext3DCommandBufferImpl; | 24 class WebGraphicsContext3DCommandBufferImpl; |
| 25 | 25 |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 85 // thread. | 85 // thread. |
| 86 IDMap<BrowserCompositorOutputSurface> output_surface_map_; | 86 IDMap<BrowserCompositorOutputSurface> output_surface_map_; |
| 87 | 87 |
| 88 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; | 88 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; |
| 89 | 89 |
| 90 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); | 90 DISALLOW_COPY_AND_ASSIGN(GpuProcessTransportFactory); |
| 91 }; | 91 }; |
| 92 | 92 |
| 93 } // namespace content | 93 } // namespace content |
| 94 | 94 |
| 95 #endif // CONTENT_BROWSER_AURA_GPU_PROCESS_TRANSPORT_FACTORY_H_ | 95 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_PROCESS_TRANSPORT_FACTORY_H_ |
| OLD | NEW |