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

services/ui/ws/frame_generator.h

 // Copyright 2016 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.
 
 #ifndef SERVICES_UI_WS_FRAME_GENERATOR_H_
 #define SERVICES_UI_WS_FRAME_GENERATOR_H_
 
 #include <memory>
 #include <unordered_map>
 
@@ skipping 24 matching lines @@
 class DisplayCompositorFrameSink;
 
 namespace ws {
 
 namespace test {
 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.
 class FrameGenerator : public ServerWindowObserver {
  public:
   FrameGenerator(FrameGeneratorDelegate* delegate,
                  scoped_refptr<DisplayCompositor> display_compositor);
   ~FrameGenerator() override;
 
   void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel);
@@ skipping 23 matching lines @@
 
   // DrawWindowTree recursively visits ServerWindows, creating a SurfaceDrawQuad
   // for each that lacks one.
   void DrawWindowTree(cc::RenderPass* pass,
                       ServerWindow* window,
                       const gfx::Vector2d& parent_to_root_origin_offset,
                       float opacity,
                       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
   // management.
   void ReleaseFrameSinkReference(const cc::FrameSinkId& frame_sink_id);
 
   // Releases all retained references to surfaces.
   // TODO(fsamuel, kylechar): This will go away once we get surface lifetime
   // management.
   void ReleaseAllSurfaceReferences();
@@ skipping 26 matching lines @@
   base::WeakPtrFactory<FrameGenerator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGenerator);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_FRAME_GENERATOR_H_