Hook up BeginFrameSource to SurfaceFactoryClient via SurfaceManager

cc/surfaces/display.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/surfaces/display.h"
 
 #include <stddef.h>
 
 #include "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 38 matching lines @@
     for (const auto& id_entry : aggregator_->previous_contained_surfaces()) {
       Surface* surface = manager_->GetSurfaceForId(id_entry.first);
       if (surface)
         surface->RunDrawCallbacks(SurfaceDrawStatus::DRAW_SKIPPED);
     }
   }
 }
 
 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);
 }
 
 void Display::SetSurfaceId(SurfaceId id, float device_scale_factor) {
   if (current_surface_id_ == id && device_scale_factor_ == device_scale_factor)
     return;
 
   TRACE_EVENT0("cc", "Display::SetSurfaceId");
@@ skipping 58 matching lines @@
     if (!renderer)
       return;
     renderer_ = std::move(renderer);
   }
 
   resource_provider_ = std::move(resource_provider);
   // TODO(jbauman): Outputting an incomplete quad list doesn't work when using
   // 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() {
   if (scheduler_)
     scheduler_->OutputSurfaceLost();
   // WARNING: The client may delete the Display in this method call. Do not
   // make any additional references to members after this call.
   client_->OutputSurfaceLost();
 }
 
 void Display::UpdateRootSurfaceResourcesLocked() {
   Surface* surface = manager_->GetSurfaceForId(current_surface_id_);
   bool root_surface_resources_locked = !surface || !surface->GetEligibleFrame();
   if (scheduler_)
     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");
 
   if (current_surface_id_.is_null()) {
     TRACE_EVENT_INSTANT0("cc", "No root surface.", TRACE_EVENT_SCOPE_THREAD);
     return false;
   }
 
   InitializeRenderer();
   if (!output_surface_) {
@@ skipping 172 matching lines @@
 
   if (surface_id == current_surface_id_)
     UpdateRootSurfaceResourcesLocked();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc