Mus+Ash: Towards Unifying CompositorFrameSink terminology

services/ui/public/cpp/window.cc

 // Copyright 2014 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 "services/ui/public/cpp/window.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "services/ui/common/transient_window_utils.h"
+#include "services/ui/public/cpp/compositor_frame_sink.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/cpp/surface_id_handler.h"
 #include "services/ui/public/cpp/window_observer.h"
 #include "services/ui/public/cpp/window_private.h"
 #include "services/ui/public/cpp/window_property.h"
 #include "services/ui/public/cpp/window_surface.h"
 #include "services/ui/public/cpp/window_tracker.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/display/display.h"
@@ skipping 236 matching lines @@
     client_->SetPredefinedCursor(server_id_, cursor_id);
   LocalSetPredefinedCursor(cursor_id);
 }
 
 bool Window::IsDrawn() const {
   if (!visible_)
     return false;
   return parent_ ? parent_->IsDrawn() : parent_drawn_;
 }
 
-std::unique_ptr<WindowSurface> Window::RequestSurface(mojom::SurfaceType type) {
+std::unique_ptr<CompositorFrameSink> Window::RequestCompositorFrameSink(
+    mojom::SurfaceType type,
+    scoped_refptr<cc::ContextProvider> context_provider) {
   std::unique_ptr<WindowSurfaceBinding> surface_binding;
   std::unique_ptr<WindowSurface> surface =
       WindowSurface::Create(&surface_binding);
-  AttachSurface(type, std::move(surface_binding));
-  return surface;
+  AttachCompositorFrameSink(type, std::move(surface_binding));
+  return base::MakeUnique<CompositorFrameSink>(std::move(context_provider),
+                                               std::move(surface));
 }
 
-void Window::AttachSurface(
+void Window::AttachCompositorFrameSink(
     mojom::SurfaceType type,
     std::unique_ptr<WindowSurfaceBinding> surface_binding) {
   window_tree()->AttachSurface(
       server_id_, type, std::move(surface_binding->surface_request_),
       mojo::MakeProxy(std::move(surface_binding->surface_client_)));
 }
 
 void Window::ClearSharedProperty(const std::string& name) {
   SetSharedPropertyInternal(name, nullptr);
 }
@@ skipping 667 matching lines @@
     notifier->NotifyWindowReordered();
 
   return true;
 }
 
 // static
 Window** Window::GetStackingTarget(Window* window) {
   return &window->stacking_target_;
 }
 }  // namespace ui