Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

cc/surfaces/display.cc

Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index b8ba195994aa733564798e0b0404f698faf2dce6..6866cedc9cf27654d5e0ebcee75cbda329dae739 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -56,6 +56,7 @@ Display::~Display() {
 
 bool Display::Initialize(scoped_ptr<OutputSurface> output_surface,
                          DisplayScheduler* scheduler) {
+  // TODO(enne): register/unregister BeginFrameSource with SurfaceManager here.
   output_surface_ = std::move(output_surface);
   scheduler_ = scheduler;
   return output_surface_->BindToClient(this);
@@ -134,8 +135,8 @@ void Display::InitializeRenderer() {
   // overlays.
   bool output_partial_list = renderer_->Capabilities().using_partial_swap &&
                              !output_surface_->GetOverlayCandidateValidator();
-  aggregator_.reset(new SurfaceAggregator(
-      this, manager_, resource_provider_.get(), output_partial_list));
+  aggregator_.reset(new SurfaceAggregator(manager_, resource_provider_.get(),
+                                          output_partial_list));
 }
 
 void Display::DidLoseOutputSurface() {
@@ -153,31 +154,6 @@ void Display::UpdateRootSurfaceResourcesLocked() {
     scheduler_->SetRootSurfaceResourcesLocked(root_surface_resources_locked);
 }
 
-void Display::AddSurface(Surface* surface) {
-  // Checking for the output_surface ensures Display::Initialize has been
-  // called and that scheduler_ won't change its value.
-  DCHECK(output_surface_);
-
-  // WebView's HardwareRenderer will never have a scheduler.
-  if (!scheduler_)
-    return;
-
-  surface->AddBeginFrameSource(scheduler_->begin_frame_source_for_children());
-}
-
-void Display::RemoveSurface(Surface* surface) {
-  // Checking for the output_surface ensures Display::Initialize has been
-  // called and that scheduler_ won't change its value.
-  DCHECK(output_surface_);
-
-  // WebView's HardwareRenderer will never have a scheduler.
-  if (!scheduler_)
-    return;
-
-  surface->RemoveBeginFrameSource(
-      scheduler_->begin_frame_source_for_children());
-}
-
 bool Display::DrawAndSwap() {
   TRACE_EVENT0("cc", "Display::DrawAndSwap");