Mus+Ash: propagate Surface ID to parents

services/ui/public/cpp/window_tree_client.cc

Index: services/ui/public/cpp/window_tree_client.cc
diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc
index bd2d3578d7a1033c33fd34e85b2c038d8d93a14c..01bd08277138efa39f463c8ef10d66a8e4f1c95e 100644
--- a/services/ui/public/cpp/window_tree_client.cc
+++ b/services/ui/public/cpp/window_tree_client.cc
@@ -16,6 +16,7 @@
 #include "services/ui/common/util.h"
 #include "services/ui/public/cpp/in_flight_change.h"
 #include "services/ui/public/cpp/input_event_handler.h"
+#include "services/ui/public/cpp/surface_id_handler.h"
 #include "services/ui/public/cpp/window_drop_target.h"
 #include "services/ui/public/cpp/window_manager_delegate.h"
 #include "services/ui/public/cpp/window_observer.h"
@@ -356,6 +357,13 @@ void WindowTreeClient::AttachSurface(
   tree_->AttachSurface(window_id, type, std::move(surface), std::move(client));
 }
 
+void WindowTreeClient::OnWindowSurfaceDetached(
+    Id window_id,
+    const cc::SurfaceSequence& sequence) {
+  DCHECK(tree_);
+  tree_->OnWindowSurfaceDetached(window_id, sequence);
+}
+
 void WindowTreeClient::LocalSetCapture(Window* window) {
   if (capture_window_ == window)
     return;
@@ -1092,6 +1100,23 @@ void WindowTreeClient::OnWindowPredefinedCursorChanged(
   WindowPrivate(window).LocalSetPredefinedCursor(cursor);
 }
 
+void WindowTreeClient::OnWindowSurfaceChanged(
+    Id window_id,
+    const cc::SurfaceId& surface_id,
+    const cc::SurfaceSequence& surface_sequence,
+    const gfx::Size& frame_size,
+    float device_scale_factor) {
+  Window* window = GetWindowByServerId(window_id);
+  if (!window)
+    return;
+  std::unique_ptr<SurfaceInfo> surface_info(base::MakeUnique<SurfaceInfo>());
+  surface_info->surface_id = surface_id;
+  surface_info->surface_sequence = surface_sequence;
+  surface_info->frame_size = frame_size;
+  surface_info->device_scale_factor = device_scale_factor;
+  WindowPrivate(window).LocalSetSurfaceId(std::move(surface_info));
+}
+
 void WindowTreeClient::OnDragDropStart(
     mojo::Map<mojo::String, mojo::Array<uint8_t>> mime_data) {
   mime_drag_data_ = std::move(mime_data);