Update from https://crrev.com/306655

ui/gl/gl_context_cgl.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 "ui/gl/gl_context_cgl.h"
 
 #include <OpenGL/CGLRenderers.h>
 #include <OpenGL/CGLTypes.h>
 #include <vector>
 
@@ skipping 118 matching lines @@
         base::Bind(&CGLReleasePixelFormat, discrete_pixelformat_),
         base::TimeDelta::FromSeconds(10));
     discrete_pixelformat_ = NULL;
   }
   if (context_) {
     CGLDestroyContext(static_cast<CGLContextObj>(context_));
     context_ = NULL;
   }
 }
 
-bool GLContextCGL::MakeCurrent(GLSurface* surface) {
+bool GLContextCGL::ForceGpuSwitchIfNeeded() {
   DCHECK(context_);
 
   // The call to CGLSetVirtualScreen can hang on some AMD drivers
   // http://crbug.com/227228
   if (safe_to_force_gpu_switch_) {
     int renderer_id = share_group()->GetRendererID();
     int screen;
     CGLGetVirtualScreen(static_cast<CGLContextObj>(context_), &screen);
 
     if (g_support_renderer_switching &&
@@ skipping 17 matching lines @@
         screen_renderer_id &= kCGLRendererIDMatchingMask;
         if (screen_renderer_id == renderer_id) {
           CGLSetVirtualScreen(static_cast<CGLContextObj>(context_), i);
           screen_ = i;
           break;
         }
       }
       renderer_id_ = renderer_id;
     }
   }
+  return true;
+}
+
+bool GLContextCGL::MakeCurrent(GLSurface* surface) {
+  DCHECK(context_);
+
+  if (!ForceGpuSwitchIfNeeded())
+    return false;
 
   if (IsCurrent(surface))
     return true;
 
   ScopedReleaseCurrent release_current;
   TRACE_EVENT0("gpu", "GLContextCGL::MakeCurrent");
 
   if (CGLSetCurrentContext(
       static_cast<CGLContextObj>(context_)) != kCGLNoError) {
     LOG(ERROR) << "Unable to make gl context current.";
@@ skipping 107 matching lines @@
 
 GLContextCGL::~GLContextCGL() {
   Destroy();
 }
 
 GpuPreference GLContextCGL::GetGpuPreference() {
   return gpu_preference_;
 }
 
 }  // namespace gfx