Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

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";
@@ skipping 119 matching lines @@
   // Sets an individual named property. Setting an individual property to null
   // 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,
-                cc.mojom.MojoCompositorFrameSink& surface,
-                cc.mojom.MojoCompositorFrameSinkClient client);
+  // Attaches a CompositorFrameSink to a particular window.
+  AttachCompositorFrameSink(
+      uint32 window_id,
+      CompositorFrameSinkType type,
+      cc.mojom.MojoCompositorFrameSink& compositor_frame_sink,
+      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);
 };