Introduce Display Compositor mojo interface. Use InProcessContextProvider.

services/ui/ws/frame_generator.cc

 // 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.
 
 #include "services/ui/ws/frame_generator.h"
 
 #include "base/containers/adapters.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/surfaces/surface_id.h"
-#include "gpu/ipc/client/gpu_channel_host.h"
-#include "services/ui/surfaces/display_compositor.h"
-#include "services/ui/surfaces/surfaces_context_provider.h"
 #include "services/ui/ws/frame_generator_delegate.h"
 #include "services/ui/ws/server_window.h"
 #include "services/ui/ws/server_window_compositor_frame_sink_manager.h"
 #include "services/ui/ws/server_window_delegate.h"
 
 namespace ui {
 
 namespace ws {
 
 FrameGenerator::FrameGenerator(FrameGeneratorDelegate* delegate,
@@ skipping 10 matching lines @@
 }
 
 FrameGenerator::~FrameGenerator() {
   ReleaseAllSurfaceReferences();
   // Invalidate WeakPtrs now to avoid callbacks back into the
   // FrameGenerator during destruction of |compositor_frame_sink_|.
   weak_factory_.InvalidateWeakPtrs();
   compositor_frame_sink_.reset();
 }
 
-void FrameGenerator::OnGpuChannelEstablished(
-    scoped_refptr<gpu::GpuChannelHost> channel) {
-  if (widget_ != gfx::kNullAcceleratedWidget) {
-    cc::mojom::MojoCompositorFrameSinkRequest request =
-        mojo::GetProxy(&compositor_frame_sink_);
-    // TODO(fsamuel): FrameGenerator should not know about
-    // SurfacesContextProvider. In fact, FrameGenerator should not know
-    // about GpuChannelHost.
-    root_window_->CreateCompositorFrameSink(
-        mojom::CompositorFrameSinkType::DEFAULT, widget_,
-        channel->gpu_memory_buffer_manager(),
-        new SurfacesContextProvider(widget_, channel), std::move(request),
-        binding_.CreateInterfacePtrAndBind());
-    // TODO(fsamuel): This means we're always requesting a new BeginFrame signal
-    // even when we don't need it. Once surface ID propagation work is done,
-    // this will not be necessary because FrameGenerator will only need a
-    // BeginFrame if the window manager changes.
-    compositor_frame_sink_->SetNeedsBeginFrame(true);
-  } else {
-    gpu_channel_ = std::move(channel);
-  }
-}
-
 void FrameGenerator::OnAcceleratedWidgetAvailable(
     gfx::AcceleratedWidget widget) {
-  widget_ = widget;
-  if (gpu_channel_ && widget != gfx::kNullAcceleratedWidget) {
-    cc::mojom::MojoCompositorFrameSinkRequest request =
-        mojo::GetProxy(&compositor_frame_sink_);
-    root_window_->CreateCompositorFrameSink(
-        mojom::CompositorFrameSinkType::DEFAULT, widget_,
-        gpu_channel_->gpu_memory_buffer_manager(),
-        new SurfacesContextProvider(widget_, gpu_channel_),
-        std::move(request), binding_.CreateInterfacePtrAndBind());
-    // TODO(fsamuel): This means we're always requesting a new BeginFrame signal
-    // even when we don't need it. Once surface ID propagation work is done,
-    // this will not be necessary because FrameGenerator will only need a
-    // BeginFrame if the window manager changes.
-    compositor_frame_sink_->SetNeedsBeginFrame(true);
-  }
+  DCHECK(widget != gfx::kNullAcceleratedWidget);

[sadrul, 2016/11/21 17:23:49]

DCHECK_NE

[Fady Samuel, 2016/11/21 20:40:41]

Done.

+  cc::mojom::MojoCompositorFrameSinkRequest request =
+      mojo::GetProxy(&compositor_frame_sink_);
+  root_window_->CreateCompositorFrameSink(
+      mojom::CompositorFrameSinkType::DEFAULT, widget, std::move(request),
+      binding_.CreateInterfacePtrAndBind());
+  // TODO(fsamuel): This means we're always requesting a new BeginFrame signal
+  // even when we don't need it. Once surface ID propagation work is done,
+  // this will not be necessary because FrameGenerator will only need a
+  // BeginFrame if the window manager changes.
+  compositor_frame_sink_->SetNeedsBeginFrame(true);
 }
 
 void FrameGenerator::DidReceiveCompositorFrameAck() {}
 
 void FrameGenerator::OnBeginFrame(const cc::BeginFrameArgs& begin_frame_arags) {
   if (!root_window_->visible())
     return;
 
   // TODO(fsamuel): We should add a trace for generating a top level frame.
   cc::CompositorFrame frame(GenerateCompositorFrame(root_window_->bounds()));
@@ skipping 175 matching lines @@
 }
 
 void FrameGenerator::ReleaseAllSurfaceReferences() {
   std::vector<uint32_t> sequences;
   for (auto& dependency : dependencies_)
     sequences.push_back(dependency.second.sequence.sequence);
   GetDisplayCompositor()->ReturnSurfaceReferences(frame_sink_id_, sequences);
   dependencies_.clear();
 }
 
-ui::DisplayCompositor* FrameGenerator::GetDisplayCompositor() {
+cc::mojom::DisplayCompositor* FrameGenerator::GetDisplayCompositor() {
   return root_window_->delegate()->GetDisplayCompositor();
 }
 
 void FrameGenerator::OnWindowDestroying(ServerWindow* window) {
   Remove(window);
   ServerWindowCompositorFrameSinkManager* compositor_frame_sink_manager =
       window->compositor_frame_sink_manager();
   // If FrameGenerator was observing |window|, then that means it had a
   // CompositorFrame at some point in time and should have a
   // ServerWindowCompositorFrameSinkManager.
   DCHECK(compositor_frame_sink_manager);
 
   cc::SurfaceId default_surface_id =
       window->compositor_frame_sink_manager()->GetLatestSurfaceId(
           mojom::CompositorFrameSinkType::DEFAULT);
   if (default_surface_id.is_valid())
     ReleaseFrameSinkReference(default_surface_id.frame_sink_id());
 
   cc::SurfaceId underlay_surface_id =
       window->compositor_frame_sink_manager()->GetLatestSurfaceId(
           mojom::CompositorFrameSinkType::UNDERLAY);
   if (underlay_surface_id.is_valid())
     ReleaseFrameSinkReference(underlay_surface_id.frame_sink_id());
 }
 
 }  // namespace ws
 
 }  // namespace ui