Mus+Ash: Unify CompositorFrameSinks

services/ui/surfaces/direct_output_surface.cc

Index: services/ui/surfaces/direct_output_surface.cc
diff --git a/services/ui/surfaces/direct_output_surface.cc b/services/ui/surfaces/direct_output_surface.cc
index d3adce0f1ddc2a57940f26e638582b36f4539408..46558df287207861d3eef405480fe7e4ef205e66 100644
--- a/services/ui/surfaces/direct_output_surface.cc
+++ b/services/ui/surfaces/direct_output_surface.cc
@@ -18,14 +18,15 @@
 namespace ui {
 
 DirectOutputSurface::DirectOutputSurface(
-    scoped_refptr<SurfacesContextProvider> context_provider,
+    scoped_refptr<cc::ContextProvider> context_provider,
     cc::SyntheticBeginFrameSource* synthetic_begin_frame_source)
     : cc::OutputSurface(context_provider),
       synthetic_begin_frame_source_(synthetic_begin_frame_source),
       weak_ptr_factory_(this) {
   capabilities_.flipped_output_surface =
       context_provider->ContextCapabilities().flips_vertically;
-  context_provider->SetDelegate(this);
+  static_cast<SurfacesContextProvider*>(context_provider.get())

[kylechar, 2016/11/02 03:37:23]

Is this cast back to the actual type a temporary thing that will go away with
the final architecture? Add a TODO if so. 

[Fady Samuel, 2016/11/02 04:31:22]

I'm passing around a SurfacesContextProvider directly. Really we shouldn't be
passing this through ServerWindow::CreateCompositorFrameSink but rather should
be an implementation detail of mus-gpu. I've sprinkled comments to that effect.

+      ->SetDelegate(this);
 }
 
 DirectOutputSurface::~DirectOutputSurface() {}