| 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_DISPLAY_H_ | 5 #ifndef CC_SURFACES_DISPLAY_H_ |
| 6 #define CC_SURFACES_DISPLAY_H_ | 6 #define CC_SURFACES_DISPLAY_H_ |
| 7 | 7 |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/output/output_surface_client.h" | 9 #include "cc/output/output_surface_client.h" |
| 10 #include "cc/output/renderer.h" | 10 #include "cc/output/renderer.h" |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 SurfaceManager* manager_; | 82 SurfaceManager* manager_; |
| 83 SharedBitmapManager* bitmap_manager_; | 83 SharedBitmapManager* bitmap_manager_; |
| 84 SurfaceId current_surface_id_; | 84 SurfaceId current_surface_id_; |
| 85 gfx::Size current_surface_size_; | 85 gfx::Size current_surface_size_; |
| 86 LayerTreeSettings settings_; | 86 LayerTreeSettings settings_; |
| 87 scoped_ptr<OutputSurface> output_surface_; | 87 scoped_ptr<OutputSurface> output_surface_; |
| 88 scoped_ptr<ResourceProvider> resource_provider_; | 88 scoped_ptr<ResourceProvider> resource_provider_; |
| 89 scoped_ptr<SurfaceAggregator> aggregator_; | 89 scoped_ptr<SurfaceAggregator> aggregator_; |
| 90 scoped_ptr<DirectRenderer> renderer_; | 90 scoped_ptr<DirectRenderer> renderer_; |
| 91 | 91 |
| 92 std::set<SurfaceId> contained_surfaces_; | |
| 93 | |
| 94 DISALLOW_COPY_AND_ASSIGN(Display); | 92 DISALLOW_COPY_AND_ASSIGN(Display); |
| 95 }; | 93 }; |
| 96 | 94 |
| 97 } // namespace cc | 95 } // namespace cc |
| 98 | 96 |
| 99 #endif // CC_SURFACES_DISPLAY_H_ | 97 #endif // CC_SURFACES_DISPLAY_H_ |
| OLD | NEW |