Chromium Code Reviews| 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 <set> | |
|
danakj
2014/09/03 16:09:36
?
Sami
2014/09/03 17:59:12
Hmm, looks like a rebasing snafu. Earlier my patch
| |
| 9 | |
| 8 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 9 #include "cc/output/output_surface_client.h" | 11 #include "cc/output/output_surface_client.h" |
| 10 #include "cc/output/renderer.h" | 12 #include "cc/output/renderer.h" |
| 11 #include "cc/resources/returned_resource.h" | 13 #include "cc/resources/returned_resource.h" |
| 12 #include "cc/surfaces/surface_aggregator.h" | 14 #include "cc/surfaces/surface_aggregator.h" |
| 13 #include "cc/surfaces/surface_id.h" | 15 #include "cc/surfaces/surface_id.h" |
| 14 #include "cc/surfaces/surface_manager.h" | 16 #include "cc/surfaces/surface_manager.h" |
| 15 #include "cc/surfaces/surfaces_export.h" | 17 #include "cc/surfaces/surfaces_export.h" |
| 16 | 18 |
| 17 namespace gfx { | 19 namespace gfx { |
| 18 class Size; | 20 class Size; |
| 19 } | 21 } |
| 20 | 22 |
| 21 namespace cc { | 23 namespace cc { |
| 22 | 24 |
| 25 class BlockingTaskRunner; | |
| 23 class DirectRenderer; | 26 class DirectRenderer; |
| 24 class DisplayClient; | 27 class DisplayClient; |
| 25 class OutputSurface; | 28 class OutputSurface; |
| 26 class ResourceProvider; | 29 class ResourceProvider; |
| 27 class SharedBitmapManager; | 30 class SharedBitmapManager; |
| 28 class Surface; | 31 class Surface; |
| 29 class SurfaceAggregator; | 32 class SurfaceAggregator; |
| 30 class SurfaceIdAllocator; | 33 class SurfaceIdAllocator; |
| 31 class SurfaceFactory; | 34 class SurfaceFactory; |
| 32 | 35 |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 81 DisplayClient* client_; | 84 DisplayClient* client_; |
| 82 SurfaceManager* manager_; | 85 SurfaceManager* manager_; |
| 83 SharedBitmapManager* bitmap_manager_; | 86 SharedBitmapManager* bitmap_manager_; |
| 84 SurfaceId current_surface_id_; | 87 SurfaceId current_surface_id_; |
| 85 gfx::Size current_surface_size_; | 88 gfx::Size current_surface_size_; |
| 86 LayerTreeSettings settings_; | 89 LayerTreeSettings settings_; |
| 87 scoped_ptr<OutputSurface> output_surface_; | 90 scoped_ptr<OutputSurface> output_surface_; |
| 88 scoped_ptr<ResourceProvider> resource_provider_; | 91 scoped_ptr<ResourceProvider> resource_provider_; |
| 89 scoped_ptr<SurfaceAggregator> aggregator_; | 92 scoped_ptr<SurfaceAggregator> aggregator_; |
| 90 scoped_ptr<DirectRenderer> renderer_; | 93 scoped_ptr<DirectRenderer> renderer_; |
| 94 scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_; | |
| 91 | 95 |
| 92 DISALLOW_COPY_AND_ASSIGN(Display); | 96 DISALLOW_COPY_AND_ASSIGN(Display); |
| 93 }; | 97 }; |
| 94 | 98 |
| 95 } // namespace cc | 99 } // namespace cc |
| 96 | 100 |
| 97 #endif // CC_SURFACES_DISPLAY_H_ | 101 #endif // CC_SURFACES_DISPLAY_H_ |
| OLD | NEW |