WIP: Propagate SurfaceID up window tree hierarchy

services/ui/ws/window_server.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_WINDOW_SERVER_H_
 #define SERVICES_UI_WS_WINDOW_SERVER_H_
 
 #include <stdint.h>
 
 #include <map>
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/macros.h"
 #include "base/optional.h"
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/ui/public/interfaces/window_manager_window_tree_factory.mojom.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 #include "services/ui/public/interfaces/window_tree_host.mojom.h"
-#include "services/ui/surfaces/surfaces_state.h"
+#include "services/ui/surfaces/display_compositor.h"
+#include "services/ui/surfaces/display_compositor_client.h"
 #include "services/ui/ws/display.h"
 #include "services/ui/ws/gpu_service_proxy_delegate.h"
 #include "services/ui/ws/ids.h"
 #include "services/ui/ws/operation.h"
 #include "services/ui/ws/server_window_delegate.h"
 #include "services/ui/ws/server_window_observer.h"
 #include "services/ui/ws/user_display_manager_delegate.h"
 #include "services/ui/ws/user_id_tracker.h"
 #include "services/ui/ws/user_id_tracker_observer.h"
 #include "services/ui/ws/window_manager_window_tree_factory_set.h"
 
 namespace ui {
 namespace ws {
 
 class AccessPolicy;
 class DisplayManager;
 class GpuServiceProxy;
 class ServerWindow;
 class UserActivityMonitor;
 class WindowManagerState;
 class WindowServerDelegate;
 class WindowTree;
 class WindowTreeBinding;
 
 // WindowServer manages the set of clients of the window server (all the
 // WindowTrees) as well as providing the root of the hierarchy.
 class WindowServer : public ServerWindowDelegate,
                      public ServerWindowObserver,
+                     public surfaces::DisplayCompositorClient,
                      public GpuServiceProxyDelegate,
                      public UserDisplayManagerDelegate,
                      public UserIdTrackerObserver {
  public:
   explicit WindowServer(WindowServerDelegate* delegate);
   ~WindowServer() override;
 
   WindowServerDelegate* delegate() { return delegate_; }
 
   UserIdTracker* user_id_tracker() { return &user_id_tracker_; }
@@ skipping 108 matching lines @@
 
   // Called when we get an unexpected message from the WindowManager.
   // TODO(sky): decide what we want to do here.
   void WindowManagerSentBogusMessage() {}
 
   // These functions trivially delegate to all WindowTrees, which in
   // term notify their clients.
   void ProcessWindowBoundsChanged(const ServerWindow* window,
                                   const gfx::Rect& old_bounds,
                                   const gfx::Rect& new_bounds);
+  void ProcessWindowSurfaceCreated(ServerWindow* window,
+                                   const gfx::Size& size,
+                                   float device_scale_factor,
+                                   const cc::SurfaceId& surface_id);
   void ProcessClientAreaChanged(
       const ServerWindow* window,
       const gfx::Insets& new_client_area,
       const std::vector<gfx::Rect>& new_additional_client_areas);
   void ProcessCaptureChanged(const ServerWindow* new_capture,
                              const ServerWindow* old_capture);
   void ProcessWillChangeWindowHierarchy(const ServerWindow* window,
                                         const ServerWindow* new_parent,
                                         const ServerWindow* old_parent);
   void ProcessWindowHierarchyChanged(const ServerWindow* window,
@@ skipping 36 matching lines @@
   uint32_t GetCurrentDragLoopChangeId();
   ServerWindow* GetCurrentDragLoopWindow();
   WindowTree* GetCurrentDragLoopInitiator();
   bool in_drag_loop() const { return !!current_drag_loop_; }
 
   void OnDisplayReady(Display* display, bool is_first);
   void OnNoMoreDisplays();
   WindowManagerState* GetWindowManagerStateForUser(const UserId& user_id);
 
   // ServerWindowDelegate:
-  ui::SurfacesState* GetSurfacesState() override;
+  ui::surfaces::DisplayCompositor* GetDisplayCompositor() override;
 
   // UserDisplayManagerDelegate:
   bool GetFrameDecorationsForUser(
       const UserId& user_id,
       mojom::FrameDecorationValuesPtr* values) override;
 
  private:
   struct CurrentMoveLoopState;
   struct CurrentDragLoopState;
   friend class Operation;
 
   using WindowTreeMap =
       std::map<ClientSpecificId, std::unique_ptr<WindowTree>>;
   using UserActivityMonitorMap =
       std::map<UserId, std::unique_ptr<UserActivityMonitor>>;
 
   struct InFlightWindowManagerChange {
     // Identifies the client that initiated the change.
     ClientSpecificId client_id;
 
     // Change id supplied by the client.
     uint32_t client_change_id;
   };
 
+  // DisplayCompositorClient implementation:
+  void OnSurfaceCreated(const gfx::Size& size,
+                        float device_scale_factor,
+                        const cc::SurfaceId& surface_id) override;
+
   using InFlightWindowManagerChangeMap =
       std::map<uint32_t, InFlightWindowManagerChange>;
 
   bool GetAndClearInFlightWindowManagerChange(
       uint32_t window_manager_change_id,
       InFlightWindowManagerChange* change);
 
   // Invoked when a client is about to execute a window server operation.
   // Subsequently followed by FinishOperation() once the change is done.
   //
@@ skipping 68 matching lines @@
   void OnActiveUserIdChanged(const UserId& previously_active_id,
                              const UserId& active_id) override;
   void OnUserIdAdded(const UserId& id) override;
   void OnUserIdRemoved(const UserId& id) override;
 
   UserIdTracker user_id_tracker_;
 
   WindowServerDelegate* delegate_;
 
   // State for rendering into a Surface.
-  scoped_refptr<ui::SurfacesState> surfaces_state_;
+  scoped_refptr<ui::surfaces::DisplayCompositor> display_compositor_;
 
   // ID to use for next WindowTree.
   ClientSpecificId next_client_id_;
 
   std::unique_ptr<DisplayManager> display_manager_;
 
   std::unique_ptr<CurrentDragLoopState> current_drag_loop_;
   std::unique_ptr<CurrentMoveLoopState> current_move_loop_;
 
   // Set of WindowTrees.
@@ skipping 21 matching lines @@
 
   WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowServer);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_SERVER_H_