Fork cc::OutputSurface into cc::CompositorFrameSink.

content/browser/renderer_host/render_widget_host_impl.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_impl.h"
 
 #include <math.h>
 
 #include <set>
 #include <tuple>
@@ skipping 1581 matching lines @@
 bool RenderWidgetHostImpl::OnSwapCompositorFrame(
     const IPC::Message& message) {
   // This trace event is used in
   // chrome/browser/extensions/api/cast_streaming/performance_test.cc
   TRACE_EVENT0("test_fps,benchmark", "OnSwapCompositorFrame");
 
   ViewHostMsg_SwapCompositorFrame::Param param;
   if (!ViewHostMsg_SwapCompositorFrame::Read(&message, &param))
     return false;
   cc::CompositorFrame frame(std::move(std::get<1>(param)));
-  uint32_t output_surface_id = std::get<0>(param);
+  uint32_t compositor_frame_sink_id = std::get<0>(param);
   std::vector<IPC::Message> messages_to_deliver_with_frame;
   messages_to_deliver_with_frame.swap(std::get<2>(param));
 
   if (!ui::LatencyInfo::Verify(frame.metadata.latency_info,
                                "RenderWidgetHostImpl::OnSwapCompositorFrame")) {
     std::vector<ui::LatencyInfo>().swap(frame.metadata.latency_info);
   }
 
   latency_tracker_.OnSwapCompositorFrame(&frame.metadata.latency_info);
 
   bool is_mobile_optimized = IsMobileOptimizedFrame(frame.metadata);
   input_router_->NotifySiteIsMobileOptimized(is_mobile_optimized);
   if (touch_emulator_)
     touch_emulator_->SetDoubleTapSupportForPageEnabled(!is_mobile_optimized);
 
   if (view_) {
-    view_->OnSwapCompositorFrame(output_surface_id, std::move(frame));
+    view_->OnSwapCompositorFrame(compositor_frame_sink_id, std::move(frame));
     view_->DidReceiveRendererFrame();
   } else {
     cc::ReturnedResourceArray resources;
     if (frame.delegated_frame_data) {
       cc::TransferableResource::ReturnResources(
           frame.delegated_frame_data->resource_list, &resources);
     }
-    SendReclaimCompositorResources(routing_id_, output_surface_id,
+    SendReclaimCompositorResources(routing_id_, compositor_frame_sink_id,
                                    process_->GetID(), true /* is_swap_ack */,
                                    resources);
   }
 
   RenderProcessHost* rph = GetProcess();
   for (std::vector<IPC::Message>::const_iterator i =
            messages_to_deliver_with_frame.begin();
        i != messages_to_deliver_with_frame.end();
        ++i) {
     rph->OnMessageReceived(*i);
@@ skipping 418 matching lines @@
     return false;
   }
 
   Send(new ViewMsg_LockMouse_ACK(routing_id_, true));
   return true;
 }
 
 // static
 void RenderWidgetHostImpl::SendReclaimCompositorResources(
     int32_t route_id,
-    uint32_t output_surface_id,
+    uint32_t compositor_frame_sink_id,
     int renderer_host_id,
     bool is_swap_ack,
     const cc::ReturnedResourceArray& resources) {
   RenderProcessHost* host = RenderProcessHost::FromID(renderer_host_id);
   if (!host)
     return;
-  host->Send(new ViewMsg_ReclaimCompositorResources(route_id, output_surface_id,
-                                                    is_swap_ack, resources));
+  host->Send(new ViewMsg_ReclaimCompositorResources(
+      route_id, compositor_frame_sink_id, is_swap_ack, resources));
 }
 
 void RenderWidgetHostImpl::DelayedAutoResized() {
   gfx::Size new_size = new_auto_size_;
   // Clear the new_auto_size_ since the empty value is used as a flag to
   // indicate that no callback is in progress (i.e. without this line
   // DelayedAutoResized will not get called again).
   new_auto_size_.SetSize(0, 0);
   if (!auto_resize_enabled_)
     return;
@@ skipping 121 matching lines @@
   return delegate_ ? delegate_->GetRootBrowserAccessibilityManager() : NULL;
 }
 
 BrowserAccessibilityManager*
     RenderWidgetHostImpl::GetOrCreateRootBrowserAccessibilityManager() {
   return delegate_ ?
       delegate_->GetOrCreateRootBrowserAccessibilityManager() : NULL;
 }
 
 }  // namespace content