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

services/ui/public/cpp/window.h

 // 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.
 
 #ifndef SERVICES_UI_PUBLIC_CPP_WINDOW_H_
 #define SERVICES_UI_PUBLIC_CPP_WINDOW_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
 #include "services/ui/common/types.h"
-#include "services/ui/public/cpp/compositor_frame_sink.h"
 #include "services/ui/public/cpp/surface_id_handler.h"
+#include "services/ui/public/cpp/window_compositor_frame_sink.h"
 #include "services/ui/public/interfaces/mus_constants.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace gfx {
 class Size;
 }
 
 namespace ui {
 
 class InputEventHandler;
 class ServiceProviderImpl;
 class SurfaceIdHandler;
 class WindowObserver;
 class WindowSurface;
-class WindowSurfaceBinding;
+class WindowCompositorFrameSinkBinding;

[rjkroege, 2016/10/20 22:22:18]

these need to be in alphabetical order

[Fady Samuel, 2016/10/21 20:53:27]

Done.

 class WindowDropTarget;
 class WindowTreeClient;
 class WindowTreeClientPrivate;
 
 namespace {
 class OrderChangedNotifier;
 }
 
 // Defined in window_property.h (which we do not include)
 template <typename T>
@@ skipping 62 matching lines @@
   void SetOpacity(float opacity);
 
   // Cursors
   mojom::Cursor predefined_cursor() const { return cursor_id_; }
   void SetPredefinedCursor(ui::mojom::Cursor cursor_id);
 
   // A Window is drawn if the Window and all its ancestors are visible and the
   // Window is attached to the root.
   bool IsDrawn() const;
 
-  std::unique_ptr<CompositorFrameSink> RequestCompositorFrameSink(
-      mojom::SurfaceType type,
+  std::unique_ptr<WindowCompositorFrameSink> RequestCompositorFrameSink(
+      mojom::CompositorFrameSinkType type,
       scoped_refptr<cc::ContextProvider> context_provider);
 
   void AttachCompositorFrameSink(
-      mojom::SurfaceType type,
-      std::unique_ptr<WindowSurfaceBinding> surface_binding);
+      mojom::CompositorFrameSinkType type,
+      std::unique_ptr<WindowCompositorFrameSinkBinding>
+          compositor_frame_sink_binding);
 
   // The template-ized versions of the following methods rely on the presence
   // of a mojo::TypeConverter<const std::vector<uint8_t>, T>.
   // Sets a shared property on the window which is sent to the window server and
   // shared with other clients that can view this window.
   template <typename T>
   void SetSharedProperty(const std::string& name, const T& data);
   // Gets a shared property set on the window. The property must exist. Call
   // HasSharedProperty() before calling.
   template <typename T>
@@ skipping 271 matching lines @@
   std::map<const void*, Value> prop_map_;
 
   std::unique_ptr<SurfaceInfo> surface_info_;
 
   DISALLOW_COPY_AND_ASSIGN(Window);
 };
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_PUBLIC_CPP_WINDOW_H_