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 "content/browser/compositor/browser_compositor_output_surface.h" | 8 #include "content/browser/compositor/browser_compositor_output_surface.h" |
9 | 9 |
10 #include "cc/output/context_provider.h" | |
alexst (slow to review)
2014/09/10 15:39:07
Please move it into the cc file.
achaulk
2014/09/10 16:47:55
Leftover from the combined file
| |
11 | |
10 namespace ui { | 12 namespace ui { |
11 class CompositorVSyncManager; | 13 class CompositorVSyncManager; |
12 } | 14 } |
13 | 15 |
14 namespace cc { | 16 namespace cc { |
15 class OverlayCandidateValidator; | 17 class OverlayCandidateValidator; |
16 } | 18 } |
17 | 19 |
18 namespace content { | 20 namespace content { |
19 | 21 |
20 // Adapts a WebGraphicsContext3DCommandBufferImpl into a | 22 // Adapts a WebGraphicsContext3DCommandBufferImpl into a |
21 // cc::OutputSurface that also handles vsync parameter updates | 23 // cc::OutputSurface that also handles vsync parameter updates |
22 // arriving from the GPU process. | 24 // arriving from the GPU process. |
23 class GpuBrowserCompositorOutputSurface | 25 class GpuBrowserCompositorOutputSurface |
24 : public BrowserCompositorOutputSurface { | 26 : public BrowserCompositorOutputSurface { |
25 public: | 27 public: |
26 GpuBrowserCompositorOutputSurface( | 28 GpuBrowserCompositorOutputSurface( |
27 const scoped_refptr<ContextProviderCommandBuffer>& context, | 29 const scoped_refptr<ContextProviderCommandBuffer>& context, |
28 int surface_id, | 30 int surface_id, |
29 IDMap<BrowserCompositorOutputSurface>* output_surface_map, | 31 IDMap<BrowserCompositorOutputSurface>* output_surface_map, |
30 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, | 32 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
31 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator); | 33 scoped_ptr<cc::OverlayCandidateValidator> overlay_candidate_validator); |
32 | 34 |
33 virtual ~GpuBrowserCompositorOutputSurface(); | 35 virtual ~GpuBrowserCompositorOutputSurface(); |
34 | 36 |
35 private: | 37 protected: |
36 // cc::OutputSurface implementation. | 38 // cc::OutputSurface implementation. |
37 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; | 39 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; |
38 | 40 |
39 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); | 41 DISALLOW_COPY_AND_ASSIGN(GpuBrowserCompositorOutputSurface); |
40 }; | 42 }; |
41 | 43 |
42 } // namespace content | 44 } // namespace content |
43 | 45 |
44 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 46 #endif // CONTENT_BROWSER_COMPOSITOR_GPU_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
OLD | NEW |