Passing FrameSinkId to WindowCompositorFrameSink

ui/aura/mus/window_compositor_frame_sink.cc

 // Copyright 2014 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 "ui/aura/mus/window_compositor_frame_sink.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "cc/output/compositor_frame_sink_client.h"
 #include "gpu/ipc/client/gpu_channel_host.h"
 
 namespace aura {
 
 // static
 std::unique_ptr<WindowCompositorFrameSink> WindowCompositorFrameSink::Create(
+    cc::FrameSinkId frame_sink_id,

[Fady Samuel, 2017/01/13 20:07:06]

const cc::FrameSinkId&

     scoped_refptr<cc::ContextProvider> context_provider,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     std::unique_ptr<WindowCompositorFrameSinkBinding>*
         compositor_frame_sink_binding) {
   cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink;
   cc::mojom::MojoCompositorFrameSinkClientPtr compositor_frame_sink_client;
   cc::mojom::MojoCompositorFrameSinkClientRequest
       compositor_frame_sink_client_request =
           MakeRequest(&compositor_frame_sink_client);
 
   compositor_frame_sink_binding->reset(new WindowCompositorFrameSinkBinding(
       MakeRequest(&compositor_frame_sink),
       compositor_frame_sink_client.PassInterface()));
   return base::WrapUnique(new WindowCompositorFrameSink(
-      std::move(context_provider), gpu_memory_buffer_manager,
+      frame_sink_id, std::move(context_provider), gpu_memory_buffer_manager,
       compositor_frame_sink.PassInterface(),
       std::move(compositor_frame_sink_client_request)));
 }
 
 WindowCompositorFrameSink::~WindowCompositorFrameSink() {}
 
 bool WindowCompositorFrameSink::BindToClient(
     cc::CompositorFrameSinkClient* client) {
   if (!cc::CompositorFrameSink::BindToClient(client))
     return false;
@@ skipping 31 matching lines @@
   if (!local_frame_id_.is_valid() || frame_size != last_submitted_frame_size_)
     local_frame_id_ = id_allocator_.GenerateId();
 
   compositor_frame_sink_->SubmitCompositorFrame(local_frame_id_,
                                                 std::move(frame));
 
   last_submitted_frame_size_ = frame_size;
 }
 
 WindowCompositorFrameSink::WindowCompositorFrameSink(
+    cc::FrameSinkId frame_sink_id,

[Fady Samuel, 2017/01/13 20:07:06]

const cc::FrameSinkId&

     scoped_refptr<cc::ContextProvider> context_provider,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     cc::mojom::MojoCompositorFrameSinkPtrInfo compositor_frame_sink_info,
     cc::mojom::MojoCompositorFrameSinkClientRequest client_request)
     : cc::CompositorFrameSink(std::move(context_provider),
                               nullptr,
                               gpu_memory_buffer_manager,
                               nullptr),
       compositor_frame_sink_info_(std::move(compositor_frame_sink_info)),
-      client_request_(std::move(client_request)) {}
+      client_request_(std::move(client_request)),
+      frame_sink_id_(frame_sink_id) {}
 
 void WindowCompositorFrameSink::DidReceiveCompositorFrameAck() {
   DCHECK(thread_checker_);
   DCHECK(thread_checker_->CalledOnValidThread());
   if (!client_)
     return;
   client_->DidReceiveCompositorFrameAck();
 }
 
 void WindowCompositorFrameSink::OnBeginFrame(
@@ skipping 21 matching lines @@
 WindowCompositorFrameSinkBinding::~WindowCompositorFrameSinkBinding() {}
 
 WindowCompositorFrameSinkBinding::WindowCompositorFrameSinkBinding(
     cc::mojom::MojoCompositorFrameSinkRequest compositor_frame_sink_request,
     mojo::InterfacePtrInfo<cc::mojom::MojoCompositorFrameSinkClient>
         compositor_frame_sink_client)
     : compositor_frame_sink_request_(std::move(compositor_frame_sink_request)),
       compositor_frame_sink_client_(std::move(compositor_frame_sink_client)) {}
 
 }  // namespace aura