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_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 5 #ifndef CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
6 #define CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 6 #define CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
7 | 7 |
| 8 #include "base/macros.h" |
8 #include "cc/output/output_surface.h" | 9 #include "cc/output/output_surface.h" |
9 #include "cc/surfaces/surface_factory.h" | 10 #include "cc/surfaces/surface_factory.h" |
10 #include "cc/surfaces/surface_factory_client.h" | 11 #include "cc/surfaces/surface_factory_client.h" |
11 #include "cc/surfaces/surface_id_allocator.h" | 12 #include "cc/surfaces/surface_id_allocator.h" |
12 #include "cc/surfaces/surfaces_export.h" | 13 #include "cc/surfaces/surfaces_export.h" |
13 | 14 |
14 namespace cc { | 15 namespace cc { |
15 class Display; | 16 class Display; |
16 class OnscreenDisplayClient; | 17 class OnscreenDisplayClient; |
17 class SurfaceManager; | 18 class SurfaceManager; |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
56 gfx::Size display_size_; | 57 gfx::Size display_size_; |
57 SurfaceId surface_id_; | 58 SurfaceId surface_id_; |
58 SurfaceIdAllocator* allocator_; | 59 SurfaceIdAllocator* allocator_; |
59 | 60 |
60 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); | 61 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); |
61 }; | 62 }; |
62 | 63 |
63 } // namespace cc | 64 } // namespace cc |
64 | 65 |
65 #endif // CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 66 #endif // CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
OLD | NEW |