Introduce cc::LocalFrameId and use in SurfaceFactory

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"
 #include "cc/output/compositor_frame_sink_client.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/direct_renderer.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/texture_mailbox_deleter.h"
 
-static constexpr cc::FrameSinkId kCompositorFrameSinkId(1, 1);
+namespace cc {
 
-namespace cc {
+static constexpr FrameSinkId kCompositorFrameSinkId(1, 1);
 
 TestCompositorFrameSink::TestCompositorFrameSink(
     scoped_refptr<ContextProvider> compositor_context_provider,
     scoped_refptr<ContextProvider> worker_context_provider,
     std::unique_ptr<OutputSurface> display_output_surface,
     SharedBitmapManager* shared_bitmap_manager,
     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)),
       frame_sink_id_(kCompositorFrameSinkId),
       surface_manager_(new SurfaceManager),
-      surface_id_allocator_(new SurfaceIdAllocator(frame_sink_id_)),
+      surface_id_allocator_(new SurfaceIdAllocator()),
       surface_factory_(
           new SurfaceFactory(frame_sink_id_, 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 {
@@ skipping 50 matching lines @@
   display_->renderer_for_testing()->SetEnlargePassTextureAmountForTesting(
       enlarge_pass_texture_amount_);
   display_->SetVisible(true);
   bound_ = true;
   return true;
 }
 
 void TestCompositorFrameSink::DetachFromClient() {
   // Some tests make BindToClient fail on purpose. ^__^
   if (bound_) {
-    if (!delegated_surface_id_.is_null())
-      surface_factory_->Destroy(delegated_surface_id_);
+    if (!delegated_local_frame_id_.is_null())
+      surface_factory_->Destroy(delegated_local_frame_id_);
     surface_manager_->UnregisterSurfaceFactoryClient(frame_sink_id_);
     surface_manager_->InvalidateFrameSinkId(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_);
+  if (delegated_local_frame_id_.is_null()) {
+    delegated_local_frame_id_ = surface_id_allocator_->GenerateId();
+    surface_factory_->Create(delegated_local_frame_id_);
   }
-  display_->SetSurfaceId(delegated_surface_id_,
+  display_->SetSurfaceId(SurfaceId(frame_sink_id_, delegated_local_frame_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),
+      delegated_local_frame_id_, std::move(frame),
       base::Bind(&TestCompositorFrameSink::DidDrawCallback,
                  weak_ptrs_.GetWeakPtr(), synchronous));
 
-  for (std::unique_ptr<CopyOutputRequest>& copy_request : copy_requests_)
-    surface_factory_->RequestCopyOfSurface(delegated_surface_id_,
+  for (std::unique_ptr<CopyOutputRequest>& copy_request : copy_requests_) {
+    surface_factory_->RequestCopyOfSurface(delegated_local_frame_id_,
                                            std::move(copy_request));
+  }
   copy_requests_.clear();
 
   if (synchronous)
     display_->DrawAndSwap();
 }
 
 void TestCompositorFrameSink::DidDrawCallback(bool synchronous) {
   // This is the frame ack to unthrottle the next frame, not actually a notice
   // that drawing is done.
   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_,
+      !delegated_local_frame_id_.is_null()) {
+    surface_factory_->SubmitCompositorFrame(delegated_local_frame_id_,
                                             CompositorFrame(),
                                             SurfaceFactory::DrawCallback());
   }
 }
 
 void TestCompositorFrameSink::ReturnResources(
     const ReturnedResourceArray& resources) {
   client_->ReclaimResources(resources);
 }
 
@@ skipping 12 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