| 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 <memory> | 8 #include <memory> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| 11 #include "base/macros.h" | 11 #include "base/macros.h" |
| 12 #include "cc/output/output_surface_client.h" | 12 #include "cc/output/output_surface_client.h" |
| 13 #include "cc/output/renderer.h" | 13 #include "cc/output/renderer.h" |
| 14 #include "cc/resources/returned_resource.h" | 14 #include "cc/resources/returned_resource.h" |
| 15 #include "cc/scheduler/begin_frame_source.h" | 15 #include "cc/scheduler/begin_frame_source.h" |
| 16 #include "cc/surfaces/display_scheduler.h" | 16 #include "cc/surfaces/display_scheduler.h" |
| 17 #include "cc/surfaces/surface_aggregator.h" | 17 #include "cc/surfaces/surface_aggregator.h" |
| 18 #include "cc/surfaces/surface_id.h" | 18 #include "cc/surfaces/surface_id.h" |
| 19 #include "cc/surfaces/surface_manager.h" | 19 #include "cc/surfaces/surface_manager.h" |
| 20 #include "cc/surfaces/surfaces_export.h" | 20 #include "cc/surfaces/surfaces_export.h" |
| 21 #include "ui/latency_info/latency_info.h" | 21 #include "ui/events/latency_info.h" |
| 22 | 22 |
| 23 namespace gpu { | 23 namespace gpu { |
| 24 class GpuMemoryBufferManager; | 24 class GpuMemoryBufferManager; |
| 25 } | 25 } |
| 26 | 26 |
| 27 namespace gfx { | 27 namespace gfx { |
| 28 class Size; | 28 class Size; |
| 29 } | 29 } |
| 30 | 30 |
| 31 namespace cc { | 31 namespace cc { |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 std::unique_ptr<DirectRenderer> renderer_; | 117 std::unique_ptr<DirectRenderer> renderer_; |
| 118 std::unique_ptr<TextureMailboxDeleter> texture_mailbox_deleter_; | 118 std::unique_ptr<TextureMailboxDeleter> texture_mailbox_deleter_; |
| 119 std::vector<ui::LatencyInfo> stored_latency_info_; | 119 std::vector<ui::LatencyInfo> stored_latency_info_; |
| 120 | 120 |
| 121 DISALLOW_COPY_AND_ASSIGN(Display); | 121 DISALLOW_COPY_AND_ASSIGN(Display); |
| 122 }; | 122 }; |
| 123 | 123 |
| 124 } // namespace cc | 124 } // namespace cc |
| 125 | 125 |
| 126 #endif // CC_SURFACES_DISPLAY_H_ | 126 #endif // CC_SURFACES_DISPLAY_H_ |
| OLD | NEW |