Introduce Display Compositor mojo interface. Use InProcessContextProvider.

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 210 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::DisplayCompositor* GetDisplayCompositor() override;
+  cc::mojom::DisplayCompositor* GetDisplayCompositor() override;
 
   // UserDisplayManagerDelegate:
   bool GetFrameDecorationsForUser(
       const UserId& user_id,
       mojom::FrameDecorationValuesPtr* values) override;
 
  private:
   struct CurrentMoveLoopState;
   struct CurrentDragLoopState;
   friend class Operation;
@@ skipping 76 matching lines @@
   void OnWindowNonClientCursorChanged(ServerWindow* window,
                                       mojom::Cursor cursor_id) override;
   void OnWindowTextInputStateChanged(ServerWindow* window,
                                      const ui::TextInputState& state) override;
   void OnTransientWindowAdded(ServerWindow* window,
                               ServerWindow* transient_child) override;
   void OnTransientWindowRemoved(ServerWindow* window,
                                 ServerWindow* transient_child) override;
 
   // GpuServiceProxyDelegate:
-  void OnGpuChannelEstablished(
-      scoped_refptr<gpu::GpuChannelHost> gpu_channel) override;
+  void OnGpuServiceInitialized() override;
 
   // cc::mojom::DisplayCompositorClient:
   void OnSurfaceCreated(const cc::SurfaceId& surface_id,
                         const gfx::Size& frame_size,
                         float device_scale_factor) override;
 
   // UserIdTrackerObserver:
   void OnActiveUserIdChanged(const UserId& previously_active_id,
                              const UserId& active_id) override;
   void OnUserIdAdded(const UserId& id) override;
@@ skipping 22 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_;
+  cc::mojom::DisplayCompositorPtr display_compositor_;
+  cc::mojom::DisplayCompositorRequest display_compositor_request_;
 
   DISALLOW_COPY_AND_ASSIGN(WindowServer);
 };
 
 }  // namespace ws
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_WINDOW_SERVER_H_