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

services/ui/ws/server_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_WS_SERVER_WINDOW_H_
 #define SERVICES_UI_WS_SERVER_WINDOW_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/observer_list.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/ws/ids.h"
-#include "services/ui/ws/server_window_surface.h"
+#include "services/ui/ws/server_window_compositor_frame_sink.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/vector2d.h"
 #include "ui/gfx/transform.h"
 #include "ui/platform_window/text_input_state.h"
 
 namespace ui {
 namespace ws {
 
 class ServerWindowDelegate;
 class ServerWindowObserver;
-class ServerWindowSurfaceManager;
+class ServerWindowCompositorFrameSinkManager;
 
 // Server side representation of a window. Delegate is informed of interesting
 // events.
 //
 // It is assumed that all functions that mutate the tree have validated the
 // mutation is possible before hand. For example, Reorder() assumes the supplied
 // window is a child and not already in position.
 //
 // ServerWindows do not own their children. If you delete a window that has
 // children the children are implicitly removed. Similarly if a window has a
 // parent and the window is deleted the deleted window is implicitly removed
 // from the parent.
 class ServerWindow {
  public:
   using Properties = std::map<std::string, std::vector<uint8_t>>;
   using Windows = std::vector<ServerWindow*>;
 
   ServerWindow(ServerWindowDelegate* delegate, const WindowId& id);
   ServerWindow(ServerWindowDelegate* delegate,
                const WindowId& id,
                const Properties& properties);
   ~ServerWindow();
 
   void AddObserver(ServerWindowObserver* observer);
   void RemoveObserver(ServerWindowObserver* observer);
   bool HasObserver(ServerWindowObserver* observer);
 
   // Creates a new surface of the specified type, replacing the existing.
-  void CreateSurface(
-      mojom::SurfaceType surface_type,
-      mojo::InterfaceRequest<cc::mojom::MojoCompositorFrameSink> request,
+  void CreateCompositorFrameSink(
+      mojom::CompositorFrameSinkType compositor_frame_sink_type,
+      cc::mojom::MojoCompositorFrameSinkRequest request,
       cc::mojom::MojoCompositorFrameSinkClientPtr client);
 
   const WindowId& id() const { return id_; }
 
   void Add(ServerWindow* child);
   void Remove(ServerWindow* child);
   void Reorder(ServerWindow* relative, mojom::OrderDirection diretion);
   void StackChildAtBottom(ServerWindow* child);
   void StackChildAtTop(ServerWindow* child);
 
@@ skipping 88 matching lines @@
   // visible.
   bool IsDrawn() const;
 
   const gfx::Insets& extended_hit_test_region() const {
     return extended_hit_test_region_;
   }
   void set_extended_hit_test_region(const gfx::Insets& insets) {
     extended_hit_test_region_ = insets;
   }
 
-  ServerWindowSurfaceManager* GetOrCreateSurfaceManager();
-  ServerWindowSurfaceManager* surface_manager() {
-    return surface_manager_.get();
+  ServerWindowCompositorFrameSinkManager*
+  GetOrCreateCompositorFrameSinkManager();
+  ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager() {
+    return compositor_frame_sink_manager_.get();
   }
-  const ServerWindowSurfaceManager* surface_manager() const {
-    return surface_manager_.get();
+  const ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager()
+      const {
+    return compositor_frame_sink_manager_.get();
   }
 
   // Offset of the underlay from the the window bounds (used for shadows).
   const gfx::Vector2d& underlay_offset() const { return underlay_offset_; }
   void SetUnderlayOffset(const gfx::Vector2d& offset);
 
   ServerWindowDelegate* delegate() { return delegate_; }
 
   // Called when the window is no longer an embed root.
   void OnEmbeddedAppDisconnected();
@@ skipping 29 matching lines @@
   // transient ancestor changing.
   ServerWindow* stacking_target_;
   ServerWindow* transient_parent_;
   Windows transient_children_;
 
   bool is_modal_;
   bool visible_;
   gfx::Rect bounds_;
   gfx::Insets client_area_;
   std::vector<gfx::Rect> additional_client_areas_;
-  std::unique_ptr<ServerWindowSurfaceManager> surface_manager_;
+  std::unique_ptr<ServerWindowCompositorFrameSinkManager>
+      compositor_frame_sink_manager_;
   mojom::Cursor cursor_id_;
   mojom::Cursor non_client_cursor_id_;
   float opacity_;
   bool can_focus_;
   bool can_accept_events_;
   gfx::Transform transform_;
   ui::TextInputState text_input_state_;
 
   Properties properties_;
 
@@ skipping 13 matching lines @@
 
   base::ObserverList<ServerWindowObserver> observers_;
 
   DISALLOW_COPY_AND_ASSIGN(ServerWindow);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_SERVER_WINDOW_H_