Add DisplayScheduler for Surfaces

components/surfaces/display_impl.cc

 // Copyright 2015 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 "components/surfaces/display_impl.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/display.h"
 #include "components/surfaces/surfaces_context_provider.h"
 #include "components/surfaces/surfaces_output_surface.h"
@@ skipping 33 matching lines @@
       base::Bind(&DisplayImpl::OnContextCreated, base::Unretained(this)));
   factory_.Create(cc_id_);
 }
 
 void DisplayImpl::OnContextCreated(mojo::CommandBufferPtr gles2_client) {
   DCHECK(!display_);
 
   cc::RendererSettings settings;
   display_.reset(new cc::Display(this, manager_, nullptr, nullptr, settings));
   scheduler_->AddDisplay(display_.get());
-  display_->Initialize(make_scoped_ptr(
-      new surfaces::DirectOutputSurface(new surfaces::SurfacesContextProvider(
-          gles2_client.PassInterface().PassHandle()))));
+
+  // TODO(brianderson): Reconcile with SurfacesScheduler crbug.com/476676
+  cc::DisplayScheduler* null_display_scheduler = nullptr;
+  display_->Initialize(make_scoped_ptr(new surfaces::DirectOutputSurface(
+                           new surfaces::SurfacesContextProvider(
+                               gles2_client.PassInterface().PassHandle()))),
+                       null_display_scheduler);
   display_->Resize(last_submitted_frame_size_);
 
   display_->SetSurfaceId(cc_id_, 1.f);
   if (pending_frame_)
     Draw();
 }
 
 DisplayImpl::~DisplayImpl() {
   if (display_) {
     factory_.Destroy(cc_id_);
@@ skipping 20 matching lines @@
   last_submitted_frame_size_ = frame_size;
   display_->Resize(frame_size);
   factory_.SubmitFrame(cc_id_,
                        pending_frame_.To<scoped_ptr<cc::CompositorFrame>>(),
                        base::Bind(&CallCallback, pending_callback_));
   pending_frame_.reset();
   scheduler_->SetNeedsDraw();
   pending_callback_.reset();
 }
 
-void DisplayImpl::DisplayDamaged() {
-}
-
-void DisplayImpl::DidSwapBuffers() {
-}
-
-void DisplayImpl::DidSwapBuffersComplete() {
-}
-
 void DisplayImpl::CommitVSyncParameters(base::TimeTicks timebase,
                                         base::TimeDelta interval) {
 }
 
 void DisplayImpl::OutputSurfaceLost() {
   if (!display_)  // Shutdown case
     return;
 
   // If our OutputSurface is lost we can't draw until we get a new one. For now,
   // destroy the display and create a new one when our ContextProvider provides
@@ skipping 26 matching lines @@
   DCHECK(returner_);
 
   mojo::Array<mojo::ReturnedResourcePtr> ret(resources.size());
   for (size_t i = 0; i < resources.size(); ++i) {
     ret[i] = mojo::ReturnedResource::From(resources[i]);
   }
   returner_->ReturnResources(ret.Pass());
 }
 
 }  // namespace surfaces