Revert of Consolidate OutputSurface constructors into GL vs Vulkan.

content/renderer/render_widget.cc

 // Copyright (c) 2012 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/renderer/render_widget.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 29 matching lines @@
 #include "content/common/swapped_out_messages.h"
 #include "content/common/text_input_state.h"
 #include "content/common/view_messages.h"
 #include "content/public/common/content_features.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/context_menu_params.h"
 #include "content/renderer/cursor_utils.h"
 #include "content/renderer/devtools/render_widget_screen_metrics_emulator.h"
 #include "content/renderer/external_popup_menu.h"
 #include "content/renderer/gpu/compositor_output_surface.h"
+#include "content/renderer/gpu/delegated_compositor_output_surface.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
 #include "content/renderer/gpu/mailbox_output_surface.h"
 #include "content/renderer/gpu/queue_message_swap_promise.h"
 #include "content/renderer/gpu/render_widget_compositor.h"
 #include "content/renderer/ime_event_guard.h"
 #include "content/renderer/input/input_handler_manager.h"
 #include "content/renderer/pepper/pepper_plugin_instance_impl.h"
 #include "content/renderer/render_frame_impl.h"
 #include "content/renderer/render_frame_proxy.h"
 #include "content/renderer/render_process.h"
@@ skipping 658 matching lines @@
     return connection->CreateOutputSurface();
   }
 #endif
 
   uint32_t output_surface_id = next_output_surface_id_++;
 
   if (command_line.HasSwitch(switches::kEnableVulkan)) {
     scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider =
         cc::VulkanInProcessContextProvider::Create();
     if (vulkan_context_provider) {
-      return base::WrapUnique(new CompositorOutputSurface(
-          routing_id(), output_surface_id, vulkan_context_provider,
-          frame_swap_message_queue_));
+      return base::WrapUnique(new DelegatedCompositorOutputSurface(
+          routing_id(), output_surface_id, nullptr, nullptr,
+          vulkan_context_provider, frame_swap_message_queue_));
     }
   }
 
   // Create a gpu process channel and verify we want to use GPU compositing
   // before creating any context providers.
   scoped_refptr<gpu::GpuChannelHost> gpu_channel_host;
   if (!use_software) {
     gpu_channel_host = RenderThreadImpl::current()->EstablishGpuChannelSync(
         CAUSE_FOR_GPU_LAUNCH_RENDERER_VERIFY_GPU_COMPOSITING);
     if (!gpu_channel_host) {
       // Cause the compositor to wait and try again.
       return nullptr;
     }
     // We may get a valid channel, but with a software renderer. In that case,
     // disable GPU compositing.
     if (gpu_channel_host->gpu_info().software_rendering)
       use_software = true;
   }
 
   if (use_software) {
-    return base::WrapUnique(
-        new CompositorOutputSurface(routing_id(), output_surface_id, nullptr,
-                                    nullptr, frame_swap_message_queue_));
+    return base::WrapUnique(new DelegatedCompositorOutputSurface(
+        routing_id(), output_surface_id, nullptr, nullptr, nullptr,
+        frame_swap_message_queue_));
   }
 
   scoped_refptr<ContextProviderCommandBuffer> worker_context_provider =
       RenderThreadImpl::current()->SharedCompositorWorkerContextProvider();
   if (!worker_context_provider) {
     // Cause the compositor to wait and try again.
     return nullptr;
   }
 
   // The renderer compositor context doesn't do a lot of stuff, so we don't
@@ skipping 36 matching lines @@
         output_surface_id,
         RenderThreadImpl::current()->sync_compositor_message_filter(),
         frame_swap_message_queue_));
   }
 #endif
 
   // Composite-to-mailbox is currently used for layout tests in order to cause
   // them to draw inside in the renderer to do the readback there. This should
   // no longer be the case when crbug.com/311404 is fixed.
   if (RenderThreadImpl::current()->layout_test_mode()) {
-    return base::MakeUnique<MailboxOutputSurface>(
-        output_surface_id, std::move(context_provider),
-        std::move(worker_context_provider));
+    return base::WrapUnique(new MailboxOutputSurface(
+        routing_id(), output_surface_id, std::move(context_provider),
+        std::move(worker_context_provider), frame_swap_message_queue_,
+        cc::RGBA_8888));
   }
 
-  return base::WrapUnique(new CompositorOutputSurface(
+  return base::WrapUnique(new DelegatedCompositorOutputSurface(
       routing_id(), output_surface_id, std::move(context_provider),
-      std::move(worker_context_provider), frame_swap_message_queue_));
+      std::move(worker_context_provider), nullptr, frame_swap_message_queue_));
 }
 
 std::unique_ptr<cc::BeginFrameSource>
 RenderWidget::CreateExternalBeginFrameSource() {
   return compositor_deps_->CreateExternalBeginFrameSource(routing_id_);
 }
 
 void RenderWidget::DidCommitAndDrawCompositorFrame() {
   // NOTE: Tests may break if this event is renamed or moved. See
   // tab_capture_performancetest.cc.
@@ skipping 1262 matching lines @@
 }
 
 float RenderWidget::GetOriginalDeviceScaleFactor() const {
   return
       screen_metrics_emulator_ ?
       screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
       device_scale_factor_;
 }
 
 }  // namespace content