| 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> |
| 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 { |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 RendererSettings settings_; | 96 RendererSettings settings_; |
| 95 SurfaceId current_surface_id_; | 97 SurfaceId current_surface_id_; |
| 96 gfx::Size current_surface_size_; | 98 gfx::Size current_surface_size_; |
| 97 float device_scale_factor_; | 99 float device_scale_factor_; |
| 98 scoped_ptr<OutputSurface> output_surface_; | 100 scoped_ptr<OutputSurface> output_surface_; |
| 99 scoped_ptr<ResourceProvider> resource_provider_; | 101 scoped_ptr<ResourceProvider> resource_provider_; |
| 100 scoped_ptr<SurfaceAggregator> aggregator_; | 102 scoped_ptr<SurfaceAggregator> aggregator_; |
| 101 scoped_ptr<DirectRenderer> renderer_; | 103 scoped_ptr<DirectRenderer> renderer_; |
| 102 scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_; | 104 scoped_ptr<BlockingTaskRunner> blocking_main_thread_task_runner_; |
| 103 scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_; | 105 scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_; |
| 106 std::vector<ui::LatencyInfo> stored_latency_info_; |
| 104 | 107 |
| 105 DISALLOW_COPY_AND_ASSIGN(Display); | 108 DISALLOW_COPY_AND_ASSIGN(Display); |
| 106 }; | 109 }; |
| 107 | 110 |
| 108 } // namespace cc | 111 } // namespace cc |
| 109 | 112 |
| 110 #endif // CC_SURFACES_DISPLAY_H_ | 113 #endif // CC_SURFACES_DISPLAY_H_ |
| OLD | NEW |