| 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_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| 7 | 7 |
| 8 #include "base/cancelable_callback.h" | 8 #include "base/cancelable_callback.h" |
| 9 #include "base/macros.h" |
| 10 #include "build/build_config.h" |
| 9 #include "content/browser/compositor/browser_compositor_output_surface.h" | 11 #include "content/browser/compositor/browser_compositor_output_surface.h" |
| 10 #include "ui/gfx/swap_result.h" | 12 #include "ui/gfx/swap_result.h" |
| 11 | 13 |
| 12 namespace ui { | 14 namespace ui { |
| 13 class CompositorVSyncManager; | 15 class CompositorVSyncManager; |
| 14 } | 16 } |
| 15 | 17 |
| 16 namespace content { | 18 namespace content { |
| 17 class CommandBufferProxyImpl; | 19 class CommandBufferProxyImpl; |
| 18 class BrowserCompositorOverlayCandidateValidator; | 20 class BrowserCompositorOverlayCandidateValidator; |
| (...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 72 update_vsync_parameters_callback_; | 74 update_vsync_parameters_callback_; |
| 73 | 75 |
| 74 scoped_ptr<ReflectorTexture> reflector_texture_; | 76 scoped_ptr<ReflectorTexture> reflector_texture_; |
| 75 | 77 |
| 76 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); | 78 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); |
| 77 }; | 79 }; |
| 78 | 80 |
| 79 } // namespace content | 81 } // namespace content |
| 80 | 82 |
| 81 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 83 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
| OLD | NEW |