Consolidate OutputSurface constructors into GL vs Vulkan.

content/browser/compositor/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/browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/strings/string_number_conversions.h"
 #include "cc/base/switches.h"
 #include "cc/output/output_surface_client.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/common/gpu/client/context_provider_command_buffer.h"
 
 namespace content {
 
 BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
     scoped_refptr<cc::ContextProvider> context_provider,
     scoped_refptr<ui::CompositorVSyncManager> vsync_manager,
     base::SingleThreadTaskRunner* task_runner,
     std::unique_ptr<display_compositor::CompositorOverlayCandidateValidator>
         overlay_candidate_validator)
-    : OutputSurface(std::move(context_provider)),
+    : OutputSurface(std::move(context_provider), nullptr, nullptr),
       vsync_manager_(std::move(vsync_manager)),
       synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(
           task_runner,
           cc::BeginFrameArgs::DefaultInterval())),
       reflector_(nullptr),
       use_begin_frame_scheduling_(
           base::CommandLine::ForCurrentProcess()->HasSwitch(
               cc::switches::kEnableBeginFrameScheduling)) {
   overlay_candidate_validator_ = std::move(overlay_candidate_validator);
   Initialize();
 }
 
 BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
     std::unique_ptr<cc::SoftwareOutputDevice> software_device,
     const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
     base::SingleThreadTaskRunner* task_runner)
-    : OutputSurface(std::move(software_device)),
+    : OutputSurface(nullptr, nullptr, std::move(software_device)),
       vsync_manager_(vsync_manager),
       synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(
           task_runner,
           cc::BeginFrameArgs::DefaultInterval())),
       reflector_(nullptr),
       use_begin_frame_scheduling_(
           base::CommandLine::ForCurrentProcess()->HasSwitch(
               cc::switches::kEnableBeginFrameScheduling)) {
   Initialize();
 }
 
 BrowserCompositorOutputSurface::BrowserCompositorOutputSurface(
     const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
     const scoped_refptr<ui::CompositorVSyncManager>& vsync_manager,
     base::SingleThreadTaskRunner* task_runner)
-    : OutputSurface(nullptr, nullptr, vulkan_context_provider, nullptr),
+    : OutputSurface(std::move(vulkan_context_provider)),
       vsync_manager_(vsync_manager),
       synthetic_begin_frame_source_(new cc::SyntheticBeginFrameSource(
           task_runner,
           cc::BeginFrameArgs::DefaultInterval())),
       reflector_(nullptr) {
   Initialize();
 }
 
 BrowserCompositorOutputSurface::~BrowserCompositorOutputSurface() {
   if (reflector_)
@@ skipping 74 matching lines @@
 BrowserCompositorOutputSurface::CreateCompositionStartedCallback() {
   return base::Closure();
 }
 
 cc::OverlayCandidateValidator*
 BrowserCompositorOutputSurface::GetOverlayCandidateValidator() const {
   return overlay_candidate_validator_.get();
 }
 
 }  // namespace content