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 "content/browser/compositor/browser_compositor_output_surface.h" | 9 #include "content/browser/compositor/browser_compositor_output_surface.h" |
10 | 10 |
| 11 namespace ui { |
| 12 class CompositorVSyncManager; |
| 13 } |
| 14 |
11 namespace cc { | 15 namespace cc { |
12 class OverlayCandidateValidator; | 16 class OverlayCandidateValidator; |
13 } | 17 } |
14 | 18 |
15 namespace content { | 19 namespace content { |
16 class CommandBufferProxyImpl; | 20 class CommandBufferProxyImpl; |
17 | 21 |
18 // Adapts a WebGraphicsContext3DCommandBufferImpl into a | 22 // Adapts a WebGraphicsContext3DCommandBufferImpl into a |
19 // cc::OutputSurface that also handles vsync parameter updates | 23 // cc::OutputSurface that also handles vsync parameter updates |
20 // arriving from the GPU process. | 24 // arriving from the GPU process. |
21 class GpuBrowserCompositorOutputSurface | 25 class GpuBrowserCompositorOutputSurface |
22 : public BrowserCompositorOutputSurface { | 26 : public BrowserCompositorOutputSurface { |
23 public: | 27 public: |
24 GpuBrowserCompositorOutputSurface( | 28 GpuBrowserCompositorOutputSurface( |
25 const scoped_refptr<ContextProviderCommandBuffer>& context, | 29 const scoped_refptr<ContextProviderCommandBuffer>& context, |
| 30 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
26 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator); | 31 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator); |
27 | 32 |
28 ~GpuBrowserCompositorOutputSurface() override; | 33 ~GpuBrowserCompositorOutputSurface() override; |
29 | 34 |
30 protected: | 35 protected: |
31 // cc::OutputSurface implementation. | 36 // cc::OutputSurface implementation. |
32 void SwapBuffers(cc::CompositorFrame* frame) override; | 37 void SwapBuffers(cc::CompositorFrame* frame) override; |
33 bool BindToClient(cc::OutputSurfaceClient* client) override; | 38 bool BindToClient(cc::OutputSurfaceClient* client) override; |
34 | 39 |
35 #if defined(OS_MACOSX) | 40 #if defined(OS_MACOSX) |
(...skipping 11 matching lines...) Expand all Loading... |
47 base::CancelableCallback<void(base::TimeTicks timebase, | 52 base::CancelableCallback<void(base::TimeTicks timebase, |
48 base::TimeDelta interval)> | 53 base::TimeDelta interval)> |
49 update_vsync_parameters_callback_; | 54 update_vsync_parameters_callback_; |
50 | 55 |
51 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); | 56 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); |
52 }; | 57 }; |
53 | 58 |
54 } // namespace content | 59 } // namespace content |
55 | 60 |
56 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 61 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
OLD | NEW |