Hook up ui::Compositor to Display's BeginFrameSource

content/browser/compositor/browser_compositor_output_surface.h

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 b3b9a4bd7a76cb8051c689c2186a26be8618abca..6316fc53bc276af6108a653e85bdcd2aa46fc509 100644
--- a/content/browser/compositor/browser_compositor_output_surface.h
+++ b/content/browser/compositor/browser_compositor_output_surface.h
@@ -9,6 +9,7 @@
 #include "base/threading/non_thread_safe.h"
 #include "build/build_config.h"
 #include "cc/output/output_surface.h"
+#include "cc/scheduler/begin_frame_source.h"
 #include "content/common/content_export.h"
 #include "ui/compositor/compositor_vsync_manager.h"
 
@@ -68,15 +69,18 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
       const scoped_refptr<cc::ContextProvider>& context,
       const scoped_refptr<cc::ContextProvider>& worker_context,
       const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
+      scoped_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source,
       scoped_ptr<BrowserCompositorOverlayCandidateValidator>
           overlay_candidate_validator);
 
   // Constructor used by the software implementation.
   BrowserCompositorOutputSurface(
       scoped_ptr<cc::SoftwareOutputDevice> software_device,
-      const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager);
+      const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
+      scoped_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source);
 
   scoped_refptr<ui::CompositorVSyncManager> vsync_manager_;
+  scoped_ptr<cc::SyntheticBeginFrameSource> synthetic_begin_frame_source_;
   ReflectorImpl* reflector_;
 
   // True when BeginFrame scheduling is enabled.
@@ -85,6 +89,9 @@ class CONTENT_EXPORT BrowserCompositorOutputSurface
  private:
   void Initialize();
 
+  void UpdateVSyncParametersInternal(base::TimeTicks timebase,
+                                     base::TimeDelta interval);
+
   scoped_ptr<BrowserCompositorOverlayCandidateValidator>
       overlay_candidate_validator_;