Revert of Consolidate OutputSurface constructors into GL vs Vulkan.

cc/surfaces/surface_display_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 "cc/surfaces/surface_display_output_surface.h"
 
 #include "base/bind.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/surfaces/display.h"
 #include "cc/surfaces/onscreen_display_client.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_manager.h"
 
 namespace cc {
 
 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface(
     SurfaceManager* surface_manager,
     SurfaceIdAllocator* allocator,
     scoped_refptr<ContextProvider> context_provider,
     scoped_refptr<ContextProvider> worker_context_provider)
     : OutputSurface(std::move(context_provider),
-                    std::move(worker_context_provider),
-                    nullptr),
+                    std::move(worker_context_provider)),
       display_client_(nullptr),
       factory_(surface_manager, this),
       allocator_(allocator) {
   factory_.set_needs_sync_points(false);
   capabilities_.delegated_rendering = true;
   capabilities_.adjust_deadline_for_parent = true;
   capabilities_.can_force_reclaim_resources = true;
   // Display and SurfaceDisplayOutputSurface share a GL context, so sync
   // points aren't needed when passing resources between them.
   capabilities_.delegated_sync_points_required = false;
 }
 
 SurfaceDisplayOutputSurface::SurfaceDisplayOutputSurface(
     SurfaceManager* surface_manager,
     SurfaceIdAllocator* allocator,
     scoped_refptr<VulkanContextProvider> vulkan_context_provider)
-    : OutputSurface(std::move(vulkan_context_provider)),
-      display_client_(nullptr),
+    : OutputSurface(nullptr,
+                    nullptr,
+                    std::move(vulkan_context_provider),
+                    nullptr),
+      display_client_(NULL),
       factory_(surface_manager, this),
       allocator_(allocator) {
   capabilities_.delegated_rendering = true;
   capabilities_.adjust_deadline_for_parent = true;
   capabilities_.can_force_reclaim_resources = true;
 }
 
 SurfaceDisplayOutputSurface::~SurfaceDisplayOutputSurface() {
   if (HasClient())
     DetachFromClient();
@@ skipping 67 matching lines @@
   DCHECK(client_);
   client_->SetBeginFrameSource(begin_frame_source);
 }
 
 void SurfaceDisplayOutputSurface::SwapBuffersComplete(SurfaceDrawStatus drawn) {
   if (client_ && !display_client_->output_surface_lost())
     client_->DidSwapBuffersComplete();
 }
 
 }  // namespace cc