Index: content/browser/compositor/browser_compositor_output_surface.h |
diff --git a/content/browser/compositor/browser_compositor_output_surface.h b/content/browser/compositor/browser_compositor_output_surface.h |
index dc63b68a88b7a3ade89a3b4d7a9d7308ace04fae..615a54e30c5ab928021fa3017529fdaf413ff82e 100644 |
--- a/content/browser/compositor/browser_compositor_output_surface.h |
+++ b/content/browser/compositor/browser_compositor_output_surface.h |
@@ -8,6 +8,7 @@ |
#include "base/threading/non_thread_safe.h" |
#include "cc/output/output_surface.h" |
#include "content/common/content_export.h" |
+#include "ui/compositor/compositor_vsync_manager.h" |
namespace cc { |
class SoftwareOutputDevice; |
@@ -20,11 +21,18 @@ |
class WebGraphicsContext3DCommandBufferImpl; |
class CONTENT_EXPORT BrowserCompositorOutputSurface |
- : public cc::OutputSurface { |
+ : public cc::OutputSurface, |
+ public ui::CompositorVSyncManager::Observer { |
public: |
~BrowserCompositorOutputSurface() override; |
+ // cc::OutputSurface implementation. |
+ bool BindToClient(cc::OutputSurfaceClient* client) override; |
cc::OverlayCandidateValidator* GetOverlayCandidateValidator() const override; |
+ |
+ // ui::CompositorOutputSurface::Observer implementation. |
+ void OnUpdateVSyncParameters(base::TimeTicks timebase, |
+ base::TimeDelta interval) override; |
void OnUpdateVSyncParametersFromGpu(base::TimeTicks tiembase, |
base::TimeDelta interval); |
@@ -41,13 +49,16 @@ |
// Constructor used by the accelerated implementation. |
BrowserCompositorOutputSurface( |
const scoped_refptr<cc::ContextProvider>& context, |
+ const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager, |
scoped_ptr<BrowserCompositorOverlayCandidateValidator> |
overlay_candidate_validator); |
// Constructor used by the software implementation. |
- explicit BrowserCompositorOutputSurface( |
- scoped_ptr<cc::SoftwareOutputDevice> software_device); |
+ BrowserCompositorOutputSurface( |
+ scoped_ptr<cc::SoftwareOutputDevice> software_device, |
+ const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager); |
+ scoped_refptr<ui::CompositorVSyncManager> vsync_manager_; |
ReflectorImpl* reflector_; |
private: |