cc: Plumbing for BeginFrameSource based on Surfaces

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 "base/thread_task_runner_handle.h"
 #include "base/trace_event/trace_event.h"
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/output/compositor_frame.h"
@@ skipping 113 matching lines @@
     if (!renderer)
       return;
     renderer_ = renderer.Pass();
   }
 
   resource_provider_ = resource_provider.Pass();
   // 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(manager_, resource_provider_.get(),
-                                          output_partial_list));
+  aggregator_.reset(new SurfaceAggregator(
+      this, 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_);
+
+  // TODO(brianderson): Make sure all users of Display provide a
+  // DisplayScheduler. crbug.com/476676

[mithro-old, 2015/10/01 03:00:23]

nit: Can you put http:// before this URL so it becomes clickable?

[brianderson, 2015/10/07 20:54:48]

Done.

+  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_);
+
+  // TODO(brianderson): Make sure all users of Display provide a
+  // DisplayScheduler. crbug.com/476676
+  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 164 matching lines @@
 
   if (surface_id == current_surface_id_)
     UpdateRootSurfaceResourcesLocked();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc