Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/public/interfaces/window_tree.mojom

 // Copyright 2014 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.
 
 module ui.mojom;
 
 import "cc/ipc/surface_id.mojom";
 import "cc/ipc/surface_sequence.mojom";
+import "cc/ipc/mojo_compositor_frame_sink.mojom";
 import "services/ui/public/interfaces/cursor.mojom";
 import "services/ui/public/interfaces/event_matcher.mojom";
 import "services/ui/public/interfaces/mus_constants.mojom";
-import "services/ui/public/interfaces/surface.mojom";
 import "services/ui/public/interfaces/window_manager.mojom";
 import "services/ui/public/interfaces/window_manager_constants.mojom";
 import "services/ui/public/interfaces/window_tree_constants.mojom";
 import "ui/events/mojo/event.mojom";
 import "ui/gfx/geometry/mojo/geometry.mojom";
 import "ui/platform_window/mojo/text_input_state.mojom";
 
 // Windows are identified by a uint32. The upper 16 bits are the connection id,
 // and the lower 16 the id assigned by the client.
 //
@@ skipping 108 matching lines @@
   // deletes the property.
   SetWindowProperty(uint32 change_id,
                     uint32 window_id,
                     string name,
                     array<uint8>? value);
 
   // Sets the opacity of the specified window to |opacity|.
   SetWindowOpacity(uint32 change_id, uint32 window_id, float opacity);
 
   // Attaches a Surface to a particular window.
+  // TODO(fsamuel): Rename this CompositorFrameSink
   AttachSurface(uint32 window_id,
                 SurfaceType type,
-                Surface& surface,
-                SurfaceClient client);
+                cc.mojom.MojoCompositorFrameSink& surface,
+                cc.mojom.MojoCompositorFrameSinkClient client);
 
   // Returns surface reference back to window server for reclamation.
   OnWindowSurfaceDetached(uint32 window_id, cc.mojom.SurfaceSequence sequence);
 
   // Reparents a window.
   // This fails for any of the following reasons:
   // . |parent| or |child| does not identify a valid window.
   // . |child| is an ancestor of |parent|.
   // . |child| is already a child of |parent|.
   //
@@ skipping 336 matching lines @@
   // See description of WindowManager for details.
   GetWindowManager(associated WindowManager& internal);
 };
 
 // Mus provides this interface as a way for clients to connect and obtain a
 // WindowTree handle with a supplied WindowTreeClient handle. The
 // WindowTreeClient has no roots, use NewTopLevelWindow() to create one.
 interface WindowTreeFactory {
   CreateWindowTree(WindowTree& tree_request, WindowTreeClient client);
 };