mus-ws: Plumb FrameSinkId to Children

ui/aura/mus/window_port_mus.h

 // 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.
 
 #ifndef UI_AURA_MUS_WINDOW_PORT_MUS_H_
 #define UI_AURA_MUS_WINDOW_PORT_MUS_H_
 
 #include <stdint.h>
 
 #include <string>
@@ skipping 50 matching lines @@
 
   // Sets whether this window can accept drops, defaults to false.
   void SetCanAcceptDrops(bool can_accept_drops);
 
   // Embeds a new client in this Window. See WindowTreeClient::Embed() for
   // details on arguments.
   void Embed(ui::mojom::WindowTreeClientPtr client,
              uint32_t flags,
              const ui::mojom::WindowTree::EmbedCallback& callback);
 
-  std::unique_ptr<ui::ClientCompositorFrameSink> RequestCompositorFrameSink(
+  using CompositorFrameSinkCallback =
+      base::Callback<void(std::unique_ptr<cc::CompositorFrameSink>)>;
+  void RequestCompositorFrameSink(
       scoped_refptr<cc::ContextProvider> context_provider,
-      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager);
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      const CompositorFrameSinkCallback& callback);
+
+  void RequestCompositorFrameSinkInternal(
+      scoped_refptr<cc::ContextProvider> context_provider,
+      gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
+      const CompositorFrameSinkCallback& callback);
 
   void AttachCompositorFrameSink(
       std::unique_ptr<ui::ClientCompositorFrameSinkBinding>
           compositor_frame_sink_binding);
 
  private:
   friend class WindowPortMusTestApi;
   friend class WindowTreeClient;
   friend class WindowTreeClientPrivate;
   friend class WindowTreeHostMus;
@@ skipping 119 matching lines @@
   void ReorderFromServer(WindowMus* child,
                          WindowMus* relative,
                          ui::mojom::OrderDirection) override;
   void SetBoundsFromServer(const gfx::Rect& bounds) override;
   void SetVisibleFromServer(bool visible) override;
   void SetOpacityFromServer(float opacity) override;
   void SetPredefinedCursorFromServer(ui::mojom::Cursor cursor) override;
   void SetPropertyFromServer(
       const std::string& property_name,
       const std::vector<uint8_t>* property_data) override;
+  void SetFrameSinkIdFromServer(const cc::FrameSinkId& frame_sink_id) override;
   void SetSurfaceInfoFromServer(const cc::SurfaceInfo& surface_info) override;
   void DestroyFromServer() override;
   void AddTransientChildFromServer(WindowMus* child) override;
   void RemoveTransientChildFromServer(WindowMus* child) override;
   ChangeSource OnTransientChildAdded(WindowMus* child) override;
   ChangeSource OnTransientChildRemoved(WindowMus* child) override;
   std::unique_ptr<WindowMusChangeData> PrepareForServerBoundsChange(
       const gfx::Rect& bounds) override;
   std::unique_ptr<WindowMusChangeData> PrepareForServerVisibilityChange(
       bool value) override;
@@ skipping 20 matching lines @@
   WindowTreeClient* window_tree_client_;
 
   Window* window_ = nullptr;
 
   // Used when this window is embedding a client.
   std::unique_ptr<ClientSurfaceEmbedder> client_surface_embedder;
 
   ServerChangeIdType next_server_change_id_ = 0;
   ServerChanges server_changes_;
 
+  cc::FrameSinkId frame_sink_id_;
+  base::Closure pending_compositor_frame_sink_request_;
+
   cc::SurfaceInfo surface_info_;
 
   ui::mojom::Cursor predefined_cursor_ = ui::mojom::Cursor::CURSOR_NULL;
 
   DISALLOW_COPY_AND_ASSIGN(WindowPortMus);
 };
 
 }  // namespace aura
 
 #endif  // UI_AURA_MUS_WINDOW_PORT_MUS_H_