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/id_map.h" | 8 #include "base/id_map.h" |
9 #include "base/memory/weak_ptr.h" | |
10 #include "base/threading/non_thread_safe.h" | 9 #include "base/threading/non_thread_safe.h" |
11 #include "cc/output/output_surface.h" | 10 #include "cc/output/output_surface.h" |
12 #include "content/common/content_export.h" | 11 #include "content/common/content_export.h" |
13 | 12 #include "ui/compositor/compositor_vsync_manager.h" |
14 namespace base { class MessageLoopProxy; } | |
15 | 13 |
16 namespace cc { | 14 namespace cc { |
17 class SoftwareOutputDevice; | 15 class SoftwareOutputDevice; |
18 } | 16 } |
19 | 17 |
20 namespace ui { class Compositor; } | 18 namespace ui { |
| 19 class Compositor; |
| 20 } |
21 | 21 |
22 namespace content { | 22 namespace content { |
23 class ContextProviderCommandBuffer; | 23 class ContextProviderCommandBuffer; |
24 class ReflectorImpl; | 24 class ReflectorImpl; |
25 class WebGraphicsContext3DCommandBufferImpl; | 25 class WebGraphicsContext3DCommandBufferImpl; |
26 | 26 |
27 class CONTENT_EXPORT BrowserCompositorOutputSurface | 27 class CONTENT_EXPORT BrowserCompositorOutputSurface |
28 : public cc::OutputSurface, | 28 : public cc::OutputSurface, |
| 29 public ui::CompositorVSyncManager::Observer, |
29 public base::NonThreadSafe { | 30 public base::NonThreadSafe { |
30 public: | 31 public: |
31 virtual ~BrowserCompositorOutputSurface(); | 32 virtual ~BrowserCompositorOutputSurface(); |
32 | 33 |
33 // cc::OutputSurface implementation. | 34 // cc::OutputSurface implementation. |
34 virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE; | 35 virtual bool BindToClient(cc::OutputSurfaceClient* client) OVERRIDE; |
35 virtual void Reshape(const gfx::Size& size, float scale_factor) OVERRIDE; | 36 virtual void Reshape(const gfx::Size& size, float scale_factor) OVERRIDE; |
36 | 37 |
37 void OnUpdateVSyncParameters(base::TimeTicks timebase, | 38 // ui::CompositorOutputSurface::Observer implementation. |
38 base::TimeDelta interval); | 39 virtual void OnUpdateVSyncParameters(base::TimeTicks timebase, |
| 40 base::TimeDelta interval) OVERRIDE; |
| 41 |
| 42 void OnUpdateVSyncParametersFromGpu(base::TimeTicks tiembase, |
| 43 base::TimeDelta interval); |
39 | 44 |
40 void SetReflector(ReflectorImpl* reflector); | 45 void SetReflector(ReflectorImpl* reflector); |
41 | 46 |
42 protected: | 47 protected: |
43 // Constructor used by the accelerated implementation. | 48 // Constructor used by the accelerated implementation. |
44 BrowserCompositorOutputSurface( | 49 BrowserCompositorOutputSurface( |
45 const scoped_refptr<ContextProviderCommandBuffer>& context, | 50 const scoped_refptr<ContextProviderCommandBuffer>& context, |
46 int surface_id, | 51 int surface_id, |
47 IDMap<BrowserCompositorOutputSurface>* output_surface_map, | 52 IDMap<BrowserCompositorOutputSurface>* output_surface_map, |
48 base::MessageLoopProxy* compositor_message_loop, | 53 ui::Compositor* compositor); |
49 base::WeakPtr<ui::Compositor> compositor); | |
50 | 54 |
51 // Constructor used by the software implementation. | 55 // Constructor used by the software implementation. |
52 BrowserCompositorOutputSurface( | 56 BrowserCompositorOutputSurface( |
53 scoped_ptr<cc::SoftwareOutputDevice> software_device, | 57 scoped_ptr<cc::SoftwareOutputDevice> software_device, |
54 int surface_id, | 58 int surface_id, |
55 IDMap<BrowserCompositorOutputSurface>* output_surface_map, | 59 IDMap<BrowserCompositorOutputSurface>* output_surface_map, |
56 base::MessageLoopProxy* compositor_message_loop, | 60 ui::Compositor* compositor); |
57 base::WeakPtr<ui::Compositor> compositor); | |
58 | 61 |
59 int surface_id_; | 62 int surface_id_; |
60 IDMap<BrowserCompositorOutputSurface>* output_surface_map_; | 63 IDMap<BrowserCompositorOutputSurface>* output_surface_map_; |
61 | 64 |
62 scoped_refptr<base::MessageLoopProxy> compositor_message_loop_; | 65 scoped_refptr<ui::CompositorVSyncManager> vsync_manager_; |
63 base::WeakPtr<ui::Compositor> compositor_; | |
64 scoped_refptr<ReflectorImpl> reflector_; | 66 scoped_refptr<ReflectorImpl> reflector_; |
65 | 67 |
66 private: | 68 private: |
67 void Initialize(); | 69 void Initialize(); |
68 | 70 |
69 DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurface); | 71 DISALLOW_COPY_AND_ASSIGN(BrowserCompositorOutputSurface); |
70 }; | 72 }; |
71 | 73 |
72 } // namespace content | 74 } // namespace content |
73 | 75 |
74 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ | 76 #endif // CONTENT_BROWSER_COMPOSITOR_BROWSER_COMPOSITOR_OUTPUT_SURFACE_H_ |
OLD | NEW |