Fork cc::OutputSurface into cc::CompositorFrameSink.

content/browser/renderer_host/browser_compositor_view_mac.mm

 // Copyright 2014 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 "content/browser/renderer_host/browser_compositor_view_mac.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 247 matching lines @@
   outstanding_copy_count_ += 1;
 
   auto callback_with_decrement =
       base::Bind(&BrowserCompositorMac::CopyToVideoFrameCompleted,
                  weak_factory_.GetWeakPtr(), callback);
 
   delegated_frame_host_->CopyFromCompositingSurfaceToVideoFrame(
       src_subrect, target, callback_with_decrement);
 }
 
-void BrowserCompositorMac::SwapCompositorFrame(uint32_t output_surface_id,
-                                               cc::CompositorFrame frame) {
+void BrowserCompositorMac::SwapCompositorFrame(
+    uint32_t compositor_frame_sink_id,
+    cc::CompositorFrame frame) {
   // Compute the frame size based on the root render pass rect size.
   cc::RenderPass* root_pass =
       frame.delegated_frame_data->render_pass_list.back().get();
   float scale_factor = frame.metadata.device_scale_factor;
   gfx::Size pixel_size = root_pass->output_rect.size();
   gfx::Size dip_size = gfx::ConvertSizeToDIP(scale_factor, pixel_size);
   root_layer_->SetBounds(gfx::Rect(dip_size));
   if (recyclable_compositor_) {
     recyclable_compositor_->compositor()->SetScaleAndSize(scale_factor,
                                                           pixel_size);
   }
-  delegated_frame_host_->SwapDelegatedFrame(output_surface_id,
+  delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id,
                                             std::move(frame));
 }
 
 void BrowserCompositorMac::SetHasTransparentBackground(bool transparent) {
   has_transparent_background_ = transparent;
   if (recyclable_compositor_) {
     recyclable_compositor_->compositor()->SetHostHasTransparentBackground(
         has_transparent_background_);
   }
 }
@@ skipping 136 matching lines @@
     bool defer_compositor_lock) {
   NOTREACHED();
   return std::unique_ptr<ResizeLock>();
 }
 
 void BrowserCompositorMac::DelegatedFrameHostResizeLockWasReleased() {
   NOTREACHED();
 }
 
 void BrowserCompositorMac::DelegatedFrameHostSendReclaimCompositorResources(
-    int output_surface_id,
+    int compositor_frame_sink_id,
     bool is_swap_ack,
     const cc::ReturnedResourceArray& resources) {
   client_->BrowserCompositorMacSendReclaimCompositorResources(
-      output_surface_id, is_swap_ack, resources);
+      compositor_frame_sink_id, is_swap_ack, resources);
 }
 
 void BrowserCompositorMac::DelegatedFrameHostOnLostCompositorResources() {
   client_->BrowserCompositorMacOnLostCompositorResources();
 }
 
 void BrowserCompositorMac::SetBeginFrameSource(cc::BeginFrameSource* source) {
   if (begin_frame_source_ && needs_begin_frames_)
     begin_frame_source_->RemoveObserver(this);
   begin_frame_source_ = source;
@@ skipping 16 matching lines @@
 
 const cc::BeginFrameArgs& BrowserCompositorMac::LastUsedBeginFrameArgs() const {
   return last_begin_frame_args_;
 }
 
 void BrowserCompositorMac::OnBeginFrameSourcePausedChanged(bool paused) {
   // Only used on Android WebView.
 }
 
 }  // namespace content