Introduce Display Compositor mojo interface. Use InProcessContextProvider.

services/ui/ws/frame_generator.h

 // Copyright 2016 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_FRAME_GENERATOR_H_
 #define SERVICES_UI_WS_FRAME_GENERATOR_H_
 
 #include <memory>
 #include <unordered_map>
 
 #include "base/macros.h"
 #include "base/timer/timer.h"
+#include "cc/ipc/display_compositor.mojom.h"
 #include "cc/surfaces/frame_sink_id.h"
 #include "cc/surfaces/surface_id.h"
 #include "services/ui/public/interfaces/window_tree_constants.mojom.h"
 #include "services/ui/ws/ids.h"
+#include "services/ui/ws/server_window_delegate.h"
 #include "services/ui/ws/server_window_tracker.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/native_widget_types.h"
 
 namespace cc {
 class CompositorFrame;
 class RenderPass;
 class SurfaceId;
 }
 
@@ skipping 15 matching lines @@
 class ServerWindow;
 
 // Responsible for redrawing the display in response to the redraw requests by
 // submitting CompositorFrames to the owned CompositorFrameSink.
 class FrameGenerator : public ServerWindowTracker,
                        public cc::mojom::MojoCompositorFrameSinkClient {
  public:
   FrameGenerator(FrameGeneratorDelegate* delegate, ServerWindow* root_window);
   ~FrameGenerator() override;
 
-  void OnGpuChannelEstablished(scoped_refptr<gpu::GpuChannelHost> gpu_channel);
-
   // Schedules a redraw for the provided region.
   void OnAcceleratedWidgetAvailable(gfx::AcceleratedWidget widget);
 
   // Adds a reference to new surface with |surface_id| for |window|. This
   // reference is to ensure the surface is not deleted while it's still being
   // displayed. The display root surface has a reference from the top level
   // root. All child surfaces are embedded by the display root and receive a
   // reference from it.
   //
   // If a new display root Surface is created, then all child surfaces will
@@ skipping 41 matching lines @@
 
   // Removes all references to surfaces in |dead_references_|.
   void RemoveDeadSurfaceReferences();
 
   // Removes any retained references for the provided FrameSink.
   void RemoveFrameSinkReference(const cc::FrameSinkId& frame_sink_id);
 
   // Removes all retained references to surfaces.
   void RemoveAllSurfaceReferences();
 
-  ui::DisplayCompositor* GetDisplayCompositor();
+  cc::mojom::DisplayCompositor* GetDisplayCompositor();
 
   // ServerWindowObserver implementation.
   void OnWindowDestroying(ServerWindow* window) override;
 
   FrameGeneratorDelegate* delegate_;
   ServerWindow* const root_window_;
-  scoped_refptr<gpu::GpuChannelHost> gpu_channel_;
 
   cc::mojom::MojoCompositorFrameSinkPtr compositor_frame_sink_;
-  gfx::AcceleratedWidget widget_ = gfx::kNullAcceleratedWidget;
 
   // Represents the top level root surface id that should reference the display
   // root surface. We don't know the actual value, because it's generated in
   // another process, this is used internally as a placeholder.
   const cc::SurfaceId top_level_root_surface_id_;
 
   struct SurfaceReference {
     cc::SurfaceId parent_id;
     cc::SurfaceId child_id;
   };
@@ skipping 18 matching lines @@
   base::WeakPtrFactory<FrameGenerator> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameGenerator);
 };
 
 }  // namespace ws
 
 }  // namespace ui
 
 #endif  // SERVICES_UI_WS_FRAME_GENERATOR_H_