Mus-WS / Aura-Mus: Propagate cc::LocalSurfaceId through WindowData

ui/aura/mus/window_tree_client.cc

Index: ui/aura/mus/window_tree_client.cc
diff --git a/ui/aura/mus/window_tree_client.cc b/ui/aura/mus/window_tree_client.cc
index 233da4df7e06e9473645b9a46992700723fd34e0..bd24a2068bda04cd9bdf7dfa16bd1221190ba743 100644
--- a/ui/aura/mus/window_tree_client.cc
+++ b/ui/aura/mus/window_tree_client.cc
@@ -454,8 +454,9 @@ std::unique_ptr<WindowTreeHostMus> WindowTreeClient::CreateWindowTreeHost(
     SetWindowVisibleFromServer(WindowMus::Get(window_tree_host->window()),
                                true);
   }
-  SetWindowBoundsFromServer(WindowMus::Get(window_tree_host->window()),
-                            window_data.bounds, base::nullopt);
+  WindowMus* window = WindowMus::Get(window_tree_host->window());
+  SetWindowBoundsFromServer(window, window_data.bounds,
+                            window_data.local_surface_id);
   return window_tree_host;
 }
 
@@ -974,16 +975,17 @@ void WindowTreeClient::OnTopLevelCreated(uint32_t change_id,
   }
 
   const gfx::Rect bounds(data->bounds);
+  const base::Optional<cc::LocalSurfaceId> local_surface_id(
+      data->local_surface_id);
   {
-    // TODO(fsamuel): Propagate a cc::LocalSurfaceId through here.
-    InFlightBoundsChange bounds_change(this, window, bounds, base::nullopt);
+    InFlightBoundsChange bounds_change(this, window, bounds, local_surface_id);
     InFlightChange* current_change =
         GetOldestInFlightChangeMatching(bounds_change);
     if (current_change)
       current_change->SetRevertValueFrom(bounds_change);
     else if (gfx::ConvertRectToPixel(ScaleFactorForDisplay(window->GetWindow()),
                                      window->GetWindow()->bounds()) != bounds)
-      SetWindowBoundsFromServer(window, bounds, base::nullopt);
+      SetWindowBoundsFromServer(window, bounds, local_surface_id);
   }
 
   // There is currently no API to bulk set properties, so we iterate over each