Revert of Pass initial size and GPU preference via context attributes

android_webview/browser/aw_render_thread_context_provider.cc

 // Copyright 2015 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 "android_webview/browser/aw_render_thread_context_provider.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 44 matching lines @@
   // This context is only used for the display compositor, and there are no
   // uploads done with it at all. We choose a small transfer buffer limit
   // here, the minimums match the display compositor context for the android
   // browser. We don't set the max since we expect the transfer buffer to be
   // relatively unused.
   limits.start_transfer_buffer_size = 64 * 1024;
   limits.min_transfer_buffer_size = 64 * 1024;
 
   context_.reset(gpu::GLInProcessContext::Create(
       service, surface, surface->IsOffscreen(), gfx::kNullAcceleratedWidget,
-      nullptr /* share_context */, attributes, limits, nullptr, nullptr));
+      surface->GetSize(), nullptr /* share_context */, attributes,
+      gl::PreferDiscreteGpu, limits, nullptr, nullptr));
 
   context_->GetImplementation()->SetLostContextCallback(base::Bind(
       &AwRenderThreadContextProvider::OnLostContext, base::Unretained(this)));
 }
 
 AwRenderThreadContextProvider::~AwRenderThreadContextProvider() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
   if (gr_context_)
     gr_context_->releaseResourcesAndAbandonContext();
 }
@@ skipping 72 matching lines @@
 void AwRenderThreadContextProvider::OnLostContext() {
   DCHECK(main_thread_checker_.CalledOnValidThread());
 
   if (!lost_context_callback_.is_null())
     lost_context_callback_.Run();
   if (gr_context_)
     gr_context_->abandonContext();
 }
 
 }  // namespace android_webview