Revert of cc: Make LayerTreeTests use a DelegatingRenderer and Display.

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 <stddef.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 270 matching lines @@
   bool should_draw = have_copy_requests || (have_damage && size_matches);
 
   // If the surface is suspended then the resources to be used by the draw are
   // likely destroyed.
   if (output_surface_->SurfaceIsSuspendForRecycle()) {
     TRACE_EVENT_INSTANT0("cc", "Surface is suspended for recycle.",
                          TRACE_EVENT_SCOPE_THREAD);
     should_draw = false;
   }
 
-  client_->DisplayWillDrawAndSwap(should_draw, frame_data->render_pass_list);
-
   if (should_draw) {
     gfx::Rect device_viewport_rect = external_viewport_.IsEmpty()
                                          ? gfx::Rect(current_surface_size_)
                                          : external_viewport_;
     gfx::Rect device_clip_rect =
         external_clip_.IsEmpty() ? device_viewport_rect : external_clip_;
 
     bool disable_image_filtering =
         frame.metadata.is_resourceless_software_draw_with_scroll_or_animation;
     if (software_renderer_) {
@@ skipping 31 matching lines @@
       aggregator_->SetFullDamageForSurface(current_surface_id_);
     TRACE_EVENT_INSTANT0("cc", "Swap skipped.", TRACE_EVENT_SCOPE_THREAD);
     stored_latency_info_.insert(stored_latency_info_.end(),
                                 frame.metadata.latency_info.begin(),
                                 frame.metadata.latency_info.end());
     if (scheduler_)
       scheduler_->DidSwapBuffers();
     DidSwapBuffersComplete();
   }
 
-  client_->DisplayDidDrawAndSwap();
   return true;
 }
 
 void Display::DidSwapBuffersComplete() {
   if (scheduler_)
     scheduler_->DidSwapBuffersComplete();
   if (renderer_)
     renderer_->SwapBuffersComplete();
 }
 
@@ skipping 72 matching lines @@
 
   if (surface_id == current_surface_id_)
     UpdateRootSurfaceResourcesLocked();
 }
 
 const SurfaceId& Display::CurrentSurfaceId() {
   return current_surface_id_;
 }
 
 }  // namespace cc