Passing FrameSinkId to WindowCompositorFrameSink

ui/aura/mus/window_port_mus.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 "ui/aura/mus/window_port_mus.h"
 
 #include "base/memory/ptr_util.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/mus/client_surface_embedder.h"
@@ skipping 61 matching lines @@
     const ui::mojom::WindowTree::EmbedCallback& callback) {
   window_tree_client_->Embed(window_, std::move(client), flags, callback);
 }
 
 std::unique_ptr<WindowCompositorFrameSink>
 WindowPortMus::RequestCompositorFrameSink(
     scoped_refptr<cc::ContextProvider> context_provider,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
   std::unique_ptr<WindowCompositorFrameSinkBinding>
       compositor_frame_sink_binding;
+  cc::FrameSinkId frame_sink_id(server_id(), 0);

[Fady Samuel, 2017/01/13 19:39:05]

No point in having a member variable

[Saman Sami, 2017/01/13 19:41:52]

Done.

   std::unique_ptr<WindowCompositorFrameSink> compositor_frame_sink =
-      WindowCompositorFrameSink::Create(std::move(context_provider),
-                                        gpu_memory_buffer_manager,
-                                        &compositor_frame_sink_binding);
+      WindowCompositorFrameSink::Create(
+          frame_sink_id, std::move(context_provider), gpu_memory_buffer_manager,

[Fady Samuel, 2017/01/13 19:39:05]

cc::FrameSinkId(server_id(), 0)

[Saman Sami, 2017/01/13 19:41:52]

Done.

+          &compositor_frame_sink_binding);
   AttachCompositorFrameSink(std::move(compositor_frame_sink_binding));
   return compositor_frame_sink;
 }
 
 void WindowPortMus::AttachCompositorFrameSink(
     std::unique_ptr<WindowCompositorFrameSinkBinding>
         compositor_frame_sink_binding) {
   window_tree_client_->AttachCompositorFrameSink(
       server_id(),
       std::move(compositor_frame_sink_binding->compositor_frame_sink_request_),
@@ skipping 333 matching lines @@
   change_data.property_name =
       GetPropertyConverter()->GetTransportNameForPropertyKey(key);
   // TODO(sky): investigate to see if we need to compare data. In particular do
   // we ever have a case where changing a property cascades into changing the
   // same property?
   if (!RemoveChangeByTypeAndData(ServerChangeType::PROPERTY, change_data))
     window_tree_client_->OnWindowMusPropertyChanged(this, key, std::move(data));
 }
 
 }  // namespace aura