Add DisplayScheduler to enable BeginFrame-based scheduling of surfaces.

content/browser/compositor/onscreen_display_client.cc

Index: content/browser/compositor/onscreen_display_client.cc
diff --git a/content/browser/compositor/onscreen_display_client.cc b/content/browser/compositor/onscreen_display_client.cc
index 6e2241d6cb1fbad34c892784d7a5c1968203a223..db5e7579bacfabf3111ada1207d26fb5c7bf9548 100644
--- a/content/browser/compositor/onscreen_display_client.cc
+++ b/content/browser/compositor/onscreen_display_client.cc
@@ -6,8 +6,7 @@
 
 #include "base/debug/trace_event.h"
 #include "cc/output/output_surface.h"
-#include "cc/surfaces/surface_factory.h"
-#include "cc/surfaces/surface_manager.h"
+#include "cc/surfaces/display_scheduler.h"
 #include "content/browser/compositor/surface_display_output_surface.h"
 #include "content/browser/gpu/browser_gpu_memory_buffer_manager.h"
 #include "content/common/host_shared_bitmap_manager.h"
@@ -23,19 +22,16 @@ OnscreenDisplayClient::OnscreenDisplayClient(
                                manager,
                                HostSharedBitmapManager::current(),
                                BrowserGpuMemoryBufferManager::current())),
-      task_runner_(task_runner),
-      scheduled_draw_(false),
-      output_surface_lost_(false),
-      deferred_draw_(false),
-      pending_frames_(0),
-      weak_ptr_factory_(this) {
+      task_runner_(task_runner) {
 }
 
 OnscreenDisplayClient::~OnscreenDisplayClient() {
 }
 
 bool OnscreenDisplayClient::Initialize() {
-  return display_->Initialize(output_surface_.Pass());
+  scheduler_.reset(new cc::DisplayScheduler(output_surface_.get(),
+                                            display_.get(), task_runner_));
+  return display_->Initialize(output_surface_.Pass(), scheduler_.get());
 }
 
 void OnscreenDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
@@ -43,51 +39,10 @@ void OnscreenDisplayClient::CommitVSyncParameters(base::TimeTicks timebase,
   surface_display_output_surface_->ReceivedVSyncParameters(timebase, interval);
 }
 
-void OnscreenDisplayClient::DisplayDamaged() {
-  if (scheduled_draw_ || deferred_draw_)
-    return;
-  TRACE_EVENT0("content", "OnscreenDisplayClient::DisplayDamaged");
-  if (pending_frames_ >= display_->GetMaxFramesPending()) {
-    deferred_draw_ = true;
-  } else {
-    ScheduleDraw();
-  }
-}
-
-void OnscreenDisplayClient::ScheduleDraw() {
-  DCHECK(!deferred_draw_);
-  DCHECK(!scheduled_draw_);
-  scheduled_draw_ = true;
-  task_runner_->PostTask(
-      FROM_HERE,
-      base::Bind(&OnscreenDisplayClient::Draw, weak_ptr_factory_.GetWeakPtr()));
-}
-
 void OnscreenDisplayClient::OutputSurfaceLost() {
-  output_surface_lost_ = true;
   surface_display_output_surface_->DidLoseOutputSurface();
 }
 
-void OnscreenDisplayClient::Draw() {
-  TRACE_EVENT0("content", "OnscreenDisplayClient::Draw");
-  if (output_surface_lost_)
-    return;
-  scheduled_draw_ = false;
-  display_->Draw();
-}
-
-void OnscreenDisplayClient::DidSwapBuffers() {
-  pending_frames_++;
-}
-
-void OnscreenDisplayClient::DidSwapBuffersComplete() {
-  pending_frames_--;
-  if ((pending_frames_ < display_->GetMaxFramesPending()) && deferred_draw_) {
-    deferred_draw_ = false;
-    ScheduleDraw();
-  }
-}
-
 void OnscreenDisplayClient::SetMemoryPolicy(
     const cc::ManagedMemoryPolicy& policy) {
   surface_display_output_surface_->SetMemoryPolicy(policy);