Fork cc::OutputSurface into cc::CompositorFrameSink.

content/renderer/android/synchronous_compositor_filter.cc

Index: content/renderer/android/synchronous_compositor_filter.cc
diff --git a/content/renderer/android/synchronous_compositor_filter.cc b/content/renderer/android/synchronous_compositor_filter.cc
index dc96477782b18b866568cfb5d26faa6c22dc5795..8206c242321fa94d61bc96b40f33d90318bd5d61 100644
--- a/content/renderer/android/synchronous_compositor_filter.cc
+++ b/content/renderer/android/synchronous_compositor_filter.cc
@@ -131,24 +131,27 @@ void SynchronousCompositorFilter::FilterReadyOnCompositorThread() {
     DCHECK(entry_pair.second);
     int routing_id = entry_pair.first;
     CreateSynchronousCompositorProxy(routing_id, entry_pair.second);
-    auto output_surface_entry = output_surface_map_.find(routing_id);
-    if (output_surface_entry != output_surface_map_.end()) {
-      SetProxyOutputSurface(routing_id, output_surface_entry->second);
+    auto compositor_frame_sink_entry =
+        compositor_frame_sink_map_.find(routing_id);
+    if (compositor_frame_sink_entry != compositor_frame_sink_map_.end()) {
+      SetProxyCompositorFrameSink(routing_id,
+                                  compositor_frame_sink_entry->second);
     }
   }
 }
 
-void SynchronousCompositorFilter::RegisterOutputSurface(
+void SynchronousCompositorFilter::RegisterCompositorFrameSink(
     int routing_id,
-    SynchronousCompositorOutputSurface* output_surface) {
+    SynchronousCompositorFrameSink* compositor_frame_sink) {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
-  DCHECK(output_surface);
+  DCHECK(compositor_frame_sink);
   SynchronousCompositorProxy* proxy = FindProxy(routing_id);
   if (proxy) {
-    proxy->SetOutputSurface(output_surface);
+    proxy->SetCompositorFrameSink(compositor_frame_sink);
   } else {
-    DCHECK(output_surface_map_.find(routing_id) == output_surface_map_.end());
-    output_surface_map_[routing_id] = output_surface;
+    DCHECK(compositor_frame_sink_map_.find(routing_id) ==
+           compositor_frame_sink_map_.end());
+    compositor_frame_sink_map_[routing_id] = compositor_frame_sink;
   }
 }
 
@@ -164,18 +167,18 @@ void SynchronousCompositorFilter::OnSynchronizeRendererState(
   }
 }
 
-void SynchronousCompositorFilter::UnregisterOutputSurface(
+void SynchronousCompositorFilter::UnregisterCompositorFrameSink(
     int routing_id,
-    SynchronousCompositorOutputSurface* output_surface) {
+    SynchronousCompositorFrameSink* compositor_frame_sink) {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
-  DCHECK(output_surface);
+  DCHECK(compositor_frame_sink);
   SynchronousCompositorProxy* proxy = FindProxy(routing_id);
   if (proxy) {
-    proxy->SetOutputSurface(nullptr);
+    proxy->SetCompositorFrameSink(nullptr);
   }
-  auto entry = output_surface_map_.find(routing_id);
-  if (entry != output_surface_map_.end())
-    output_surface_map_.erase(entry);
+  auto entry = compositor_frame_sink_map_.find(routing_id);
+  if (entry != compositor_frame_sink_map_.end())
+    compositor_frame_sink_map_.erase(entry);
 }
 
 void SynchronousCompositorFilter::CreateSynchronousCompositorProxy(
@@ -188,13 +191,13 @@ void SynchronousCompositorFilter::CreateSynchronousCompositorProxy(
   sync_compositor_map_.add(routing_id, std::move(proxy));
 }
 
-void SynchronousCompositorFilter::SetProxyOutputSurface(
+void SynchronousCompositorFilter::SetProxyCompositorFrameSink(
     int routing_id,
-    SynchronousCompositorOutputSurface* output_surface) {
-  DCHECK(output_surface);
+    SynchronousCompositorFrameSink* compositor_frame_sink) {
+  DCHECK(compositor_frame_sink);
   SynchronousCompositorProxy* proxy = FindProxy(routing_id);
   DCHECK(proxy);
-  proxy->SetOutputSurface(output_surface);
+  proxy->SetCompositorFrameSink(compositor_frame_sink);
 }
 
 void SynchronousCompositorFilter::DidAddSynchronousHandlerProxy(
@@ -205,9 +208,9 @@ void SynchronousCompositorFilter::DidAddSynchronousHandlerProxy(
   if (filter_ready_) {
     CreateSynchronousCompositorProxy(routing_id,
                                      synchronous_input_handler_proxy);
-    auto entry = output_surface_map_.find(routing_id);
-    if (entry != output_surface_map_.end())
-      SetProxyOutputSurface(routing_id, entry->second);
+    auto entry = compositor_frame_sink_map_.find(routing_id);
+    if (entry != compositor_frame_sink_map_.end())
+      SetProxyCompositorFrameSink(routing_id, entry->second);
   } else {
     auto*& mapped_synchronous_input_handler_proxy =
         synchronous_input_handler_proxy_map_[routing_id];