Add DisplayScheduler to enable BeginFrame-based scheduling of 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/debug/trace_event.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/debug/benchmark_instrumentation.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/gl_renderer.h"
 #include "cc/output/software_renderer.h"
 #include "cc/resources/texture_mailbox_deleter.h"
 #include "cc/surfaces/display_client.h"
+#include "cc/surfaces/display_scheduler.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_aggregator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/trees/blocking_task_runner.h"
 
 namespace cc {
 
 Display::Display(DisplayClient* client,
                  SurfaceManager* manager,
                  SharedBitmapManager* bitmap_manager,
                  gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager)
     : client_(client),
       manager_(manager),
       bitmap_manager_(bitmap_manager),
       gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
       device_scale_factor_(1.f),
       blocking_main_thread_task_runner_(
           BlockingTaskRunner::Create(base::MessageLoopProxy::current())),
       texture_mailbox_deleter_(
           new TextureMailboxDeleter(base::MessageLoopProxy::current())) {
   manager_->AddObserver(this);
 }
 
 Display::~Display() {
   manager_->RemoveObserver(this);
 }
 
-bool Display::Initialize(scoped_ptr<OutputSurface> output_surface) {
+bool Display::Initialize(scoped_ptr<OutputSurface> output_surface,
+                         DisplayScheduler* scheduler) {
   output_surface_ = output_surface.Pass();
+  scheduler_ = scheduler;
   return output_surface_->BindToClient(this);
 }
 
 void Display::Resize(SurfaceId id,
                      const gfx::Size& size,
                      float device_scale_factor) {
   current_surface_id_ = id;
   current_surface_size_ = size;
   device_scale_factor_ = device_scale_factor;
-  client_->DisplayDamaged();
+  scheduler_->DisplayDamaged();
 }
 
 void Display::InitializeRenderer() {
   if (resource_provider_)
     return;
 
   int highp_threshold_min = 0;
   bool use_rgba_4444_texture_format = false;
   size_t id_allocation_chunk_size = 1;
   scoped_ptr<ResourceProvider> resource_provider =
@@ skipping 25 matching lines @@
       return;
     renderer_ = renderer.Pass();
   }
 
   resource_provider_ = resource_provider.Pass();
   aggregator_.reset(new SurfaceAggregator(manager_, resource_provider_.get()));
 }
 
 void Display::DidLoseOutputSurface() {
   client_->OutputSurfaceLost();
+  scheduler_->OutputSurfaceLost();
 }
 
 bool Display::Draw() {
   if (current_surface_id_.is_null())
     return false;
 
   InitializeRenderer();
   if (!output_surface_)
     return false;
 
@@ skipping 24 matching lines @@
        it != aggregator_->previous_contained_surfaces().end();
        ++it) {
     Surface* surface = manager_->GetSurfaceForId(it->first);
     if (surface)
       surface->RunDrawCallbacks();
   }
   return true;
 }
 
 void Display::DidSwapBuffers() {
-  client_->DidSwapBuffers();
+  scheduler_->DidSwapBuffers();
 }
 
 void Display::DidSwapBuffersComplete() {
-  client_->DidSwapBuffersComplete();
+  scheduler_->DidSwapBuffersComplete();
 }
 
 void Display::CommitVSyncParameters(base::TimeTicks timebase,
                                     base::TimeDelta interval) {
   client_->CommitVSyncParameters(timebase, interval);
+  scheduler_->CommitVSyncParameters(timebase, interval);
 }
 
 void Display::SetMemoryPolicy(const ManagedMemoryPolicy& policy) {
   client_->SetMemoryPolicy(policy);
 }
 
 void Display::OnSurfaceDamaged(SurfaceId surface) {
   if (aggregator_ && aggregator_->previous_contained_surfaces().count(surface))
-    client_->DisplayDamaged();
+    scheduler_->DisplayDamaged();
 }
 
 SurfaceId Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 int Display::GetMaxFramesPending() {
   if (!output_surface_)
     return OutputSurface::DEFAULT_MAX_FRAMES_PENDING;
   return output_surface_->capabilities().max_frames_pending;
 }
 
 }  // namespace cc