Revert of Pass initial size and GPU preference via context attributes

gpu/ipc/client/command_buffer_proxy_impl.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 "gpu/ipc/client/command_buffer_proxy_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
@@ skipping 53 matching lines @@
       weak_this_(AsWeakPtr()),
       callback_thread_(base::ThreadTaskRunnerHandle::Get()) {
   DCHECK(route_id);
   DCHECK_NE(stream_id, GPU_STREAM_INVALID);
 }
 
 // static
 std::unique_ptr<CommandBufferProxyImpl> CommandBufferProxyImpl::Create(
     scoped_refptr<GpuChannelHost> host,
     gpu::SurfaceHandle surface_handle,
+    const gfx::Size& size,
     CommandBufferProxyImpl* share_group,
     int32_t stream_id,
     gpu::GpuStreamPriority stream_priority,
     const gpu::gles2::ContextCreationAttribHelper& attribs,
     const GURL& active_url,
+    gl::GpuPreference gpu_preference,
     scoped_refptr<base::SingleThreadTaskRunner> task_runner) {
   DCHECK(!share_group || (stream_id == share_group->stream_id_));
   TRACE_EVENT1("gpu", "GpuChannelHost::CreateViewCommandBuffer",
                "surface_handle", surface_handle);
 
   GPUCreateCommandBufferConfig init_params;
   init_params.surface_handle = surface_handle;
+  init_params.size = size;
   init_params.share_group_id =
       share_group ? share_group->route_id_ : MSG_ROUTING_NONE;
   init_params.stream_id = stream_id;
   init_params.stream_priority = stream_priority;
   init_params.attribs = attribs;
   init_params.active_url = active_url;
+  init_params.gpu_preference = gpu_preference;
 
   int32_t route_id = host->GenerateRouteID();
   std::unique_ptr<CommandBufferProxyImpl> command_buffer = base::WrapUnique(
       new CommandBufferProxyImpl(host->channel_id(), route_id, stream_id));
   if (!command_buffer->Initialize(std::move(host), std::move(init_params),
                                   std::move(task_runner)))
     return nullptr;
 
   return command_buffer;
 }
@@ skipping 771 matching lines @@
     gpu_control_client_->OnGpuControlLostContext();
 }
 
 CommandBufferProxyImpl::ImageInfo::ImageInfo() {}
 CommandBufferProxyImpl::ImageInfo::~ImageInfo() {}
 CommandBufferProxyImpl::ImageInfo::ImageInfo(ImageInfo&& other) = default;
 CommandBufferProxyImpl::ImageInfo& CommandBufferProxyImpl::ImageInfo::operator=(
     ImageInfo&& other) = default;
 
 }  // namespace gpu