Fork cc::OutputSurface into cc::CompositorFrameSink.

cc/trees/remote_channel_main.cc

 // 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.
 
 #include "cc/trees/remote_channel_main.h"
 
 #include <memory>
 
 #include "base/memory/ptr_util.h"
 #include "cc/proto/base_conversions.h"
@@ skipping 45 matching lines @@
   DCHECK(proto->has_to_main());
 
   HandleProto(proto->to_main());
 }
 
 void RemoteChannelMain::UpdateTopControlsStateOnImpl(
     TopControlsState constraints,
     TopControlsState current,
     bool animate) {}
 
-void RemoteChannelMain::InitializeOutputSurfaceOnImpl(
-    OutputSurface* output_surface) {
+void RemoteChannelMain::InitializeCompositorFrameSinkOnImpl(
+    CompositorFrameSink*) {
   NOTREACHED() << "Should not be called on the server LayerTreeHost";
 }
 
 void RemoteChannelMain::InitializeMutatorOnImpl(
     std::unique_ptr<LayerTreeMutator> mutator) {
   // TODO(vollick): add support for CompositorWorker.
   NOTIMPLEMENTED();
 }
 
 void RemoteChannelMain::MainThreadHasStoppedFlingingOnImpl() {
@@ skipping 14 matching lines @@
   defer_commits_message->set_defer_commits(defer_commits);
 
   VLOG(1) << "Sending defer commits: " << defer_commits << " to client.";
   SendMessageProto(proto);
 }
 
 void RemoteChannelMain::SetVisibleOnImpl(bool visible) {
   NOTIMPLEMENTED() << "Visibility is not controlled by the server";
 }
 
-void RemoteChannelMain::ReleaseOutputSurfaceOnImpl(
+void RemoteChannelMain::ReleaseCompositorFrameSinkOnImpl(
     CompletionEvent* completion) {
   NOTREACHED() << "Should not be called on the server LayerTreeHost";
   completion->Signal();
 }
 
 void RemoteChannelMain::MainFrameWillHappenOnImplForTesting(
     CompletionEvent* completion,
     bool* main_frame_will_happen) {
   // For the LayerTreeTests in remote mode, LayerTreeTest directly calls
   // RemoteChannelImpl::MainFrameWillHappenForTesting and avoids adding a
@@ skipping 157 matching lines @@
 
 void RemoteChannelMain::DidCompleteSwapBuffers() {
   proxy_main_->DidCompleteSwapBuffers();
 }
 
 base::SingleThreadTaskRunner* RemoteChannelMain::MainThreadTaskRunner() const {
   return task_runner_provider_->MainThreadTaskRunner();
 }
 
 }  // namespace cc