Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/layer_tree_host.h

Index: cc/trees/layer_tree_host.h
diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
index 32a2bd00514f6c14a61ef1161e9f7c47fbed6731..3948e455634c589d4b68fc6f9d84f92f5fbc3fd3 100644
--- a/cc/trees/layer_tree_host.h
+++ b/cc/trees/layer_tree_host.h
@@ -31,7 +31,7 @@
 #include "cc/input/top_controls_state.h"
 #include "cc/layers/layer_collections.h"
 #include "cc/layers/layer_list_iterator.h"
-#include "cc/output/output_surface.h"
+#include "cc/output/compositor_frame_sink.h"
 #include "cc/output/swap_promise.h"
 #include "cc/resources/resource_format.h"
 #include "cc/surfaces/surface_sequence.h"
@@ -152,8 +152,9 @@ class CC_EXPORT LayerTreeHost : public LayerTreeHostInterface {
   void SetHasGpuRasterizationTrigger(bool has_trigger) override;
   void SetVisible(bool visible) override;
   bool IsVisible() const override;
-  void SetOutputSurface(std::unique_ptr<OutputSurface> output_surface) override;
-  std::unique_ptr<OutputSurface> ReleaseOutputSurface() override;
+  void SetCompositorFrameSink(
+      std::unique_ptr<CompositorFrameSink> compositor_frame_sink) override;
+  std::unique_ptr<CompositorFrameSink> ReleaseCompositorFrameSink() override;
   void SetNeedsAnimate() override;
   void SetNeedsUpdateLayers() override;
   void SetNeedsCommit() override;
@@ -192,12 +193,12 @@ class CC_EXPORT LayerTreeHost : public LayerTreeHostInterface {
   void FinishCommitOnImplThread(LayerTreeHostImpl* host_impl);
   void WillCommit();
   void CommitComplete();
-  void RequestNewOutputSurface();
-  void DidInitializeOutputSurface();
-  void DidFailToInitializeOutputSurface();
+  void RequestNewCompositorFrameSink();
+  void DidInitializeCompositorFrameSink();
+  void DidFailToInitializeCompositorFrameSink();
   virtual std::unique_ptr<LayerTreeHostImpl> CreateLayerTreeHostImpl(
       LayerTreeHostImplClient* client);
-  void DidLoseOutputSurface();
+  void DidLoseCompositorFrameSink();
   void DidCommitAndDrawFrame() { client_->DidCommitAndDrawFrame(); }
   void DidCompleteSwapBuffers() { client_->DidCompleteSwapBuffers(); }
   bool UpdateLayers();
@@ -357,13 +358,13 @@ class CC_EXPORT LayerTreeHost : public LayerTreeHostInterface {
   std::unique_ptr<RenderingStatsInstrumentation>
       rendering_stats_instrumentation_;
 
-  // |current_output_surface_| can't be updated until we've successfully
-  // initialized a new output surface. |new_output_surface_| contains the
+  // |current_compositor_frame_sink_| can't be updated until we've successfully
+  // initialized a new output surface. |new_compositor_frame_sink_| contains the
   // new output surface that is currently being initialized. If initialization
-  // is successful then |new_output_surface_| replaces
-  // |current_output_surface_|.
-  std::unique_ptr<OutputSurface> new_output_surface_;
-  std::unique_ptr<OutputSurface> current_output_surface_;
+  // is successful then |new_compositor_frame_sink_| replaces
+  // |current_compositor_frame_sink_|.
+  std::unique_ptr<CompositorFrameSink> new_compositor_frame_sink_;
+  std::unique_ptr<CompositorFrameSink> current_compositor_frame_sink_;
 
   const LayerTreeSettings settings_;
   LayerTreeDebugState debug_state_;