Refactor context creation parameters into a struct.

android_webview/browser/scoped_app_gl_state_restore.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 "android_webview/browser/scoped_app_gl_state_restore.h"
 
 #include <string>
 
 #include "base/lazy_instance.h"
 #include "base/trace_event/trace_event.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/gl_context.h"
 #include "ui/gl/gl_surface_stub.h"
 #include "ui/gl/init/gl_factory.h"
 
 namespace android_webview {
 
 namespace {
 
+gl::GLContextAttribs GetAppContextAttribs() {
+  gl::GLContextAttribs attribs;
+  attribs.gpu_preference = gl::PreferDiscreteGpu;
+  return attribs;
+}
+
 // "App" context is a bit of a stretch. Basically we use this context while
 // saving and restoring the App GL state.
 class AppContextSurface {
  public:
   AppContextSurface()
       : surface(new gl::GLSurfaceStub),
         context(gl::init::CreateGLContext(nullptr,
                                           surface.get(),
-                                          gl::PreferDiscreteGpu)) {}
+                                          GetAppContextAttribs())) {}

[piman, 2016/11/07 21:01:01]

nit: the default GLContextAttribs would be perfectly fine here: Android doesn't
have dual-GPU support (i.e. the preference is ignored), and besides we'd
probably prefer the integrated anyway.

[Geoff Lang, 2016/11/07 21:36:20]

Done.

   void MakeCurrent() { context->MakeCurrent(surface.get()); }
 
  private:
   scoped_refptr<gl::GLSurfaceStub> surface;
   scoped_refptr<gl::GLContext> context;
 
   DISALLOW_COPY_AND_ASSIGN(AppContextSurface);
 };
 
 base::LazyInstance<AppContextSurface> g_app_context_surface =
@@ skipping 398 matching lines @@
 }
 
 StencilState ScopedAppGLStateRestore::stencil_state() const {
   return impl_->stencil_state();
 }
 int ScopedAppGLStateRestore::framebuffer_binding_ext() const {
   return impl_->framebuffer_binding_ext();
 }
 
 }  // namespace android_webview