Mus+Ash: Unify CompositorFrameSinks

services/ui/surfaces/direct_output_surface.cc

 // 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.
 
 #include "services/ui/surfaces/direct_output_surface.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/output_surface_frame.h"
 #include "cc/scheduler/begin_frame_source.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
 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() {}
 
 void DirectOutputSurface::BindToClient(cc::OutputSurfaceClient* client) {
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
 }
 
@@ skipping 72 matching lines @@
   synthetic_begin_frame_source_->OnUpdateVSyncParameters(
       timebase,
       interval.is_zero() ? cc::BeginFrameArgs::DefaultInterval() : interval);
 }
 
 void DirectOutputSurface::OnSwapBuffersComplete() {
   client_->DidReceiveSwapBuffersAck();
 }
 
 }  // namespace ui