Passing FrameSinkId to WindowCompositorFrameSink

content/renderer/mus/render_widget_mus_connection.cc

 // 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.
 
 #include "content/renderer/mus/render_widget_mus_connection.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 21 matching lines @@
       render_thread->compositor_task_runner(), std::move(request),
       render_thread->input_handler_manager());
   if (window_compositor_frame_sink_binding_) {
     compositor_mus_connection_->AttachCompositorFrameSinkOnMainThread(
         std::move(window_compositor_frame_sink_binding_));
   }
 }
 
 std::unique_ptr<cc::CompositorFrameSink>
 RenderWidgetMusConnection::CreateCompositorFrameSink(
+    const cc::FrameSinkId& frame_sink_id,
     scoped_refptr<cc::ContextProvider> context_provider,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!window_compositor_frame_sink_binding_);
 
   std::unique_ptr<cc::CompositorFrameSink> compositor_frame_sink(
       ui::WindowCompositorFrameSink::Create(
-          std::move(context_provider), gpu_memory_buffer_manager,
+          frame_sink_id, std::move(context_provider), gpu_memory_buffer_manager,
           &window_compositor_frame_sink_binding_));
   if (compositor_mus_connection_) {
     compositor_mus_connection_->AttachCompositorFrameSinkOnMainThread(
         std::move(window_compositor_frame_sink_binding_));
   }
   return compositor_frame_sink;
 }
 
 // static
 RenderWidgetMusConnection* RenderWidgetMusConnection::Get(int routing_id) {
@@ skipping 108 matching lines @@
   // previous event.
   // DCHECK(pending_ack_.is_null());
   pending_ack_ = ack;
   // TODO(fsamuel, sadrul): Track real latency info.
   ui::LatencyInfo latency_info;
   input_handler_->HandleInputEvent(*input_event, latency_info,
                                    DISPATCH_TYPE_BLOCKING);
 }
 
 }  // namespace content