Revert of Add DisplayScheduler for Surfaces

mojo/services/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 "mojo/services/surfaces/display_impl.h"
 
 #include "cc/output/compositor_frame.h"
 #include "cc/surfaces/display.h"
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "mojo/converters/surfaces/surfaces_type_converters.h"
@@ skipping 28 matching lines @@
       viewport_parameter_listener.Pass(),
       base::Bind(&DisplayImpl::OnContextCreated, base::Unretained(this)));
 }
 
 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());
-
-  // TODO(brianderson): Reconcile with SurfacesScheduler crbug.com/476676
-  cc::DisplayScheduler* null_display_scheduler = nullptr;
   display_->Initialize(make_scoped_ptr(new mojo::DirectOutputSurface(
-      new mojo::ContextProviderMojo(gles2_client.PassMessagePipe()))),
-      null_display_scheduler);
+      new mojo::ContextProviderMojo(gles2_client.PassMessagePipe()))));
 
   factory_.Create(cc_id_);
   display_->SetSurfaceId(cc_id_, 1.f);
   if (pending_frame_)
     Draw();
 }
 
 DisplayImpl::~DisplayImpl() {
   if (display_) {
     factory_.Destroy(cc_id_);
@@ skipping 14 matching lines @@
   gfx::Size frame_size =
       pending_frame_->passes[0]->output_rect.To<gfx::Rect>().size();
   display_->Resize(frame_size);
   factory_.SubmitFrame(cc_id_,
                        pending_frame_.To<scoped_ptr<cc::CompositorFrame>>(),
                        base::Bind(&CallCallback, pending_callback_));
   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 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
   // a new one.
   // TODO: This is more violent than necessary - we could simply remove this
   // display from the scheduler's set and pass a new context in to the
@@ skipping 24 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