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 CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
7 | 7 |
| 8 #include "base/macros.h" |
8 #include "base/threading/non_thread_safe.h" | 9 #include "base/threading/non_thread_safe.h" |
| 10 #include "build/build_config.h" |
9 #include "cc/output/output_surface.h" | 11 #include "cc/output/output_surface.h" |
10 #include "content/common/content_export.h" | 12 #include "content/common/content_export.h" |
11 #include "ui/compositor/compositor_vsync_manager.h" | 13 #include "ui/compositor/compositor_vsync_manager.h" |
12 | 14 |
13 namespace cc { | 15 namespace cc { |
14 class SoftwareOutputDevice; | 16 class SoftwareOutputDevice; |
15 } | 17 } |
16 | 18 |
17 namespace gfx { | 19 namespace gfx { |
18 enum class SwapResult; | 20 enum class SwapResult; |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
85 | 87 |
86 scoped_ptr<BrowserCompositorOverlayCandidateValidator> | 88 scoped_ptr<BrowserCompositorOverlayCandidateValidator> |
87 overlay_candidate_validator_; | 89 overlay_candidate_validator_; |
88 | 90 |
89 DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurface); | 91 DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurface); |
90 }; | 92 }; |
91 | 93 |
92 } // namespace content | 94 } // namespace content |
93 | 95 |
94 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 96 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
OLD | NEW |