Revert of Pass initial size and GPU preference via context attributes

content/common/gpu/client/context_provider_command_buffer.cc

 // Copyright (c) 2013 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/common/gpu/client/context_provider_command_buffer.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <set>
@@ skipping 41 matching lines @@
 
 ContextProviderCommandBuffer::SharedProviders::SharedProviders() = default;
 ContextProviderCommandBuffer::SharedProviders::~SharedProviders() = default;
 
 ContextProviderCommandBuffer::ContextProviderCommandBuffer(
     scoped_refptr<gpu::GpuChannelHost> channel,
     int32_t stream_id,
     gpu::GpuStreamPriority stream_priority,
     gpu::SurfaceHandle surface_handle,
     const GURL& active_url,
+    gl::GpuPreference gpu_preference,
     bool automatic_flushes,
     bool support_locking,
     const gpu::SharedMemoryLimits& memory_limits,
     const gpu::gles2::ContextCreationAttribHelper& attributes,
     ContextProviderCommandBuffer* shared_context_provider,
     command_buffer_metrics::ContextType type)
     : stream_id_(stream_id),
       stream_priority_(stream_priority),
       surface_handle_(surface_handle),
       active_url_(active_url),
+      gpu_preference_(gpu_preference),
       automatic_flushes_(automatic_flushes),
       support_locking_(support_locking),
       memory_limits_(memory_limits),
       attributes_(attributes),
       context_type_(type),
       shared_providers_(shared_context_provider
                             ? shared_context_provider->shared_providers_
                             : new SharedProviders),
       channel_(std::move(channel)) {
   DCHECK(main_thread_checker_.CalledOnValidThread());
@@ skipping 69 matching lines @@
 
     DCHECK(attributes_.buffer_preserved);
 
     // This command buffer is a client-side proxy to the command buffer in the
     // GPU process.
     scoped_refptr<base::SingleThreadTaskRunner> task_runner =
         default_task_runner_;
     if (!task_runner)
       task_runner = base::ThreadTaskRunnerHandle::Get();
     command_buffer_ = gpu::CommandBufferProxyImpl::Create(
-        std::move(channel_), surface_handle_, shared_command_buffer, stream_id_,
-        stream_priority_, attributes_, active_url_, std::move(task_runner));
+        std::move(channel_), surface_handle_, gfx::Size(),
+        shared_command_buffer, stream_id_, stream_priority_,
+        attributes_, active_url_, gpu_preference_,
+        std::move(task_runner));
     if (!command_buffer_) {
       DLOG(ERROR) << "GpuChannelHost failed to create command buffer.";
       command_buffer_metrics::UmaRecordContextInitFailed(context_type_);
       return false;
     }
 
     // The GLES2 helper writes the command buffer protocol.
     gles2_helper_.reset(new gpu::gles2::GLES2CmdHelper(command_buffer_.get()));
     gles2_helper_->SetAutomaticFlushes(automatic_flushes_);
     if (!gles2_helper_->Initialize(memory_limits_.command_buffer_size)) {
@@ skipping 160 matching lines @@
 
 void ContextProviderCommandBuffer::SetLostContextCallback(
     const LostContextCallback& lost_context_callback) {
   DCHECK(context_thread_checker_.CalledOnValidThread());
   DCHECK(lost_context_callback_.is_null() ||
          lost_context_callback.is_null());
   lost_context_callback_ = lost_context_callback;
 }
 
 }  // namespace content