Mus+Ash: propagate Surface ID to parents

services/ui/ws/window_server.h

Index: services/ui/ws/window_server.h
diff --git a/services/ui/ws/window_server.h b/services/ui/ws/window_server.h
index 265ac567adbdb2dc80a910ebc53c68ca002ea03f..a572c5e3c813bc346635732f32d7661f0a04588d 100644
--- a/services/ui/ws/window_server.h
+++ b/services/ui/ws/window_server.h
@@ -20,6 +20,7 @@
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
 #include "services/ui/surfaces/display_compositor.h"
+#include "services/ui/surfaces/display_compositor_client.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/gpu_service_proxy_delegate.h"
 #include "services/ui/ws/ids.h"
@@ -50,7 +51,8 @@ class WindowServer : public ServerWindowDelegate,
                      public ServerWindowObserver,
                      public GpuServiceProxyDelegate,
                      public UserDisplayManagerDelegate,
-                     public UserIdTrackerObserver {
+                     public UserIdTrackerObserver,
+                     public DisplayCompositorClient {
  public:
   explicit WindowServer(WindowServerDelegate* delegate);
   ~WindowServer() override;
@@ -194,6 +196,11 @@ class WindowServer : public ServerWindowDelegate,
   void ProcessWindowDeleted(ServerWindow* window);
   void ProcessWillChangeWindowPredefinedCursor(ServerWindow* window,
                                                mojom::Cursor cursor_id);
+  void ProcessWindowSurfaceCreated(ServerWindow* window,
+                                   mojom::SurfaceType surface_type,
+                                   const cc::SurfaceId& surface_id,
+                                   const gfx::Size& frame_size,
+                                   float device_scale_factor);
 
   // Sends an |event| to all WindowTrees belonging to |user_id| that might be
   // observing events. Skips |ignore_tree| if it is non-null. |target_window| is
@@ -333,6 +340,11 @@ class WindowServer : public ServerWindowDelegate,
   void OnGpuChannelEstablished(
       scoped_refptr<gpu::GpuChannelHost> gpu_channel) override;
 
+  // DisplayCompositorClient:
+  void OnSurfaceCreated(const cc::SurfaceId& surface_id,
+                        const gfx::Size& frame_size,
+                        float device_scale_factor) override;
+
   // UserIdTrackerObserver:
   void OnActiveUserIdChanged(const UserId& previously_active_id,
                              const UserId& active_id) override;