Mus+Ash: Towards Unifying CompositorFrameSink terminology

content/renderer/mus/render_widget_mus_connection.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/renderer/mus/render_widget_mus_connection.h"
 
 #include <map>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
 #include "content/renderer/mus/compositor_mus_connection.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
 #include "services/ui/public/cpp/compositor_frame_sink.h"
-#include "services/ui/public/interfaces/surface.mojom.h"
+#include "services/ui/public/cpp/context_provider.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 
 namespace content {
 
 namespace {
 
 typedef std::map<int, RenderWidgetMusConnection*> ConnectionMap;
 base::LazyInstance<ConnectionMap>::Leaky g_connections =
     LAZY_INSTANCE_INITIALIZER;
 }
 
 void RenderWidgetMusConnection::Bind(
     mojo::InterfaceRequest<ui::mojom::WindowTreeClient> request) {
   DCHECK(thread_checker_.CalledOnValidThread());
   RenderThreadImpl* render_thread = RenderThreadImpl::current();
   compositor_mus_connection_ = new CompositorMusConnection(
       routing_id_, render_thread->GetCompositorMainThreadTaskRunner(),
       render_thread->compositor_task_runner(), std::move(request),
       render_thread->input_handler_manager());
   if (window_surface_binding_) {
-    compositor_mus_connection_->AttachSurfaceOnMainThread(
+    compositor_mus_connection_->AttachCompositorFrameSinkOnMainThread(
         std::move(window_surface_binding_));
   }
 }
 
 std::unique_ptr<cc::CompositorFrameSink>
 RenderWidgetMusConnection::CreateCompositorFrameSink(
     scoped_refptr<gpu::GpuChannelHost> gpu_channel_host) {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(!window_surface_binding_);
 
   std::unique_ptr<cc::CompositorFrameSink> surface(new ui::CompositorFrameSink(
-      std::move(gpu_channel_host),
+      make_scoped_refptr(new ui::ContextProvider(std::move(gpu_channel_host))),
       ui::WindowSurface::Create(&window_surface_binding_)));
   if (compositor_mus_connection_) {
-    compositor_mus_connection_->AttachSurfaceOnMainThread(
+    compositor_mus_connection_->AttachCompositorFrameSinkOnMainThread(
         std::move(window_surface_binding_));
   }
   return surface;
 }
 
 // static
 RenderWidgetMusConnection* RenderWidgetMusConnection::Get(int routing_id) {
   auto it = g_connections.Get().find(routing_id);
   if (it != g_connections.Get().end())
     return it->second;
@@ skipping 105 matching lines @@
   // previous event.
   // DCHECK(pending_ack_.is_null());
   pending_ack_ = ack;
   // TODO(fsamuel, sadrul): Track real latency info.
   ui::LatencyInfo latency_info;
   input_handler_->HandleInputEvent(*input_event, latency_info,
                                    DISPATCH_TYPE_BLOCKING);
 }
 
 }  // namespace content