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

services/ui/ws/frame_generator.h

Index: services/ui/ws/frame_generator.h
diff --git a/services/ui/ws/frame_generator.h b/services/ui/ws/frame_generator.h
index f608758e556e3f79980fd917e8e1ebe841f7a788..b9ecab2c83887c5dc5e238be67db546f5d79d45e 100644
--- a/services/ui/ws/frame_generator.h
+++ b/services/ui/ws/frame_generator.h
@@ -45,7 +45,7 @@ class FrameGeneratorTest;
 
 class FrameGeneratorDelegate;
 class ServerWindow;
-class ServerWindowSurface;
+class ServerWindowCompositorFrameSink;
 
 // Responsible for redrawing the display in response to the redraw requests by
 // submitting CompositorFrames to the owned CompositorFrameSink.
@@ -91,15 +91,16 @@ class FrameGenerator : public ServerWindowObserver {
                       bool* may_contain_video);
 
   // Adds a reference to the current cc::Surface of the provided
-  // |window_surface|. If an existing reference is held with a different
-  // LocalFrameId then release that reference first. This is called on each
-  // ServerWindowSurface as FrameGenerator walks the window tree to generate a
-  /// CompositorFrame. This is done to make sure that the window surfaces are
-  // retained for the entirety of the time between submission of the top-level
-  // frame to drawing the frame to screen.
+  // |window_compositor_frame_sink|. If an existing reference is held with a
+  // different LocalFrameId then release that reference first. This is called on
+  // each ServerWindowCompositorFrameSink as FrameGenerator walks the window
+  // tree to generate a CompositorFrame. This is done to make sure that the
+  // window surfaces are retained for the entirety of the time between
+  // submission of the top-level frame to drawing the frame to screen.
   // TODO(fsamuel, kylechar): This will go away once we get surface lifetime
   // management.
-  void AddOrUpdateSurfaceReference(ServerWindowSurface* window_surface);
+  void AddOrUpdateSurfaceReference(
+      ServerWindowCompositorFrameSink* window_compositor_frame_sink);
 
   // Releases any retained references for the provided FrameSink.
   // TODO(fsamuel, kylechar): This will go away once we get surface lifetime