Mus+Ash: Replace (Server)WindowSurface with (Server)WindowCompositorFrameSink

content/renderer/mus/compositor_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/compositor_mus_connection.h"
 
 #include "base/single_thread_task_runner.h"
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/mus/render_widget_mus_connection.h"
 #include "ui/events/blink/blink_event_util.h"
@@ skipping 28 matching lines @@
       compositor_task_runner_(compositor_task_runner),
       input_handler_manager_(input_handler_manager) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   compositor_task_runner_->PostTask(
       FROM_HERE, base::Bind(&CompositorMusConnection::
                                 CreateWindowTreeClientOnCompositorThread,
                             this, base::Passed(std::move(request))));
 }
 
 void CompositorMusConnection::AttachCompositorFrameSinkOnMainThread(
-    std::unique_ptr<ui::WindowSurfaceBinding> surface_binding) {
+    std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
+        compositor_frame_sink_binding) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   compositor_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &CompositorMusConnection::AttachCompositorFrameSinkOnCompositorThread,
-          this, base::Passed(std::move(surface_binding))));
+          this, base::Passed(std::move(compositor_frame_sink_binding))));
 }
 
 CompositorMusConnection::~CompositorMusConnection() {
   base::AutoLock auto_lock(window_tree_client_lock_);
   // Destruction must happen on the compositor task runner.
   DCHECK(!window_tree_client_);
 }
 
 void CompositorMusConnection::AttachCompositorFrameSinkOnCompositorThread(
-    std::unique_ptr<ui::WindowSurfaceBinding> surface_binding) {
+    std::unique_ptr<ui::WindowCompositorFrameSinkBinding>
+        compositor_frame_sink_binding) {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
-  window_surface_binding_ = std::move(surface_binding);
+  window_compositor_frame_sink_binding_ =
+      std::move(compositor_frame_sink_binding);
   if (root_) {
-    root_->AttachCompositorFrameSink(ui::mojom::SurfaceType::DEFAULT,
-                                     std::move(window_surface_binding_));
+    root_->AttachCompositorFrameSink(
+        ui::mojom::CompositorFrameSinkType::DEFAULT,
+        std::move(window_compositor_frame_sink_binding_));
   }
 }
 
 void CompositorMusConnection::CreateWindowTreeClientOnCompositorThread(
     mojo::InterfaceRequest<ui::mojom::WindowTreeClient> request) {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
   DCHECK(!window_tree_client_);
   std::unique_ptr<ui::WindowTreeClient> window_tree_client =
       base::MakeUnique<ui::WindowTreeClient>(this, nullptr, std::move(request));
   base::AutoLock auto_lock(window_tree_client_lock_);
@@ skipping 64 matching lines @@
   }
   main_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CompositorMusConnection::OnConnectionLostOnMainThread, this));
 }
 
 void CompositorMusConnection::OnEmbed(ui::Window* root) {
   DCHECK(compositor_task_runner_->BelongsToCurrentThread());
   root_ = root;
   root_->set_input_event_handler(this);
-  if (window_surface_binding_) {
-    root->AttachCompositorFrameSink(ui::mojom::SurfaceType::DEFAULT,
-                                    std::move(window_surface_binding_));
+  if (window_compositor_frame_sink_binding_) {
+    root->AttachCompositorFrameSink(
+        ui::mojom::CompositorFrameSinkType::DEFAULT,
+        std::move(window_compositor_frame_sink_binding_));
   }
 }
 
 void CompositorMusConnection::OnEmbedRootDestroyed(ui::Window* window) {
   DeleteWindowTreeClient();
 }
 
 void CompositorMusConnection::OnLostConnection(ui::WindowTreeClient* client) {
   DeleteWindowTreeClient();
 }
@@ skipping 56 matching lines @@
   }
   ack_callback.reset();
 
   main_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&CompositorMusConnection::OnWindowInputEventOnMainThread, this,
                  base::Passed(std::move(web_event)), ack));
 }
 
 }  // namespace content