Consolidate OutputSurface constructors into GL vs Vulkan.

content/browser/compositor/gpu_surfaceless_browser_compositor_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 "content/browser/compositor/gpu_surfaceless_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "cc/output/compositor_frame.h"
 #include "cc/output/output_surface_client.h"
@@ skipping 30 matching lines @@
   // 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;
 
   gl_helper_.reset(new display_compositor::GLHelper(
       context_provider_->ContextGL(), context_provider_->ContextSupport()));
-  output_surface_.reset(new display_compositor::BufferQueue(
-      context_provider_, target, internalformat_, gl_helper_.get(),
+  buffer_queue_.reset(new display_compositor::BufferQueue(
+      context_provider_->ContextGL(), target, internalformat_, gl_helper_.get(),
       gpu_memory_buffer_manager_, surface_handle));
-  output_surface_->Initialize();
+  buffer_queue_->Initialize();
 }
 
 GpuSurfacelessBrowserCompositorOutputSurface::
     ~GpuSurfacelessBrowserCompositorOutputSurface() {
 }
 
 bool GpuSurfacelessBrowserCompositorOutputSurface::IsDisplayedAsOverlayPlane()
     const {
   return true;
 }
 
 unsigned GpuSurfacelessBrowserCompositorOutputSurface::GetOverlayTextureId()
     const {
-  return output_surface_->current_texture_id();
+  return buffer_queue_->current_texture_id();
 }
 
 void GpuSurfacelessBrowserCompositorOutputSurface::SwapBuffers(
     cc::CompositorFrame* frame) {
-  DCHECK(output_surface_);
-  output_surface_->SwapBuffers(frame->gl_frame_data->sub_buffer_rect);
+  DCHECK(buffer_queue_);
+  buffer_queue_->SwapBuffers(frame->gl_frame_data->sub_buffer_rect);
   GpuBrowserCompositorOutputSurface::SwapBuffers(frame);
 }
 
 void GpuSurfacelessBrowserCompositorOutputSurface::OnSwapBuffersComplete() {
-  DCHECK(output_surface_);
-  output_surface_->PageFlipComplete();
+  DCHECK(buffer_queue_);
+  buffer_queue_->PageFlipComplete();
   GpuBrowserCompositorOutputSurface::OnSwapBuffersComplete();
 }
 
 void GpuSurfacelessBrowserCompositorOutputSurface::BindFramebuffer() {
-  DCHECK(output_surface_);
-  output_surface_->BindFramebuffer();
+  DCHECK(buffer_queue_);
+  buffer_queue_->BindFramebuffer();
 }
 
 void GpuSurfacelessBrowserCompositorOutputSurface::Reshape(
     const gfx::Size& size,
     float scale_factor,
     bool alpha) {
   GpuBrowserCompositorOutputSurface::Reshape(size, scale_factor, alpha);
-  DCHECK(output_surface_);
-  output_surface_->Reshape(SurfaceSize(), scale_factor);
+  DCHECK(buffer_queue_);
+  buffer_queue_->Reshape(SurfaceSize(), scale_factor);
 }
 
 void GpuSurfacelessBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(
     const std::vector<ui::LatencyInfo>& latency_info,
     gfx::SwapResult result,
     const gpu::GpuProcessHostedCALayerTreeParamsMac* params_mac) {
   bool force_swap = false;
   if (result == gfx::SwapResult::SWAP_NAK_RECREATE_BUFFERS) {
     // Even through the swap failed, this is a fixable error so we can pretend
     // it succeeded to the rest of the system.
     result = gfx::SwapResult::SWAP_ACK;
-    output_surface_->RecreateBuffers();
+    buffer_queue_->RecreateBuffers();
     force_swap = true;
   }
   GpuBrowserCompositorOutputSurface::OnGpuSwapBuffersCompleted(
       latency_info, result, params_mac);
   if (force_swap)
     client_->SetNeedsRedrawRect(gfx::Rect(SurfaceSize()));
 }
 
 }  // namespace content