Revert of Pass initial size and GPU preference via context attributes

components/mus/gles2/command_buffer_driver.cc

 // Copyright 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 "components/mus/gles2/command_buffer_driver.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 65 matching lines @@
   DestroyDecoder();
 }
 
 bool CommandBufferDriver::Initialize(
     mojo::ScopedSharedBufferHandle shared_state,
     mojo::Array<int32_t> attribs) {
   DCHECK(CalledOnValidThread());
   gpu::gles2::ContextCreationAttribHelper attrib_helper;
   if (!attrib_helper.Parse(attribs.storage()))
     return false;
-  // TODO(piman): attribs can't currently represent gpu_preference.
 
   const bool offscreen = widget_ == gfx::kNullAcceleratedWidget;
   if (offscreen) {
     surface_ = gl::init::CreateOffscreenGLSurface(gfx::Size(0, 0));
   } else {
 #if defined(USE_OZONE)
     scoped_refptr<gl::GLSurface> underlying_surface =
         gl::init::CreateSurfacelessViewGLSurface(widget_);
     if (!underlying_surface)
       underlying_surface = gl::init::CreateViewGLSurface(widget_);
@@ skipping 13 matching lines @@
     if (vsync_provider) {
       vsync_provider->GetVSyncParameters(
           base::Bind(&CommandBufferDriver::OnUpdateVSyncParameters,
                      weak_factory_.GetWeakPtr()));
     }
   }
 
   if (!surface_.get())
     return false;
 
-  // TODO(piman): virtual contexts.
-  context_ = gl::init::CreateGLContext(
-      gpu_state_->share_group(), surface_.get(), attrib_helper.gpu_preference);
+  // TODO(piman): virtual contexts, gpu preference.
+  context_ = gl::init::CreateGLContext(gpu_state_->share_group(),
+                                       surface_.get(), gl::PreferIntegratedGpu);
   if (!context_.get())
     return false;
 
   if (!context_->MakeCurrent(surface_.get()))
     return false;
 
   // TODO(piman): ShaderTranslatorCache is currently per-ContextGroup but
   // only needs to be per-thread.
   const bool bind_generates_resource = attrib_helper.bind_generates_resource;
   scoped_refptr<gpu::gles2::FeatureInfo> feature_info =
@@ skipping 22 matching lines @@
       &CommandBufferDriver::OnFenceSyncRelease, base::Unretained(this)));
   decoder_->SetWaitFenceSyncCallback(base::Bind(
       &CommandBufferDriver::OnWaitFenceSync, base::Unretained(this)));
   decoder_->SetDescheduleUntilFinishedCallback(base::Bind(
       &CommandBufferDriver::OnDescheduleUntilFinished, base::Unretained(this)));
   decoder_->SetRescheduleAfterFinishedCallback(base::Bind(
       &CommandBufferDriver::OnRescheduleAfterFinished, base::Unretained(this)));
 
   gpu::gles2::DisallowedFeatures disallowed_features;
 
-  if (!decoder_->Initialize(surface_, context_, offscreen, disallowed_features,
-                            attrib_helper))
+  if (!decoder_->Initialize(surface_, context_, offscreen, gfx::Size(1, 1),
+                            disallowed_features, attrib_helper))
     return false;
 
   command_buffer_->SetPutOffsetChangeCallback(base::Bind(
       &gpu::CommandExecutor::PutChanged, base::Unretained(executor_.get())));
   command_buffer_->SetGetBufferChangeCallback(base::Bind(
       &gpu::CommandExecutor::SetGetBuffer, base::Unretained(executor_.get())));
   command_buffer_->SetParseErrorCallback(
       base::Bind(&CommandBufferDriver::OnParseError, base::Unretained(this)));
 
   // TODO(piman): other callbacks
@@ skipping 382 matching lines @@
 }
 
 void CommandBufferDriver::OnGpuCompletedSwapBuffers(gfx::SwapResult result) {
   DCHECK(CalledOnValidThread());
   if (client_) {
     client_->OnGpuCompletedSwapBuffers(result);
   }
 }
 
 }  // namespace mus