Fork cc::OutputSurface into cc::CompositorFrameSink.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // 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_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1022 matching lines @@
   ::ClipCursor(&window_rect);
 }
 
 void RenderWidgetHostViewAura::OnLegacyWindowDestroyed() {
   legacy_render_widget_host_HWND_ = NULL;
   legacy_window_destroyed_ = true;
 }
 #endif
 
 void RenderWidgetHostViewAura::OnSwapCompositorFrame(
-    uint32_t output_surface_id,
+    uint32_t compositor_frame_sink_id,
     cc::CompositorFrame frame) {
   TRACE_EVENT0("content", "RenderWidgetHostViewAura::OnSwapCompositorFrame");
 
   last_scroll_offset_ = frame.metadata.root_scroll_offset;
   if (!frame.delegated_frame_data)
     return;
 
   cc::Selection<gfx::SelectionBound> selection = frame.metadata.selection;
   if (IsUseZoomForDSFEnabled()) {
     float viewportToDIPScale = 1.0f / current_device_scale_factor_;
     gfx::PointF start_edge_top = selection.start.edge_top();
     gfx::PointF start_edge_bottom = selection.start.edge_bottom();
     gfx::PointF end_edge_top = selection.end.edge_top();
     gfx::PointF end_edge_bottom = selection.end.edge_bottom();
 
     start_edge_top.Scale(viewportToDIPScale);
     start_edge_bottom.Scale(viewportToDIPScale);
     end_edge_top.Scale(viewportToDIPScale);
     end_edge_bottom.Scale(viewportToDIPScale);
 
     selection.start.SetEdge(start_edge_top, start_edge_bottom);
     selection.end.SetEdge(end_edge_top, end_edge_bottom);
   }
 
-  delegated_frame_host_->SwapDelegatedFrame(output_surface_id,
+  delegated_frame_host_->SwapDelegatedFrame(compositor_frame_sink_id,
                                             std::move(frame));
   SelectionUpdated(selection.is_editable, selection.is_empty_text_form_control,
                    selection.start, selection.end);
 }
 
 void RenderWidgetHostViewAura::ClearCompositorFrame() {
   delegated_frame_host_->ClearDelegatedFrame();
 }
 
 void RenderWidgetHostViewAura::DidStopFlinging() {
@@ skipping 1823 matching lines @@
   return std::unique_ptr<ResizeLock>(new CompositorResizeLock(
       window_->GetHost(), desired_size, defer_compositor_lock,
       base::TimeDelta::FromMilliseconds(kResizeLockTimeoutMs)));
 }
 
 void RenderWidgetHostViewAura::DelegatedFrameHostResizeLockWasReleased() {
   host_->WasResized();
 }
 
 void RenderWidgetHostViewAura::DelegatedFrameHostSendReclaimCompositorResources(
-    int output_surface_id,
+    int compositor_frame_sink_id,
     bool is_swap_ack,
     const cc::ReturnedResourceArray& resources) {
   host_->Send(new ViewMsg_ReclaimCompositorResources(
-      host_->GetRoutingID(), output_surface_id, is_swap_ack, resources));
+      host_->GetRoutingID(), compositor_frame_sink_id, is_swap_ack, resources));
 }
 
 void RenderWidgetHostViewAura::DelegatedFrameHostOnLostCompositorResources() {
   host_->ScheduleComposite();
 }
 
 void RenderWidgetHostViewAura::SetBeginFrameSource(
     cc::BeginFrameSource* source) {
   bool needs_begin_frames = host_->needs_begin_frames();
   if (begin_frame_source_ && needs_begin_frames)
@@ skipping 113 matching lines @@
           ->GetTextSelection(focused_view)
           ->GetSelectedText(&selected_text)) {
     // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard.
     ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION);
     clipboard_writer.WriteText(selected_text);
   }
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
 }
 
 }  // namespace content