Introduce cc::LocalFrameId and use in SurfaceFactory

services/ui/surfaces/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 "services/ui/surfaces/compositor_frame_sink.h"
 
 #include "cc/output/copy_output_request.h"
 #include "cc/output/output_surface.h"
 #include "cc/output/renderer_settings.h"
 #include "cc/output/texture_mailbox_deleter.h"
@@ skipping 15 matching lines @@
 namespace surfaces {
 
 CompositorFrameSink::CompositorFrameSink(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     gfx::AcceleratedWidget widget,
     scoped_refptr<gpu::GpuChannelHost> gpu_channel,
     const scoped_refptr<DisplayCompositor>& display_compositor)
     : frame_sink_id_(display_compositor->GenerateNextClientId(), 0),
       task_runner_(task_runner),
       display_compositor_(display_compositor),
-      factory_(frame_sink_id_, display_compositor->manager(), this),
-      allocator_(frame_sink_id_) {
+      factory_(frame_sink_id_, display_compositor->manager(), this) {
   display_compositor_->manager()->RegisterFrameSinkId(frame_sink_id_);
   display_compositor_->manager()->RegisterSurfaceFactoryClient(frame_sink_id_,
                                                                this);
 
   gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager =
       gpu_channel->gpu_memory_buffer_manager();
   scoped_refptr<SurfacesContextProvider> surfaces_context_provider(
       new SurfacesContextProvider(widget, std::move(gpu_channel)));
   // TODO(rjkroege): If there is something better to do than CHECK, add it.
   CHECK(surfaces_context_provider->BindToCurrentThread());
@@ skipping 38 matching lines @@
       frame_sink_id_);
   display_compositor_->manager()->InvalidateFrameSinkId(frame_sink_id_);
 }
 
 void CompositorFrameSink::SubmitCompositorFrame(
     cc::CompositorFrame frame,
     const base::Callback<void()>& callback) {
   gfx::Size frame_size =
       frame.delegated_frame_data->render_pass_list.back()->output_rect.size();
   if (frame_size.IsEmpty() || frame_size != display_size_) {
-    if (!surface_id_.is_null())
-      factory_.Destroy(surface_id_);
-    surface_id_ = allocator_.GenerateId();
-    factory_.Create(surface_id_);
+    if (!local_frame_id_.is_null())
+      factory_.Destroy(local_frame_id_);
+    local_frame_id_ = allocator_.GenerateId();
+    factory_.Create(local_frame_id_);
     display_size_ = frame_size;
     display_->Resize(display_size_);
   }
-  display_->SetSurfaceId(surface_id_, frame.metadata.device_scale_factor);
-  factory_.SubmitCompositorFrame(surface_id_, std::move(frame), callback);
+  display_->SetSurfaceId(cc::SurfaceId(frame_sink_id_, local_frame_id_),
+                         frame.metadata.device_scale_factor);
+  factory_.SubmitCompositorFrame(local_frame_id_, std::move(frame), callback);
 }
 
 void CompositorFrameSink::RequestCopyOfOutput(
     std::unique_ptr<cc::CopyOutputRequest> output_request) {
-  factory_.RequestCopyOfSurface(surface_id_, std::move(output_request));
+  factory_.RequestCopyOfSurface(local_frame_id_, std::move(output_request));
 }
 
 void CompositorFrameSink::ReturnResources(
     const cc::ReturnedResourceArray& resources) {
   // TODO(fsamuel): Implement this.
 }
 
 void CompositorFrameSink::SetBeginFrameSource(
     cc::BeginFrameSource* begin_frame_source) {
   // TODO(fsamuel): Implement this.
@@ skipping 12 matching lines @@
 }
 
 void CompositorFrameSink::DisplayDidDrawAndSwap() {
   // This notification is not relevant to our client outside of tests. We
   // unblock the client from the DrawCallback when the surface is going to
   // be drawn.
 }
 
 }  // namespace surfaces
 }  // namespace ui