mus-ws: Plumb FrameSinkId to Children

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 64 matching lines @@
   window_tree_client_->SetCanAcceptDrops(this, can_accept_drops);
 }
 
 void WindowPortMus::Embed(
     ui::mojom::WindowTreeClientPtr client,
     uint32_t flags,
     const ui::mojom::WindowTree::EmbedCallback& callback) {
   window_tree_client_->Embed(window_, std::move(client), flags, callback);
 }
 
-std::unique_ptr<ui::ClientCompositorFrameSink>
-WindowPortMus::RequestCompositorFrameSink(
+void WindowPortMus::RequestCompositorFrameSink(
     scoped_refptr<cc::ContextProvider> context_provider,
-    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager) {
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+    const CompositorFrameSinkCallback& callback) {
+  DCHECK(pending_compositor_frame_sink_request_.is_null());
+  // If we haven't received a FrameSinkId from the window server yet then we
+  // bind the parameters to a closure that will be called once the FrameSinkId
+  // is available.
+  if (!frame_sink_id_.is_valid()) {
+    pending_compositor_frame_sink_request_ =
+        base::Bind(&WindowPortMus::RequestCompositorFrameSinkInternal,
+                   base::Unretained(this), std::move(context_provider),
+                   gpu_memory_buffer_manager, callback);
+    return;
+  }
+
+  RequestCompositorFrameSinkInternal(std::move(context_provider),
+                                     gpu_memory_buffer_manager, callback);
+}
+
+void WindowPortMus::RequestCompositorFrameSinkInternal(
+    scoped_refptr<cc::ContextProvider> context_provider,
+    gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+    const CompositorFrameSinkCallback& callback) {
+  DCHECK(frame_sink_id_.is_valid());
   std::unique_ptr<ui::ClientCompositorFrameSinkBinding>
       compositor_frame_sink_binding;
   std::unique_ptr<ui::ClientCompositorFrameSink> compositor_frame_sink =
       ui::ClientCompositorFrameSink::Create(
-          cc::FrameSinkId(server_id(), 0), std::move(context_provider),
+          frame_sink_id_, std::move(context_provider),
           gpu_memory_buffer_manager, &compositor_frame_sink_binding);
   AttachCompositorFrameSink(std::move(compositor_frame_sink_binding));
-  return compositor_frame_sink;
+  callback.Run(std::move(compositor_frame_sink));
 }
 
 void WindowPortMus::AttachCompositorFrameSink(
     std::unique_ptr<ui::ClientCompositorFrameSinkBinding>
         compositor_frame_sink_binding) {
   window_tree_client_->AttachCompositorFrameSink(
       server_id(), compositor_frame_sink_binding->TakeFrameSinkRequest(),
       mojo::MakeProxy(compositor_frame_sink_binding->TakeFrameSinkClient()));
 }
 
@@ skipping 133 matching lines @@
 void WindowPortMus::SetPropertyFromServer(
     const std::string& property_name,
     const std::vector<uint8_t>* property_data) {
   ServerChangeData data;
   data.property_name = property_name;
   ScopedServerChange change(this, ServerChangeType::PROPERTY, data);
   GetPropertyConverter()->SetPropertyFromTransportValue(window_, property_name,
                                                         property_data);
 }
 
+void WindowPortMus::SetFrameSinkIdFromServer(
+    const cc::FrameSinkId& frame_sink_id) {
+  frame_sink_id_ = frame_sink_id;
+  if (!pending_compositor_frame_sink_request_.is_null())
+    base::ResetAndReturn(&pending_compositor_frame_sink_request_).Run();
+}
+
 void WindowPortMus::SetSurfaceInfoFromServer(
     const cc::SurfaceInfo& surface_info) {
   if (surface_info_.is_valid()) {
     const cc::SurfaceId& existing_surface_id = surface_info_.id();
     const cc::SurfaceId& new_surface_id = surface_info.id();
     if (existing_surface_id.is_valid() &&
         existing_surface_id != new_surface_id) {
       // TODO(kylechar): Start return reference here?
     }
   }
@@ skipping 186 matching lines @@
       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, old_value,
                                                     std::move(data));
 }
 
 }  // namespace aura