| 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 CC_SURFACES_SURFACE_AGGREGATOR_H_ | 5 #ifndef CC_SURFACES_SURFACE_AGGREGATOR_H_ |
| 6 #define CC_SURFACES_SURFACE_AGGREGATOR_H_ | 6 #define CC_SURFACES_SURFACE_AGGREGATOR_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/containers/hash_tables.h" | 10 #include "base/containers/hash_tables.h" |
| 11 #include "base/containers/scoped_ptr_hash_map.h" | 11 #include "base/containers/scoped_ptr_hash_map.h" |
| 12 #include "base/macros.h" |
| 12 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
| 13 #include "cc/quads/draw_quad.h" | 14 #include "cc/quads/draw_quad.h" |
| 14 #include "cc/quads/render_pass.h" | 15 #include "cc/quads/render_pass.h" |
| 15 #include "cc/resources/transferable_resource.h" | 16 #include "cc/resources/transferable_resource.h" |
| 16 #include "cc/surfaces/surface_id.h" | 17 #include "cc/surfaces/surface_id.h" |
| 17 #include "cc/surfaces/surfaces_export.h" | 18 #include "cc/surfaces/surfaces_export.h" |
| 18 | 19 |
| 19 namespace cc { | 20 namespace cc { |
| 20 | 21 |
| 21 class CompositorFrame; | 22 class CompositorFrame; |
| (...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 150 | 151 |
| 151 // Resource list for the aggregated frame. | 152 // Resource list for the aggregated frame. |
| 152 TransferableResourceArray* dest_resource_list_; | 153 TransferableResourceArray* dest_resource_list_; |
| 153 | 154 |
| 154 DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator); | 155 DISALLOW_COPY_AND_ASSIGN(SurfaceAggregator); |
| 155 }; | 156 }; |
| 156 | 157 |
| 157 } // namespace cc | 158 } // namespace cc |
| 158 | 159 |
| 159 #endif // CC_SURFACES_SURFACE_AGGREGATOR_H_ | 160 #endif // CC_SURFACES_SURFACE_AGGREGATOR_H_ |
| OLD | NEW |