mus: Use BufferQueue and GLHelper from display_compositor.

components/mus/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 "components/mus/surfaces/direct_output_surface_ozone.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/context_provider.h"
 #include "cc/output/output_surface_client.h"
+#include "components/display_compositor/buffer_queue.h"
 #include "components/mus/gles2/mojo_gpu_memory_buffer_manager.h"
-#include "components/mus/surfaces/buffer_queue.h"
 #include "components/mus/surfaces/surfaces_context_provider.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 
+using display_compositor::BufferQueue;
+
 namespace mus {
 
 DirectOutputSurfaceOzone::DirectOutputSurfaceOzone(
     const scoped_refptr<SurfacesContextProvider>& context_provider,
     gfx::AcceleratedWidget widget,
     base::SingleThreadTaskRunner* task_runner,
     uint32_t target,
     uint32_t internalformat)
     : cc::OutputSurface(context_provider),
-      output_surface_(
-          new BufferQueue(context_provider, target, internalformat, widget)),
+      gl_helper_(context_provider->ContextGL(),
+                 context_provider->ContextSupport()),
+      output_surface_(new BufferQueue(context_provider,
+                                      target,
+                                      internalformat,
+                                      &gl_helper_,
+                                      &gpu_memory_buffer_manager_,
+                                      widget)),
       synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(
           task_runner,
           cc::BeginFrameArgs::DefaultInterval())),
       weak_ptr_factory_(this) {
   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.
@@ skipping 99 matching lines @@
 // must create the native window in the size that the hardware reports.
 void DirectOutputSurfaceOzone::Reshape(const gfx::Size& size,
                                        float scale_factor,
                                        bool alpha) {
   OutputSurface::Reshape(size, scale_factor, alpha);
   DCHECK(output_surface_);
   output_surface_->Reshape(SurfaceSize(), scale_factor);
 }
 
 }  // namespace mus