Consolidate OutputSurface constructors into GL vs Vulkan.

content/renderer/gpu/mailbox_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/mailbox_output_surface.h"
 
 #include "base/logging.h"
 #include "cc/output/compositor_frame.h"
 #include "cc/output/compositor_frame_ack.h"
 #include "cc/output/gl_frame_data.h"
 #include "cc/resources/resource_provider.h"
 #include "content/renderer/gpu/frame_swap_message_queue.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using cc::CompositorFrame;
 using cc::GLFrameData;
 using cc::ResourceProvider;
 using gpu::Mailbox;
 using gpu::gles2::GLES2Interface;
 
 namespace content {
 
 MailboxOutputSurface::MailboxOutputSurface(
     int32_t routing_id,
     uint32_t output_surface_id,
-    const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
-    const scoped_refptr<ContextProviderCommandBuffer>& worker_context_provider,
-    scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue,
-    cc::ResourceFormat format)
+    scoped_refptr<cc::ContextProvider> context_provider,
+    scoped_refptr<cc::ContextProvider> worker_context_provider,
+    scoped_refptr<FrameSwapMessageQueue> swap_frame_message_queue)
     : CompositorOutputSurface(routing_id,
                               output_surface_id,
-                              context_provider,
-                              worker_context_provider,
-                              nullptr,
-                              nullptr,
-                              swap_frame_message_queue,
-                              true),
+                              std::move(context_provider),
+                              std::move(worker_context_provider),
+                              std::move(swap_frame_message_queue)),
       fbo_(0),
-      is_backbuffer_discarded_(false),
-      format_(format) {
+      is_backbuffer_discarded_(false) {
   pending_textures_.push_back(TransferableFrame());
   capabilities_.uses_default_gl_framebuffer = false;
 }
 
 MailboxOutputSurface::~MailboxOutputSurface() {}
 
 void MailboxOutputSurface::DetachFromClient() {
   DiscardBackbuffer();
   while (!pending_textures_.empty()) {
     if (pending_textures_.front().texture_id) {
@@ skipping 27 matching lines @@
     }
 
     if (!current_backing_.texture_id) {
       gl->GenTextures(1, &current_backing_.texture_id);
       current_backing_.size = surface_size_;
       gl->BindTexture(GL_TEXTURE_2D, current_backing_.texture_id);
       gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
       gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
       gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
       gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-      gl->TexImage2D(GL_TEXTURE_2D,
-                     0,
-                     GLInternalFormat(format_),
-                     surface_size_.width(),
-                     surface_size_.height(),
-                     0,
-                     GLDataFormat(format_),
-                     GLDataType(format_),
+      gl->TexImage2D(GL_TEXTURE_2D, 0, GLInternalFormat(cc::RGBA_8888),
+                     surface_size_.width(), surface_size_.height(), 0,
+                     GLDataFormat(cc::RGBA_8888), GLDataType(cc::RGBA_8888),
                      NULL);
       gl->GenMailboxCHROMIUM(current_backing_.mailbox.name);
       gl->ProduceTextureCHROMIUM(GL_TEXTURE_2D, current_backing_.mailbox.name);
     }
   }
 }
 
 void MailboxOutputSurface::DiscardBackbuffer() {
   is_backbuffer_discarded_ = true;
 
@@ skipping 122 matching lines @@
 
 MailboxOutputSurface::TransferableFrame::TransferableFrame() : texture_id(0) {}
 
 MailboxOutputSurface::TransferableFrame::TransferableFrame(
     uint32_t texture_id,
     const gpu::Mailbox& mailbox,
     const gfx::Size size)
     : texture_id(texture_id), mailbox(mailbox), size(size) {}
 
 }  // namespace content