Move attributes and context type out to ContextProviderCommandBuffer.

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 185 matching lines @@
     return content::RenderWidgetMusConnection::GetOrCreate(
         widget->routing_id());
   }
 #endif
   // If we don't have a connection to the Mojo shell, then we want to route IPCs
   // back to the browser process rather than Mus so we use the |widget| as the
   // RenderWidgetInputHandlerDelegate.
   return widget;
 }
 
-std::unique_ptr<content::WebGraphicsContext3DCommandBufferImpl>
-CreateOffscreenContext(scoped_refptr<gpu::GpuChannelHost> gpu_channel_host,
-                       const GURL& url) {
-  DCHECK(gpu_channel_host);
-
-  // This is for an offscreen context for the compositor. So the default
-  // framebuffer doesn't need alpha, depth, stencil, antialiasing.
-  gpu::gles2::ContextCreationAttribHelper attributes;
-  attributes.alpha_size = -1;
-  attributes.depth_size = 0;
-  attributes.stencil_size = 0;
-  attributes.samples = 0;
-  attributes.sample_buffers = 0;
-  attributes.bind_generates_resource = false;
-  attributes.lose_context_when_out_of_memory = true;
-
-  bool automatic_flushes = false;
-
-  return base::WrapUnique(new content::WebGraphicsContext3DCommandBufferImpl(
-      gpu::kNullSurfaceHandle, url, std::move(gpu_channel_host), attributes,
-      gfx::PreferIntegratedGpu, automatic_flushes));
-}
-
 }  // namespace
 
 namespace content {
 
 // RenderWidget ---------------------------------------------------------------
 
 RenderWidget::RenderWidget(CompositorDependencies* compositor_deps,
                            blink::WebPopupType popup_type,
                            const blink::WebScreenInfo& screen_info,
                            bool swapped_out,
@@ skipping 539 matching lines @@
     limits.start_transfer_buffer_size = 64 * 1024;
     limits.min_transfer_buffer_size = 64 * 1024;
 
     worker_context_provider =
         RenderThreadImpl::current()->SharedWorkerContextProvider();
     if (!worker_context_provider) {
       // Cause the compositor to wait and try again.
       return nullptr;
     }
 
+    // This is for an offscreen context for the compositor. So the default
+    // framebuffer doesn't need alpha, depth, stencil, antialiasing.
+    gpu::gles2::ContextCreationAttribHelper attributes;
+    attributes.alpha_size = -1;
+    attributes.depth_size = 0;
+    attributes.stencil_size = 0;
+    attributes.samples = 0;
+    attributes.sample_buffers = 0;
+    attributes.bind_generates_resource = false;
+    attributes.lose_context_when_out_of_memory = true;
+
+    bool automatic_flushes = false;
+
     // The compositor context shares resources with the worker context.
     context_provider = new ContextProviderCommandBuffer(
-        CreateOffscreenContext(std::move(gpu_channel_host),
-                               GetURLForGraphicsContext3D()),
-        limits, worker_context_provider.get(), RENDER_COMPOSITOR_CONTEXT);
+        base::WrapUnique(new content::WebGraphicsContext3DCommandBufferImpl(
+            gpu::kNullSurfaceHandle, GetURLForGraphicsContext3D(),
+            std::move(gpu_channel_host), gfx::PreferIntegratedGpu,
+            automatic_flushes)),
+        limits, attributes, worker_context_provider.get(),
+        command_buffer_metrics::RENDER_COMPOSITOR_CONTEXT);
 
 #if defined(OS_ANDROID)
     if (RenderThreadImpl::current() &&
         RenderThreadImpl::current()->sync_compositor_message_filter()) {
       uint32_t output_surface_id = next_output_surface_id_++;
       return base::WrapUnique(new SynchronousCompositorOutputSurface(
           context_provider, worker_context_provider, routing_id(),
           output_surface_id,
           RenderThreadImpl::current()->sync_compositor_message_filter(),
           frame_swap_message_queue_));
@@ skipping 1300 matching lines @@
 }
 
 float RenderWidget::GetOriginalDeviceScaleFactor() const {
   return
       screen_metrics_emulator_ ?
       screen_metrics_emulator_->original_screen_info().deviceScaleFactor :
       device_scale_factor_;
 }
 
 }  // namespace content