Display Compositor: Allocate LocalFrameId in client.

services/ui/surfaces/gpu_compositor_frame_sink.h

 // Copyright 2015 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.
 
 #ifndef SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
 #define SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_
 
 #include <memory>
 #include <set>
 
@@ skipping 39 matching lines @@
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
       scoped_refptr<cc::InProcessContextProvider> context_provider,
       cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkPrivateRequest private_request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
   ~GpuCompositorFrameSink() override;
 
   // cc::mojom::MojoCompositorFrameSink:
   void SetNeedsBeginFrame(bool needs_begin_frame) override;
-  void SubmitCompositorFrame(cc::CompositorFrame frame) override;
+  void SubmitCompositorFrame(const cc::LocalFrameId& local_frame_id,
+                             cc::CompositorFrame frame) override;
 
   // cc::mojom::MojoCompositorFrameSinkPrivate:
   void AddChildFrameSink(const cc::FrameSinkId& child_frame_sink_id) override;
   void RemoveChildFrameSink(
       const cc::FrameSinkId& child_frame_sink_id) override;
 
  private:
   void InitDisplay(
       gpu::SurfaceHandle widget,
       gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
@@ skipping 19 matching lines @@
   void UpdateNeedsBeginFramesInternal();
 
   void OnClientConnectionLost();
   void OnPrivateConnectionLost();
 
   const cc::FrameSinkId frame_sink_id_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
   DisplayCompositor* display_compositor_;  // owns this.
 
-  gfx::Size last_submitted_frame_size_;
   // GpuCompositorFrameSink holds a cc::Display if it created with
   // non-null gpu::SurfaceHandle. In the window server, the display root
   // window's CompositorFrameSink will have a valid gpu::SurfaceHandle.
   std::unique_ptr<cc::Display> display_;
 
   cc::LocalFrameId local_frame_id_;
-  cc::SurfaceIdAllocator surface_id_allocator_;
   cc::SurfaceFactory surface_factory_;
   // Counts the number of CompositorFrames that have been submitted and have not
   // yet received an ACK.
   int ack_pending_count_ = 0;
   cc::ReturnedResourceArray surface_returned_resources_;
 
   bool client_connection_lost_ = false;
   bool private_connection_lost_ = false;
 
   // The begin frame source being observered. Null if none.
@@ skipping 11 matching lines @@
   cc::mojom::MojoCompositorFrameSinkClientPtr client_;
   mojo::Binding<cc::mojom::MojoCompositorFrameSink> binding_;
   mojo::Binding<cc::mojom::MojoCompositorFrameSinkPrivate> private_binding_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuCompositorFrameSink);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_SURFACES_GPU_COMPOSITOR_FRAME_SINK_H_