Mus+Ash: Unify CompositorFrameSinks

services/ui/surfaces/direct_output_surface_ozone.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/surfaces/direct_output_surface_ozone.h"
 
 #include <utility>
 
 #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 "components/display_compositor/buffer_queue.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "services/ui/surfaces/surfaces_context_provider.h"
 #include "ui/display/types/display_snapshot.h"
 
 using display_compositor::BufferQueue;
 
 namespace ui {
 
 DirectOutputSurfaceOzone::DirectOutputSurfaceOzone(
-    scoped_refptr<SurfacesContextProvider> context_provider,
+    scoped_refptr<cc::ContextProvider> context_provider,
     gfx::AcceleratedWidget widget,
     cc::SyntheticBeginFrameSource* synthetic_begin_frame_source,
     gpu::GpuMemoryBufferManager* gpu_memory_buffer_manager,
     uint32_t target,
     uint32_t internalformat)
     : cc::OutputSurface(context_provider),
       gl_helper_(context_provider->ContextGL(),
                  context_provider->ContextSupport()),
       synthetic_begin_frame_source_(synthetic_begin_frame_source),
       weak_ptr_factory_(this) {
   buffer_queue_.reset(
       new BufferQueue(context_provider->ContextGL(), target, internalformat,
                       ui::DisplaySnapshot::PrimaryFormat(), &gl_helper_,
                       gpu_memory_buffer_manager, widget));
 
   capabilities_.uses_default_gl_framebuffer = false;
   capabilities_.flipped_output_surface = true;
   // Set |max_frames_pending| to 2 for surfaceless, which aligns scheduling
   // more closely with the previous surfaced behavior.
   // With a surface, swap buffer ack used to return early, before actually
   // presenting the back buffer, enabling the browser compositor to run ahead.
   // Surfaceless implementation acks at the time of actual buffer swap, which
   // shifts the start of the new frame forward relative to the old
   // implementation.
   capabilities_.max_frames_pending = 2;
 
   buffer_queue_->Initialize();
 
-  context_provider->SetSwapBuffersCompletionCallback(
-      base::Bind(&DirectOutputSurfaceOzone::OnGpuSwapBuffersCompleted,
-                 base::Unretained(this)));
+  static_cast<SurfacesContextProvider*>(context_provider.get())

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

Ditto.

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

Done.

+      ->SetSwapBuffersCompletionCallback(
+          base::Bind(&DirectOutputSurfaceOzone::OnGpuSwapBuffersCompleted,
+                     base::Unretained(this)));
 }
 
 DirectOutputSurfaceOzone::~DirectOutputSurfaceOzone() {
   // TODO(rjkroege): Support cleanup.
 }
 
 void DirectOutputSurfaceOzone::BindToClient(cc::OutputSurfaceClient* client) {
   DCHECK(client);
   DCHECK(!client_);
   client_ = client;
@@ skipping 99 matching lines @@
   }
 
   buffer_queue_->PageFlipComplete();
   client_->DidReceiveSwapBuffersAck();
 
   if (force_swap)
     client_->SetNeedsRedrawRect(gfx::Rect(swap_size_));
 }
 
 }  // namespace ui