Mus+Ash: Unified BeginFrame Skeleton

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>
@@ skipping 89 matching lines @@
   // Returns the tree by client id.
   WindowTree* GetTreeWithId(ClientSpecificId client_id);
 
   WindowTree* GetTreeWithClientName(const std::string& client_name);
 
   size_t num_trees() const { return tree_map_.size(); }
 
   // Returns the Window identified by |id|.
   ServerWindow* GetWindow(const WindowId& id);
 
-  // Schedules a paint for the specified region in the coordinates of |window|.
-  void SchedulePaint(ServerWindow* window, const gfx::Rect& bounds);
-
   OperationType current_operation_type() const {
     return current_operation_ ? current_operation_->type()
                               : OperationType::NONE;
   }
 
   // Returns true if the specified client issued the current operation.
   bool IsOperationSource(ClientSpecificId client_id) const {
     return current_operation_ &&
            current_operation_->source_tree_id() == client_id;
   }
@@ skipping 65 matching lines @@
                                         const ServerWindow* old_parent);
   void ProcessWindowHierarchyChanged(const ServerWindow* window,
                                      const ServerWindow* new_parent,
                                      const ServerWindow* old_parent);
   void ProcessWindowReorder(const ServerWindow* window,
                             const ServerWindow* relative_window,
                             const mojom::OrderDirection direction);
   void ProcessWindowDeleted(ServerWindow* window);
   void ProcessWillChangeWindowPredefinedCursor(ServerWindow* window,
                                                mojom::Cursor cursor_id);
-  void ProcessWindowSurfaceCreated(ServerWindow* window,
-                                   mojom::CompositorFrameSinkType surface_type,
-                                   const cc::SurfaceId& surface_id,
-                                   const gfx::Size& frame_size,
-                                   float device_scale_factor);
+  void ProcessWindowSurfaceCreated(
+      ServerWindow* window,
+      mojom::CompositorFrameSinkType compositor_frame_sink_type,
+      const cc::SurfaceId& surface_id,
+      const gfx::Size& frame_size,
+      float device_scale_factor);
 
   // Sends an |event| to all WindowTrees belonging to |user_id| that might be
   // observing events. Skips |ignore_tree| if it is non-null. |target_window| is
   // the target of the event.
   void SendToPointerWatchers(const ui::Event& event,
                              const UserId& user_id,
                              ServerWindow* target_window,
                              WindowTree* ignore_tree);
 
   // Sets a callback to be called whenever a ServerWindow is scheduled for
@@ skipping 74 matching lines @@
   void UpdateNativeCursorFromMouseLocation(ServerWindow* window);
 
   // Updates the native cursor if the cursor is currently inside |window|. This
   // is run in response to events that change the mouse cursor properties of
   // |window|.
   void UpdateNativeCursorIfOver(ServerWindow* window);
 
   bool IsUserInHighContrastMode(const UserId& user) const;
 
   // Overridden from ServerWindowDelegate:
-  void OnScheduleWindowPaint(ServerWindow* window) override;
-  const ServerWindow* GetRootWindow(const ServerWindow* window) const override;
+  ServerWindow* GetRootWindow(const ServerWindow* window) override;
 
   // Overridden from ServerWindowObserver:
   void OnWindowDestroyed(ServerWindow* window) override;
   void OnWillChangeWindowHierarchy(ServerWindow* window,
                                    ServerWindow* new_parent,
                                    ServerWindow* old_parent) override;
   void OnWindowHierarchyChanged(ServerWindow* window,
                                 ServerWindow* new_parent,
                                 ServerWindow* old_parent) override;
   void OnWindowBoundsChanged(ServerWindow* window,
@@ skipping 64 matching lines @@
   std::map<UserId, bool> high_contrast_mode_;
 
   // Maps from window manager change id to the client that initiated the
   // request.
   InFlightWindowManagerChangeMap in_flight_wm_change_map_;
 
   // Next id supplied to the window manager.
   uint32_t next_wm_change_id_;
 
   std::unique_ptr<GpuServiceProxy> gpu_proxy_;
+  // TODO(fsamuel): The window server should not have a GPU channel.
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
   base::Callback<void(ServerWindow*)> window_paint_callback_;
 
   UserActivityMonitorMap activity_monitor_map_;
 
   WindowManagerWindowTreeFactorySet window_manager_window_tree_factory_set_;
 
   mojo::Binding<cc::mojom::DisplayCompositorClient>
       display_compositor_client_binding_;
   // State for rendering into a Surface.
   scoped_refptr<ui::DisplayCompositor> display_compositor_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowServer);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_SERVER_H_