Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/remote_channel_impl.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 CC_TREES_REMOTE_CHANNEL_IMPL_H_
 #define CC_TREES_REMOTE_CHANNEL_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "cc/base/cc_export.h"
@@ skipping 26 matching lines @@
 //               |              RemoteChannelImpl
 // ---------------------------------------------------------------------------
 // RemoteChannelImpl::Start()---PostTask---> RemoteChannelImpl::
 //                                                    InitializeImplOnImpl
 //                                                          |
 //                                                   ProxyImpl::Create
 //                                                          |
 //                                                          .
 //                                                          .
 //                                          ProxyImpl::ScheduledActionBegin
-//                                                     OutputSurfaceCreation
+//                                                   CompositorFrameSinkCreation
 //                                                          |
-//                                         ChannelImpl::RequestNewOutputSurface
+//                                    ChannelImpl::RequestNewCompositorFrameSink
 //                                                          |
 // RemoteChannelImpl::                                      |
-//      RequestNewOutputSurface()<----PostTask--------------
+//      RequestNewCompositorFrameSink()<----PostTask--------------
 //              .
 //              .
 //              |
 // RemoteChannelImpl::
 //          ~RemoteChannelImpl() ---PostTask---> RemoteChannelImpl::
 //                                                      ShutdownImplOnImpl
 // ----------------------------------------------------------------------------
 //
 // The class is created and destroyed on the main thread but can be safely
 // called from the main or impl thread. It is safe to call RemoteChannelImpl on
@@ skipping 29 matching lines @@
 
  private:
   struct MainThreadOnly {
     LayerTreeHost* layer_tree_host;
     RemoteProtoChannel* remote_proto_channel;
 
     bool started;
 
     // This is set to true if we lost the output surface and can not push any
     // commits to the impl thread.
-    bool waiting_for_output_surface_initialization;
+    bool waiting_for_compositor_frame_sink_initialization;
 
     // The queue of messages received from the server. The messages are added to
     // this queue if we are waiting for a new output surface to be initialized.
     std::queue<proto::CompositorMessageToImpl> pending_messages;
 
     base::WeakPtrFactory<RemoteChannelImpl> remote_channel_weak_factory;
 
     MainThreadOnly(RemoteChannelImpl*,
                    LayerTreeHost* layer_tree_host,
                    RemoteProtoChannel* remote_proto_channel);
@@ skipping 11 matching lines @@
   };
 
   // called on main thread.
   // RemoteProtoChannel::ProtoReceiver implementation.
   void OnProtoReceived(
       std::unique_ptr<proto::CompositorMessage> proto) override;
 
   // Proxy implementation
   bool IsStarted() const override;
   bool CommitToActiveTree() const override;
-  void SetOutputSurface(OutputSurface* output_surface) override;
-  void ReleaseOutputSurface() override;
+  void SetCompositorFrameSink(
+      CompositorFrameSink* compositor_frame_sink) override;
+  void ReleaseCompositorFrameSink() 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;
   void MainThreadHasStoppedFlinging() override;
   bool CommitRequested() const override;
   bool BeginMainFrameRequested() const override;
   void Start(
       std::unique_ptr<BeginFrameSource> external_begin_frame_source) override;
   void Stop() override;
   void SetMutator(std::unique_ptr<LayerTreeMutator> mutator) override;
   bool SupportsImplScrolling() const override;
   void UpdateTopControlsState(TopControlsState constraints,
                               TopControlsState current,
                               bool animate) override;
   bool MainFrameWillHappenForTesting() override;
 
   // Called on impl thread.
   // ChannelImpl implementation
   void DidCompleteSwapBuffers() override;
   void BeginMainFrameNotExpectedSoon() override;
   void DidCommitAndDrawFrame() override;
   void SetAnimationEvents(std::unique_ptr<AnimationEvents> queue) override;
-  void DidLoseOutputSurface() override;
-  void RequestNewOutputSurface() override;
-  void DidInitializeOutputSurface(bool success) override;
+  void DidLoseCompositorFrameSink() override;
+  void RequestNewCompositorFrameSink() override;
+  void DidInitializeCompositorFrameSink(bool success) override;
   void DidCompletePageScaleAnimation() override;
   void BeginMainFrame(std::unique_ptr<BeginMainFrameAndCommitState>
                           begin_main_frame_state) override;
 
   void SendMessageProto(std::unique_ptr<proto::CompositorMessage> proto);
 
   // called on main thread.
   void HandleProto(const proto::CompositorMessageToImpl& proto);
   void DidCompleteSwapBuffersOnMain();
   void DidCommitAndDrawFrameOnMain();
-  void DidLoseOutputSurfaceOnMain();
-  void RequestNewOutputSurfaceOnMain();
-  void DidInitializeOutputSurfaceOnMain(bool success);
+  void DidLoseCompositorFrameSinkOnMain();
+  void RequestNewCompositorFrameSinkOnMain();
+  void DidInitializeCompositorFrameSinkOnMain(bool success);
   void SendMessageProtoOnMain(std::unique_ptr<proto::CompositorMessage> proto);
   void PostSetNeedsRedrawToImpl(const gfx::Rect& damaged_rect);
 
   void InitializeImplOnImpl(CompletionEvent* completion,
                             LayerTreeHost* layer_tree_host);
   void ShutdownImplOnImpl(CompletionEvent* completion);
 
   MainThreadOnly& main();
   const MainThreadOnly& main() const;
   CompositorThreadOnly& impl();
   const CompositorThreadOnly& impl() const;
 
   base::SingleThreadTaskRunner* MainThreadTaskRunner() const;
   base::SingleThreadTaskRunner* ImplThreadTaskRunner() const;
 
   TaskRunnerProvider* task_runner_provider_;
 
   // use accessors instead of these variables directly
   MainThreadOnly main_thread_vars_unsafe_;
   CompositorThreadOnly compositor_thread_vars_unsafe_;
 
   base::WeakPtr<ProxyImpl> proxy_impl_weak_ptr_;
 
   DISALLOW_COPY_AND_ASSIGN(RemoteChannelImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_TREES_REMOTE_CHANNEL_IMPL_H_