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_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 5 #ifndef CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 6 #define CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
7 | 7 |
8 #include "base/memory/weak_ptr.h" | 8 #include "base/memory/weak_ptr.h" |
9 #include "content/browser/compositor/browser_compositor_output_surface.h" | 9 #include "content/browser/compositor/browser_compositor_output_surface.h" |
10 #include "content/common/content_export.h" | 10 #include "content/common/content_export.h" |
| 11 #include "ui/compositor/compositor.h" |
| 12 |
| 13 namespace base { |
| 14 class MessageLoopProxy; |
| 15 } |
11 | 16 |
12 namespace cc { | 17 namespace cc { |
13 class SoftwareOutputDevice; | 18 class SoftwareOutputDevice; |
14 } | 19 } |
15 | 20 |
16 namespace ui { | |
17 class CompositorVSyncManager; | |
18 } | |
19 | |
20 namespace content { | 21 namespace content { |
21 | 22 |
22 class BrowserCompositorOutputSurfaceProxy; | 23 class BrowserCompositorOutputSurfaceProxy; |
23 | 24 |
24 class CONTENT_EXPORT SoftwareBrowserCompositorOutputSurface | 25 class CONTENT_EXPORT SoftwareBrowserCompositorOutputSurface |
25 : public BrowserCompositorOutputSurface { | 26 : public BrowserCompositorOutputSurface { |
26 public: | 27 public: |
27 SoftwareBrowserCompositorOutputSurface( | 28 SoftwareBrowserCompositorOutputSurface( |
28 scoped_refptr<BrowserCompositorOutputSurfaceProxy> surface_proxy, | 29 scoped_refptr<BrowserCompositorOutputSurfaceProxy> surface_proxy, |
29 scoped_ptr<cc::SoftwareOutputDevice> software_device, | 30 scoped_ptr<cc::SoftwareOutputDevice> software_device, |
30 int surface_id, | 31 int surface_id, |
31 IDMap<BrowserCompositorOutputSurface>* output_surface_map, | 32 IDMap<BrowserCompositorOutputSurface>* output_surface_map, |
32 const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager); | 33 base::MessageLoopProxy* compositor_message_loop, |
| 34 base::WeakPtr<ui::Compositor> compositor); |
33 | 35 |
34 virtual ~SoftwareBrowserCompositorOutputSurface(); | 36 virtual ~SoftwareBrowserCompositorOutputSurface(); |
35 | 37 |
36 private: | 38 private: |
37 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; | 39 virtual void SwapBuffers(cc::CompositorFrame* frame) OVERRIDE; |
38 | 40 |
39 // On the software path we need to explicitly call the proxy to update the | 41 // On the software path we need to explicitly call the proxy to update the |
40 // VSync parameters. | 42 // VSync parameters. |
41 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; | 43 scoped_refptr<BrowserCompositorOutputSurfaceProxy> output_surface_proxy_; |
42 | 44 |
43 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface); | 45 DISALLOW_COPY_AND_ASSIGN(SoftwareBrowserCompositorOutputSurface); |
44 }; | 46 }; |
45 | 47 |
46 } // namespace content | 48 } // namespace content |
47 | 49 |
48 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE
_H_ | 50 #endif // CONTENT_BROWSER_COMPOSITOR_SOFTWARE_BROWSER_COMPOSITOR_OUTPUT_SURFACE
_H_ |
OLD | NEW |