Fork cc::OutputSurface into cc::CompositorFrameSink.

content/browser/android/synchronous_compositor_host.cc

 // Copyright 2015 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/android/synchronous_compositor_host.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/containers/hash_tables.h"
@@ skipping 70 matching lines @@
   client_->DidInitializeCompositor(this, process_id_, routing_id_);
 }
 
 SynchronousCompositorHost::~SynchronousCompositorHost() {
   client_->DidDestroyCompositor(this, process_id_, routing_id_);
 }
 
 bool SynchronousCompositorHost::OnMessageReceived(const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SynchronousCompositorHost, message)
-    IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_OutputSurfaceCreated,
-                        OutputSurfaceCreated)
+    IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_CompositorFrameSinkCreated,
+                        CompositorFrameSinkCreated)
     IPC_MESSAGE_HANDLER(SyncCompositorHostMsg_UpdateState, ProcessCommonParams)
     IPC_MESSAGE_HANDLER_GENERIC(SyncCompositorHostMsg_ReturnFrame,
                                 DemandDrawHwReceiveFrame(message))
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
 void SynchronousCompositorHost::DemandDrawHwAsync(
     const gfx::Size& viewport_size,
     const gfx::Rect& viewport_rect_for_tile_priority,
     const gfx::Transform& transform_for_tile_priority) {
   SyncCompositorDemandDrawHwParams params(viewport_size,
                                           viewport_rect_for_tile_priority,
                                           transform_for_tile_priority);
   sender_->Send(new SyncCompositorMsg_DemandDrawHwAsync(routing_id_, params));
 }
 
 SynchronousCompositor::Frame SynchronousCompositorHost::DemandDrawHw(
     const gfx::Size& viewport_size,
     const gfx::Rect& viewport_rect_for_tile_priority,
     const gfx::Transform& transform_for_tile_priority) {
   SyncCompositorDemandDrawHwParams params(viewport_size,
                                           viewport_rect_for_tile_priority,
                                           transform_for_tile_priority);
-  uint32_t output_surface_id;
+  uint32_t compositor_frame_sink_id;
   cc::CompositorFrame compositor_frame;
   SyncCompositorCommonRendererParams common_renderer_params;
 
   if (!sender_->Send(new SyncCompositorMsg_DemandDrawHw(
-          routing_id_, params, &common_renderer_params, &output_surface_id,
-          &compositor_frame))) {
+          routing_id_, params, &common_renderer_params,
+          &compositor_frame_sink_id, &compositor_frame))) {
     return SynchronousCompositor::Frame();
   }
 
   ProcessCommonParams(common_renderer_params);
 
-  return ProcessHardwareFrame(output_surface_id, std::move(compositor_frame));
+  return ProcessHardwareFrame(compositor_frame_sink_id,
+                              std::move(compositor_frame));
 }
 
 bool SynchronousCompositorHost::DemandDrawHwReceiveFrame(
     const IPC::Message& message) {
   SyncCompositorHostMsg_ReturnFrame::Param param;
   if (!SyncCompositorHostMsg_ReturnFrame::Read(&message, &param))
     return false;
-  uint32_t output_surface_id = std::get<0>(param);
+  uint32_t compositor_frame_sink_id = std::get<0>(param);
   cc::CompositorFrame compositor_frame = std::move(std::get<1>(param));
-  client_->OnDrawHardwareProcessFrame(
-      ProcessHardwareFrame(output_surface_id, std::move(compositor_frame)));
+  client_->OnDrawHardwareProcessFrame(ProcessHardwareFrame(
+      compositor_frame_sink_id, std::move(compositor_frame)));
   return true;
 }
 
 SynchronousCompositor::Frame SynchronousCompositorHost::ProcessHardwareFrame(
-    uint32_t output_surface_id,
+    uint32_t compositor_frame_sink_id,
     cc::CompositorFrame compositor_frame) {
   SynchronousCompositor::Frame frame;
   frame.frame.reset(new cc::CompositorFrame);
-  frame.output_surface_id = output_surface_id;
+  frame.compositor_frame_sink_id = compositor_frame_sink_id;
   *frame.frame = std::move(compositor_frame);
   if (!frame.frame->delegated_frame_data) {
     // This can happen if compositor did not swap in this draw.
     frame.frame.reset();
   }
   if (frame.frame) {
     UpdateFrameMetaData(frame.frame->metadata.Clone());
   }
   return frame;
 }
@@ skipping 152 matching lines @@
   software_draw_shm_ = std::move(software_draw_shm);
   ProcessCommonParams(common_renderer_params);
 }
 
 void SynchronousCompositorHost::SendZeroMemory() {
   // No need to check return value.
   sender_->Send(new SyncCompositorMsg_ZeroSharedMemory(routing_id_));
 }
 
 void SynchronousCompositorHost::ReturnResources(
-    uint32_t output_surface_id,
+    uint32_t compositor_frame_sink_id,
     const cc::ReturnedResourceArray& resources) {
   DCHECK(!resources.empty());
   sender_->Send(new SyncCompositorMsg_ReclaimResources(
-      routing_id_, output_surface_id, resources));
+      routing_id_, compositor_frame_sink_id, resources));
 }
 
 void SynchronousCompositorHost::SetMemoryPolicy(size_t bytes_limit) {
   if (bytes_limit_ == bytes_limit)
     return;
 
   if (sender_->Send(
           new SyncCompositorMsg_SetMemoryPolicy(routing_id_, bytes_limit))) {
     bytes_limit_ = bytes_limit;
   }
@@ skipping 34 matching lines @@
   client_->DidOverscroll(this, over_scroll_params.accumulated_overscroll,
                          over_scroll_params.latest_overscroll_delta,
                          over_scroll_params.current_fling_velocity);
 }
 
 void SynchronousCompositorHost::DidSendBeginFrame(
     ui::WindowAndroid* window_android) {
   rph_observer_->SyncStateAfterVSync(window_android, this);
 }
 
-void SynchronousCompositorHost::OutputSurfaceCreated() {
-  // New output surface is not aware of state from Browser side. So need to
+void SynchronousCompositorHost::CompositorFrameSinkCreated() {
+  // New CompositorFrameSink is not aware of state from Browser side. So need to
   // re-send all browser side state here.
   sender_->Send(
       new SyncCompositorMsg_SetMemoryPolicy(routing_id_, bytes_limit_));
 }
 
 void SynchronousCompositorHost::ProcessCommonParams(
     const SyncCompositorCommonRendererParams& params) {
   // Ignore if |renderer_param_version_| is newer than |params.version|. This
   // comparison takes into account when the unsigned int wraps.
   if ((renderer_param_version_ - params.version) < 0x80000000) {
@@ skipping 20 matching lines @@
   if (params.page_scale_factor) {
     client_->UpdateRootLayerState(
         this, gfx::ScrollOffsetToVector2dF(params.total_scroll_offset),
         gfx::ScrollOffsetToVector2dF(params.max_scroll_offset),
         params.scrollable_size, params.page_scale_factor,
         params.min_page_scale_factor, params.max_page_scale_factor);
   }
 }
 
 }  // namespace content