cc: Set sync token on resource even if context is lost.

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 17 matching lines @@
     base::SingleThreadTaskRunner* task_runner,
     bool synchronous_composite,
     bool force_disable_reclaim_resources)
     : CompositorFrameSink(std::move(compositor_context_provider),
                           std::move(worker_context_provider)),
       frame_sink_id_(kCompositorFrameSinkId),
       surface_manager_(new SurfaceManager),
       surface_id_allocator_(new SurfaceIdAllocator(frame_sink_id_)),
       surface_factory_(
           new SurfaceFactory(frame_sink_id_, surface_manager_.get(), this)),
+      display_context_shared_with_compositor_(
+          display_output_surface->context_provider() == context_provider()),
       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(
           base::TimeDelta::FromMilliseconds(1000.f /
                                             renderer_settings.refresh_rate));
     }
     scheduler.reset(new DisplayScheduler(
         begin_frame_source.get(), task_runner,
         display_output_surface->capabilities().max_frames_pending));
   }
-  const bool context_shared_with_compositor =
-      display_output_surface->context_provider() == context_provider();
   display_.reset(
       new Display(shared_bitmap_manager, gpu_memory_buffer_manager,
                   renderer_settings, std::move(begin_frame_source),
                   std::move(display_output_surface), std::move(scheduler),
                   base::MakeUnique<TextureMailboxDeleter>(task_runner)));
 
   // Since this CompositorFrameSink and the Display are tightly coupled and in
   // the same process/thread, the LayerTreeHostImpl can reclaim resources from
   // the Display. But we allow tests to disable this to mimic an out-of-process
   // Display.
   capabilities_.can_force_reclaim_resources = !force_disable_reclaim_resources;
-  capabilities_.delegated_sync_points_required =
-      !context_shared_with_compositor;
+  // Always use sync tokens so that code paths in resource provider that deal
+  // with sync tokens are tested.
+  capabilities_.delegated_sync_points_required = true;
 }
 
 TestCompositorFrameSink::~TestCompositorFrameSink() {
   DCHECK(copy_requests_.empty());
 }
 
 void TestCompositorFrameSink::RequestCopyOfOutput(
     std::unique_ptr<CopyOutputRequest> request) {
   copy_requests_.push_back(std::move(request));
 }
 
 bool TestCompositorFrameSink::BindToClient(CompositorFrameSinkClient* client) {
   if (!CompositorFrameSink::BindToClient(client))
     return false;
 
-  // We want the Display's OutputSurface to hear about lost context, and since
-  // this shares a context with it (when delegated_sync_points_required is
-  // false), we should not be listening for lost context callbacks on the
-  // context here.
-  if (!capabilities_.delegated_sync_points_required && context_provider())
+  // We want the Display's OutputSurface to hear about lost context, and when
+  // this shares a context with it we should not be listening for lost context
+  // callbacks on the context here.
+  if (display_context_shared_with_compositor_ && context_provider())
     context_provider()->SetLostContextCallback(base::Closure());
 
   surface_manager_->RegisterFrameSinkId(frame_sink_id_);
   surface_manager_->RegisterSurfaceFactoryClient(frame_sink_id_, this);
   display_->Initialize(this, surface_manager_.get(), frame_sink_id_);
   display_->renderer_for_testing()->SetEnlargePassTextureAmountForTesting(
       enlarge_pass_texture_amount_);
   display_->SetVisible(true);
   bound_ = true;
   return true;
@@ skipping 89 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