Consolidate OutputSurface constructors into GL vs Vulkan.

content/renderer/gpu/compositor_output_surface.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/gpu/compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/location.h"
@@ skipping 12 matching lines @@
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "gpu/ipc/client/command_buffer_proxy_impl.h"
 #include "ipc/ipc_sync_channel.h"
 
 namespace content {
 
 CompositorOutputSurface::CompositorOutputSurface(
     int32_t routing_id,
     uint32_t output_surface_id,
-    const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
-    const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
-    const scoped_refptr<cc::VulkanContextProvider>& vulkan_context_provider,
-    std::unique_ptr<cc::SoftwareOutputDevice> software_device,
-    scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
-    bool use_swap_compositor_frame_message)
-    : OutputSurface(context_provider,
-                    worker_context_provider,
-                    vulkan_context_provider,
-                    std::move(software_device)),
+    scoped_refptr<cc::ContextProvider> context_provider,
+    scoped_refptr<cc::ContextProvider> worker_context_provider,
+    scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue)
+    : OutputSurface(std::move(context_provider),
+                    std::move(worker_context_provider),
+                    nullptr),
       output_surface_id_(output_surface_id),
-      use_swap_compositor_frame_message_(use_swap_compositor_frame_message),
       output_surface_filter_(
           RenderThreadImpl::current()->compositor_message_filter()),
+      message_sender_(RenderThreadImpl::current()->sync_message_filter()),
       frame_swap_message_queue_(swap_frame_message_queue),
       routing_id_(routing_id),
       layout_test_mode_(RenderThreadImpl::current()->layout_test_mode()),
       weak_ptrs_(this) {
-  DCHECK(output_surface_filter_.get());
-  DCHECK(frame_swap_message_queue_.get());
-  message_sender_ = RenderThreadImpl::current()->sync_message_filter();
-  DCHECK(message_sender_.get());
+  DCHECK(output_surface_filter_);
+  DCHECK(frame_swap_message_queue_);
+  DCHECK(message_sender_);
+  capabilities_.delegated_rendering = true;

[danakj, 2016/05/23 21:14:28]

Oh. Mailbox output surface :/ I can't do this.

[danakj, 2016/05/23 21:31:26]

I'm going to try split Mailbox from Compositor output surface, removing layout
test code from CompositorOutputSurface.

 }
 
-CompositorOutputSurface::~CompositorOutputSurface() {}
+CompositorOutputSurface::CompositorOutputSurface(
+    int32_t routing_id,
+    uint32_t output_surface_id,
+    scoped_refptr<cc::VulkanContextProvider> vulkan_context_provider,
+    scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue)
+    : OutputSurface(std::move(vulkan_context_provider), nullptr),
+      output_surface_id_(output_surface_id),
+      output_surface_filter_(
+          RenderThreadImpl::current()->compositor_message_filter()),
+      message_sender_(RenderThreadImpl::current()->sync_message_filter()),
+      frame_swap_message_queue_(swap_frame_message_queue),
+      routing_id_(routing_id),
+      layout_test_mode_(RenderThreadImpl::current()->layout_test_mode()),
+      weak_ptrs_(this) {
+  DCHECK(output_surface_filter_);
+  DCHECK(frame_swap_message_queue_);
+  DCHECK(message_sender_);
+  capabilities_.delegated_rendering = true;
+}
+
+CompositorOutputSurface::~CompositorOutputSurface() = default;
 
 bool CompositorOutputSurface::BindToClient(
     cc::OutputSurfaceClient* client) {
   if (!cc::OutputSurface::BindToClient(client))
     return false;
 
   output_surface_proxy_ = new CompositorOutputSurfaceProxy(this);
   output_surface_filter_handler_ =
       base::Bind(&CompositorOutputSurfaceProxy::OnMessageReceived,
                  output_surface_proxy_);
@@ skipping 30 matching lines @@
     layout_test_previous_frame_ack_.reset(new cc::CompositorFrameAck);
     layout_test_previous_frame_ack_->gl_frame_data.reset(new cc::GLFrameData);
   }
 
   OnSwapAck(output_surface_id, *layout_test_previous_frame_ack_);
 
   layout_test_previous_frame_ack_->gl_frame_data = std::move(gl_frame_data);
 }
 
 void CompositorOutputSurface::SwapBuffers(cc::CompositorFrame* frame) {
-  DCHECK(use_swap_compositor_frame_message_);
   if (layout_test_mode_) {
     // This code path is here to support layout tests that are currently
     // doing a readback in the renderer instead of the browser. So they
     // are using deprecated code paths in the renderer and don't need to
     // actually swap anything to the browser. We shortcut the swap to the
     // browser here and just ack directly within the renderer process.
     // Once crbug.com/311404 is fixed, this can be removed.
 
     // This would indicate that crbug.com/311404 is being fixed, and this
     // block needs to be removed.
@@ skipping 79 matching lines @@
   if (output_surface_id != output_surface_id_)
     return;
   ReclaimResources(&ack);
 }
 
 bool CompositorOutputSurface::Send(IPC::Message* message) {
   return message_sender_->Send(message);
 }
 
 }  // namespace content