Fork cc::OutputSurface into cc::CompositorFrameSink.

content/browser/renderer_host/render_widget_host_view_mac.mm

 // Copyright (c) 2012 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/render_widget_host_view_mac.h"
 
 #import <objc/runtime.h>
 #include <OpenGL/gl.h>
 #include <QuartzCore/QuartzCore.h>
 #include <stdint.h>
@@ skipping 382 matching lines @@
   // flashes of brighter colors during the transition.
   if (render_widget_host_->delegate() &&
       render_widget_host_->delegate()->IsFullscreenForCurrentTab()) {
     return SK_ColorBLACK;
   }
   return color;
 }
 
 void RenderWidgetHostViewMac::
     BrowserCompositorMacSendReclaimCompositorResources(
-        int output_surface_id,
+        int compositor_frame_sink_id,
         bool is_swap_ack,
         const cc::ReturnedResourceArray& resources) {
   render_widget_host_->Send(new ViewMsg_ReclaimCompositorResources(
-      render_widget_host_->GetRoutingID(), output_surface_id, is_swap_ack,
-      resources));
+      render_widget_host_->GetRoutingID(), compositor_frame_sink_id,
+      is_swap_ack, resources));
 }
 
 void RenderWidgetHostViewMac::BrowserCompositorMacOnLostCompositorResources() {
   render_widget_host_->ScheduleComposite();
 }
 
 void RenderWidgetHostViewMac::BrowserCompositorMacSendBeginFrame(
     const cc::BeginFrameArgs& args) {
   render_widget_host_->Send(
       new ViewMsg_BeginFrame(render_widget_host_->GetRoutingID(), args));
@@ skipping 885 matching lines @@
 
 bool RenderWidgetHostViewMac::HasAcceleratedSurface(
       const gfx::Size& desired_size) {
   ui::AcceleratedWidgetMac* accelerated_widget_mac =
       browser_compositor_->GetAcceleratedWidgetMac();
   if (accelerated_widget_mac)
     return accelerated_widget_mac->HasFrameOfSize(desired_size);
   return false;
 }
 
-void RenderWidgetHostViewMac::OnSwapCompositorFrame(uint32_t output_surface_id,
-                                                    cc::CompositorFrame frame) {
+void RenderWidgetHostViewMac::OnSwapCompositorFrame(
+    uint32_t compositor_frame_sink_id,
+    cc::CompositorFrame frame) {
   TRACE_EVENT0("browser", "RenderWidgetHostViewMac::OnSwapCompositorFrame");
 
   last_scroll_offset_ = frame.metadata.root_scroll_offset;
 
   page_at_minimum_scale_ =
       frame.metadata.page_scale_factor == frame.metadata.min_page_scale_factor;
   if (frame.delegated_frame_data) {
-    browser_compositor_->SwapCompositorFrame(output_surface_id,
+    browser_compositor_->SwapCompositorFrame(compositor_frame_sink_id,
                                              std::move(frame));
     UpdateDisplayVSyncParameters();
   } else {
     DLOG(ERROR) << "Received unexpected frame type.";
     bad_message::ReceivedBadMessage(render_widget_host_->GetProcess(),
                                     bad_message::RWHVM_UNEXPECTED_FRAME_TYPE);
   }
 }
 
 void RenderWidgetHostViewMac::ClearCompositorFrame() {
@@ skipping 1931 matching lines @@
 
 // "-webkit-app-region: drag | no-drag" is implemented on Mac by excluding
 // regions that are not draggable. (See ControlRegionView in
 // native_app_window_cocoa.mm). This requires the render host view to be
 // draggable by default.
 - (BOOL)mouseDownCanMoveWindow {
   return YES;
 }
 
 @end