| 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 <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 10 matching lines...) Expand all Loading... |
| 21 namespace gpu { | 21 namespace gpu { |
| 22 class GpuMemoryBufferManager; | 22 class GpuMemoryBufferManager; |
| 23 } | 23 } |
| 24 | 24 |
| 25 namespace gfx { | 25 namespace gfx { |
| 26 class Size; | 26 class Size; |
| 27 } | 27 } |
| 28 | 28 |
| 29 namespace cc { | 29 namespace cc { |
| 30 | 30 |
| 31 class DirectRenderer; | |
| 32 class DisplayClient; | 31 class DisplayClient; |
| 33 class OutputSurface; | 32 class OutputSurface; |
| 34 class RendererSettings; | 33 class RendererSettings; |
| 35 class ResourceProvider; | 34 class ResourceProvider; |
| 36 class SharedBitmapManager; | 35 class SharedBitmapManager; |
| 37 class Surface; | 36 class Surface; |
| 38 class SurfaceAggregator; | 37 class SurfaceAggregator; |
| 39 class SurfaceIdAllocator; | 38 class SurfaceIdAllocator; |
| 40 class SurfaceFactory; | 39 class SurfaceFactory; |
| 41 class TextureMailboxDeleter; | 40 class TextureMailboxDeleter; |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 105 RendererSettings settings_; | 104 RendererSettings settings_; |
| 106 SurfaceId current_surface_id_; | 105 SurfaceId current_surface_id_; |
| 107 gfx::Size current_surface_size_; | 106 gfx::Size current_surface_size_; |
| 108 float device_scale_factor_; | 107 float device_scale_factor_; |
| 109 bool swapped_since_resize_; | 108 bool swapped_since_resize_; |
| 110 gfx::Rect external_clip_; | 109 gfx::Rect external_clip_; |
| 111 scoped_ptr<OutputSurface> output_surface_; | 110 scoped_ptr<OutputSurface> output_surface_; |
| 112 DisplayScheduler* scheduler_; | 111 DisplayScheduler* scheduler_; |
| 113 scoped_ptr<ResourceProvider> resource_provider_; | 112 scoped_ptr<ResourceProvider> resource_provider_; |
| 114 scoped_ptr<SurfaceAggregator> aggregator_; | 113 scoped_ptr<SurfaceAggregator> aggregator_; |
| 115 scoped_ptr<DirectRenderer> renderer_; | 114 scoped_ptr<Renderer> renderer_; |
| 116 scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_; | 115 scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_; |
| 117 std::vector<ui::LatencyInfo> stored_latency_info_; | 116 std::vector<ui::LatencyInfo> stored_latency_info_; |
| 118 | 117 |
| 119 DISALLOW_COPY_AND_ASSIGN(Display); | 118 DISALLOW_COPY_AND_ASSIGN(Display); |
| 120 }; | 119 }; |
| 121 | 120 |
| 122 } // namespace cc | 121 } // namespace cc |
| 123 | 122 |
| 124 #endif // CC_SURFACES_DISPLAY_H_ | 123 #endif // CC_SURFACES_DISPLAY_H_ |
| OLD | NEW |