Mus-WS / Aura-Mus: Propagate LocalSurfaceId on WindowTreeHost creation

services/ui/ws/window_tree.cc

Index: services/ui/ws/window_tree.cc
diff --git a/services/ui/ws/window_tree.cc b/services/ui/ws/window_tree.cc
index 6c1d7f44affbaf1eea4519f6fdff80ed76df60bf..a3e6d87b93c143fabd11682b33970da46a8e10d2 100644
--- a/services/ui/ws/window_tree.cc
+++ b/services/ui/ws/window_tree.cc
@@ -131,7 +131,7 @@ void WindowTree::Init(std::unique_ptr<WindowTreeBinding> binding,
   const bool drawn = root->parent() && root->parent()->IsDrawn();
   client()->OnEmbed(id_, WindowToWindowData(to_send.front()), std::move(tree),
                     display_id, focused_window_id.id, drawn,
-                    root->frame_sink_id());
+                    root->frame_sink_id(), root->current_local_surface_id());
 }
 
 void WindowTree::ConfigureWindowManager() {
@@ -216,7 +216,8 @@ void WindowTree::AddRootForWindowManager(const ServerWindow* root) {
 
   window_manager_internal_->WmNewDisplayAdded(
       ws_display->GetDisplay(), WindowToWindowData(root),
-      root->parent()->IsDrawn(), root->frame_sink_id());
+      root->parent()->IsDrawn(), root->frame_sink_id(),
+      root->current_local_surface_id());
 }
 
 void WindowTree::OnWindowDestroyingTreeImpl(WindowTree* tree) {
@@ -557,7 +558,8 @@ void WindowTree::OnWindowManagerCreatedTopLevelWindow(
   int64_t display_id = display ? display->GetId() : display::kInvalidDisplayId;
   const bool drawn = window->parent() && window->parent()->IsDrawn();
   client()->OnTopLevelCreated(client_change_id, WindowToWindowData(window),
-                              display_id, drawn, window->frame_sink_id());
+                              display_id, drawn, window->frame_sink_id(),
+                              window->current_local_surface_id());
 }
 
 void WindowTree::AddActivationParent(const ClientWindowId& window_id) {