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 "cc/output/output_surface.h" | 8 #include "cc/output/output_surface.h" |
9 #include "cc/surfaces/surface_factory.h" | 9 #include "cc/surfaces/surface_factory.h" |
10 #include "cc/surfaces/surface_factory_client.h" | 10 #include "cc/surfaces/surface_factory_client.h" |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
47 | 47 |
48 private: | 48 private: |
49 void SwapBuffersComplete(SurfaceDrawStatus drawn); | 49 void SwapBuffersComplete(SurfaceDrawStatus drawn); |
50 | 50 |
51 OnscreenDisplayClient* display_client_; | 51 OnscreenDisplayClient* display_client_; |
52 SurfaceFactory factory_; | 52 SurfaceFactory factory_; |
53 gfx::Size display_size_; | 53 gfx::Size display_size_; |
54 SurfaceId surface_id_; | 54 SurfaceId surface_id_; |
55 SurfaceIdAllocator* allocator_; | 55 SurfaceIdAllocator* allocator_; |
56 | 56 |
| 57 // TODO(brianderson): Remove this after solving crbug.com/495650 |
| 58 int inside_swap_buffers_; |
| 59 |
57 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); | 60 DISALLOW_COPY_AND_ASSIGN(SurfaceDisplayOutputSurface); |
58 }; | 61 }; |
59 | 62 |
60 } // namespace cc | 63 } // namespace cc |
61 | 64 |
62 #endif // CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ | 65 #endif // CC_SURFACES_SURFACE_DISPLAY_OUTPUT_SURFACE_H_ |
OLD | NEW |