Add DisplayScheduler for Surfaces

cc/surfaces/display.cc

Index: cc/surfaces/display.cc
diff --git a/cc/surfaces/display.cc b/cc/surfaces/display.cc
index 7ec46727385581123b61289e353b1d6d98821024..1cb1af490372b6641e85628a8276fb1f04969215 100644
--- a/cc/surfaces/display.cc
+++ b/cc/surfaces/display.cc
@@ -15,6 +15,7 @@
 #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"
@@ -33,6 +34,7 @@ Display::Display(DisplayClient* client,
       gpu_memory_buffer_manager_(gpu_memory_buffer_manager),
       settings_(settings),
       device_scale_factor_(1.f),
+      scheduler_(nullptr),
       blocking_main_thread_task_runner_(
           BlockingTaskRunner::Create(base::MessageLoopProxy::current())),
       texture_mailbox_deleter_(
@@ -51,15 +53,23 @@ Display::~Display() {
   }
 }
 
-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::SetSurfaceId(SurfaceId id, float device_scale_factor) {
+  if (current_surface_id_ == id && device_scale_factor_ == device_scale_factor)
+    return;
+
   current_surface_id_ = id;
+  UpdateResourcesLockedByBrowser();
+
   device_scale_factor_ = device_scale_factor;
-  client_->DisplayDamaged();
+  if (scheduler_)
+    scheduler_->EntireDisplayDamaged();
 }
 
 void Display::Resize(const gfx::Size& size) {
@@ -70,7 +80,8 @@ void Display::Resize(const gfx::Size& size) {
   if (renderer_ && settings_.finish_rendering_on_resize)
     renderer_->Finish();
   current_surface_size_ = size;
-  client_->DisplayDamaged();
+  if (scheduler_)
+    scheduler_->EntireDisplayDamaged();
 }
 
 void Display::InitializeRenderer() {
@@ -106,9 +117,23 @@ void Display::InitializeRenderer() {
 
 void Display::DidLoseOutputSurface() {
   client_->OutputSurfaceLost();
+  scheduler_->OutputSurfaceLost();
 }
 
-bool Display::Draw() {
+void Display::UpdateResourcesLockedByBrowser() {
+  bool resources_locked_by_browser = true;
+  Surface* surface = manager_->GetSurfaceForId(current_surface_id_);
+  if (surface) {
+    const CompositorFrame* current_frame = surface->GetEligibleFrame();
+    if (!current_frame || !current_frame->delegated_frame_data ||
+        !current_frame->delegated_frame_data->resource_list.size()) {
+      resources_locked_by_browser = false;

[jbauman, 2015/04/07 23:51:30]

I think this is wrong - this is the "resources_locked_by_browser = true" case -
as the resources are locked by the browser if the frame or resource list is
empty.

[brianderson, 2015/04/08 02:23:02]

Oops!

+    }
+  }
+  scheduler_->SetResourcesLockedByBrowser(resources_locked_by_browser);
+}
+
+bool Display::DrawAndSwap() {
   if (current_surface_id_.is_null())
     return false;
 
@@ -123,7 +148,7 @@ bool Display::Draw() {
   if (!frame)
     return false;
 
-  TRACE_EVENT0("cc", "Display::Draw");
+  TRACE_EVENT0("cc", "Display::DrawAndSwap");
   benchmark_instrumentation::IssueDisplayRenderingStatsEvent();
 
   // Run callbacks early to allow pipelining.
@@ -180,11 +205,11 @@ bool Display::Draw() {
 }
 
 void Display::DidSwapBuffers() {
-  client_->DidSwapBuffers();
+  scheduler_->DidSwapBuffers();
 }
 
 void Display::DidSwapBuffersComplete() {
-  client_->DidSwapBuffersComplete();
+  scheduler_->DidSwapBuffersComplete();
 }
 
 void Display::CommitVSyncParameters(base::TimeTicks timebase,
@@ -203,15 +228,20 @@ void Display::OnSurfaceDamaged(SurfaceId surface_id, bool* changed) {
     if (surface) {
       const CompositorFrame* current_frame = surface->GetEligibleFrame();
       if (!current_frame || !current_frame->delegated_frame_data ||
-          !current_frame->delegated_frame_data->resource_list.size())
+          !current_frame->delegated_frame_data->resource_list.size()) {
         aggregator_->ReleaseResources(surface_id);
+      }
     }
-    client_->DisplayDamaged();
+    scheduler_->SurfaceDamaged(surface_id);
     *changed = true;
   } else if (surface_id == current_surface_id_) {
-    client_->DisplayDamaged();
+    scheduler_->SurfaceDamaged(surface_id);
     *changed = true;
   }
+
+  if (surface_id == current_surface_id_) {
+    UpdateResourcesLockedByBrowser();
+  }
 }
 
 SurfaceId Display::CurrentSurfaceId() {