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/macros.h" |
10 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
11 #include "cc/output/output_surface_client.h" | 12 #include "cc/output/output_surface_client.h" |
12 #include "cc/output/renderer.h" | 13 #include "cc/output/renderer.h" |
13 #include "cc/resources/returned_resource.h" | 14 #include "cc/resources/returned_resource.h" |
14 #include "cc/scheduler/begin_frame_source.h" | 15 #include "cc/scheduler/begin_frame_source.h" |
15 #include "cc/surfaces/display_scheduler.h" | 16 #include "cc/surfaces/display_scheduler.h" |
16 #include "cc/surfaces/surface_aggregator.h" | 17 #include "cc/surfaces/surface_aggregator.h" |
17 #include "cc/surfaces/surface_id.h" | 18 #include "cc/surfaces/surface_id.h" |
18 #include "cc/surfaces/surface_manager.h" | 19 #include "cc/surfaces/surface_manager.h" |
19 #include "cc/surfaces/surfaces_export.h" | 20 #include "cc/surfaces/surfaces_export.h" |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 scoped_ptr<DirectRenderer> renderer_; | 122 scoped_ptr<DirectRenderer> renderer_; |
122 scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_; | 123 scoped_ptr<TextureMailboxDeleter> texture_mailbox_deleter_; |
123 std::vector<ui::LatencyInfo> stored_latency_info_; | 124 std::vector<ui::LatencyInfo> stored_latency_info_; |
124 | 125 |
125 DISALLOW_COPY_AND_ASSIGN(Display); | 126 DISALLOW_COPY_AND_ASSIGN(Display); |
126 }; | 127 }; |
127 | 128 |
128 } // namespace cc | 129 } // namespace cc |
129 | 130 |
130 #endif // CC_SURFACES_DISPLAY_H_ | 131 #endif // CC_SURFACES_DISPLAY_H_ |
OLD | NEW |