Revert of cc: Remove frame queuing from the scheduler. (patchset #14 id:400001 of https://coderevie…

cc/test/test_compositor_frame_sink.cc

 // Copyright 2016 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/test/test_compositor_frame_sink.h"
 
 #include <stdint.h>
 #include <utility>
 
 #include "cc/output/begin_frame_args.h"
@@ skipping 16 matching lines @@
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     const RendererSettings& renderer_settings,
     base::SingleThreadTaskRunner* task_runner,
     bool synchronous_composite,
     bool force_disable_reclaim_resources)
     : CompositorFrameSink(std::move(compositor_context_provider),
                           std::move(worker_context_provider)),
       surface_manager_(new SurfaceManager),
       surface_id_allocator_(new SurfaceIdAllocator(
           FrameSinkId(kCompositorClientId, kCompositorSinkId))),
-      surface_factory_(new SurfaceFactory(surface_manager_.get(), this)) {
+      surface_factory_(new SurfaceFactory(surface_manager_.get(), this)),
+      weak_ptrs_(this) {
   std::unique_ptr<SyntheticBeginFrameSource> begin_frame_source;
   std::unique_ptr<DisplayScheduler> scheduler;
   if (!synchronous_composite) {
     if (renderer_settings.disable_display_vsync) {
       begin_frame_source.reset(new BackToBackBeginFrameSource(
           base::MakeUnique<DelayBasedTimeSource>(task_runner)));
     } else {
       begin_frame_source.reset(new DelayBasedBeginFrameSource(
           base::MakeUnique<DelayBasedTimeSource>(task_runner)));
       begin_frame_source->SetAuthoritativeVSyncInterval(
@@ skipping 61 matching lines @@
     surface_manager_->UnregisterSurfaceFactoryClient(
         surface_id_allocator_->frame_sink_id());
     surface_manager_->InvalidateFrameSinkId(
         surface_id_allocator_->frame_sink_id());
     bound_ = false;
   }
   display_ = nullptr;
   surface_factory_ = nullptr;
   surface_id_allocator_ = nullptr;
   surface_manager_ = nullptr;
+  weak_ptrs_.InvalidateWeakPtrs();
   CompositorFrameSink::DetachFromClient();
 }
 
 void TestCompositorFrameSink::SwapBuffers(CompositorFrame frame) {
   if (test_client_)
     test_client_->DisplayReceivedCompositorFrame(frame);
 
   if (delegated_surface_id_.is_null()) {
     delegated_surface_id_ = surface_id_allocator_->GenerateId();
     surface_factory_->Create(delegated_surface_id_);
   }
   display_->SetSurfaceId(delegated_surface_id_,
                          frame.metadata.device_scale_factor);
 
   gfx::Size frame_size =
       frame.delegated_frame_data->render_pass_list.back()->output_rect.size();
   display_->Resize(frame_size);
 
   bool synchronous = !display_->has_scheduler();
 
   surface_factory_->SubmitCompositorFrame(
       delegated_surface_id_, std::move(frame),
       base::Bind(&TestCompositorFrameSink::DidDrawCallback,
-                 base::Unretained(this)));
+                 weak_ptrs_.GetWeakPtr(), synchronous));
 
   for (std::unique_ptr<CopyOutputRequest>& copy_request : copy_requests_)
     surface_factory_->RequestCopyOfSurface(delegated_surface_id_,
                                            std::move(copy_request));
   copy_requests_.clear();
 
   if (synchronous)
     display_->DrawAndSwap();
 }
 
-void TestCompositorFrameSink::DidDrawCallback() {
+void TestCompositorFrameSink::DidDrawCallback(bool synchronous) {
   // This is the frame ack to unthrottle the next frame, not actually a notice
   // that drawing is done.
-  CompositorFrameSink::PostSwapBuffersComplete();
+  if (synchronous) {
+    // For synchronous draws, this must be posted to a new stack because we are
+    // still the original call to SwapBuffers, and we want to leave that before
+    // saying that it is done.
+    CompositorFrameSink::PostSwapBuffersComplete();
+  } else {
+    client_->DidSwapBuffersComplete();
+  }
 }
 
 void TestCompositorFrameSink::ForceReclaimResources() {
   if (capabilities_.can_force_reclaim_resources &&
       !delegated_surface_id_.is_null()) {
     surface_factory_->SubmitCompositorFrame(delegated_surface_id_,
                                             CompositorFrame(),
                                             SurfaceFactory::DrawCallback());
   }
 }
@@ skipping 18 matching lines @@
   if (test_client_)
     test_client_->DisplayWillDrawAndSwap(will_draw_and_swap, render_passes);
 }
 
 void TestCompositorFrameSink::DisplayDidDrawAndSwap() {
   if (test_client_)
     test_client_->DisplayDidDrawAndSwap();
 }
 
 }  // namespace cc