Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/proxy_main.h

 // Copyright 2015 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 CC_TREES_PROXY_MAIN_H_
 #define CC_TREES_PROXY_MAIN_H_
 
 #include "base/macros.h"
 #include "cc/base/cc_export.h"
 #include "cc/input/top_controls_state.h"
-#include "cc/output/output_surface.h"
 #include "cc/trees/channel_main.h"
 #include "cc/trees/proxy.h"
 #include "cc/trees/proxy_common.h"
 #include "cc/trees/remote_proto_channel.h"
 
 namespace cc {
 
 class AnimationEvents;
 class BeginFrameSource;
 class ChannelMain;
+class CompositorFrameSink;
 class LayerTreeHost;
 class LayerTreeMutator;
 
 // This class aggregates all interactions that the impl side of the compositor
 // needs to have with the main side.
 // The class is created and lives on the main thread.
 class CC_EXPORT ProxyMain : public Proxy {
  public:
   static std::unique_ptr<ProxyMain> CreateThreaded(
       LayerTreeHost* layer_tree_host,
@@ skipping 13 matching lines @@
     NO_PIPELINE_STAGE,
     ANIMATE_PIPELINE_STAGE,
     UPDATE_LAYERS_PIPELINE_STAGE,
     COMMIT_PIPELINE_STAGE,
   };
 
   void DidCompleteSwapBuffers();
   void BeginMainFrameNotExpectedSoon();
   void DidCommitAndDrawFrame();
   void SetAnimationEvents(std::unique_ptr<AnimationEvents> events);
-  void DidLoseOutputSurface();
-  void RequestNewOutputSurface();
-  void DidInitializeOutputSurface(bool success);
+  void DidLoseCompositorFrameSink();
+  void RequestNewCompositorFrameSink();
+  void DidInitializeCompositorFrameSink(bool success);
   void DidCompletePageScaleAnimation();
   void BeginMainFrame(
       std::unique_ptr<BeginMainFrameAndCommitState> begin_main_frame_state);
 
   ChannelMain* channel_main() const { return channel_main_.get(); }
   CommitPipelineStage max_requested_pipeline_stage() const {
     return max_requested_pipeline_stage_;
   }
   CommitPipelineStage current_pipeline_stage() const {
     return current_pipeline_stage_;
   }
   CommitPipelineStage final_pipeline_stage() const {
     return final_pipeline_stage_;
   }
 
  protected:
   ProxyMain(LayerTreeHost* layer_tree_host,
             TaskRunnerProvider* task_runner_provider);
 
  private:
   friend class ProxyMainForTest;
 
   // Proxy implementation.
   bool IsStarted() const override;
   bool CommitToActiveTree() const override;
-  void SetOutputSurface(OutputSurface* output_surface) override;
+  void SetCompositorFrameSink(
+      CompositorFrameSink* compositor_frame_sink) override;
   void SetVisible(bool visible) override;
   void SetNeedsAnimate() override;
   void SetNeedsUpdateLayers() override;
   void SetNeedsCommit() override;
   void SetNeedsRedraw(const gfx::Rect& damage_rect) override;
   void SetNextCommitWaitsForActivation() override;
   void NotifyInputThrottledUntilCommit() override;
   void SetDeferCommits(bool defer_commits) override;
   bool CommitRequested() const override;
   bool BeginMainFrameRequested() const override;
   void MainThreadHasStoppedFlinging() override;
   void Start(
       std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
   void Stop() override;
   bool SupportsImplScrolling() const override;
   void SetMutator(std::unique_ptr<LayerTreeMutator> mutator) override;
   bool MainFrameWillHappenForTesting() override;
-  void ReleaseOutputSurface() override;
+  void ReleaseCompositorFrameSink() override;
   void UpdateTopControlsState(TopControlsState constraints,
                               TopControlsState current,
                               bool animate) override;
 
   // This sets the channel used by ProxyMain to communicate with ProxyImpl.
   void SetChannel(std::unique_ptr<ChannelMain> channel_main);
 
   // Returns |true| if the request was actually sent, |false| if one was
   // already outstanding.
   bool SendCommitRequestToImplThreadIfNeeded(
@@ skipping 25 matching lines @@
   bool defer_commits_;
 
   std::unique_ptr<ChannelMain> channel_main_;
 
   DISALLOW_COPY_AND_ASSIGN(ProxyMain);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_PROXY_MAIN_H_