GPU: Reduce MakeCurrent calls to fix Orange San Diego

ui/gl/gl_gl_api_implementation.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_gl_api_implementation.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/command_line.h"
@@ skipping 126 matching lines @@
   if (switched_contexts || surface != current_surface) {
     if (!switched_contexts && current_surface &&
         virtual_context->IsCurrent(surface)) {
       // MakeCurrent 'lite' path that avoids potentially expensive MakeCurrent()
       // calls if the GLSurface uses the same underlying surface or renders to
       // an FBO.
       if (!surface->OnMakeCurrent(real_context_)) {
         LOG(ERROR) << "Could not make GLSurface current.";
         return false;
       }
-    } else if (!real_context_->MakeCurrent(surface)) {
-      return false;
+    } else {
+      if (!real_context_->MakeCurrent(surface))
+        return false;
     }
   }
 
   DCHECK(GLSurface::GetCurrent());
   DCHECK(real_context_->IsCurrent(GLSurface::GetCurrent()));
   DCHECK(virtual_context->IsCurrent(surface));
 
   if (switched_contexts || virtual_context != current_context_) {
     // There should be no errors from the previous context leaking into the
     // new context.
@@ skipping 22 matching lines @@
 const GLubyte* VirtualGLApi::glGetStringFn(GLenum name) {
   switch (name) {
     case GL_EXTENSIONS:
       return reinterpret_cast<const GLubyte*>(extensions_.c_str());
     default:
       return driver_->fn.glGetStringFn(name);
   }
 }
 
 }  // namespace gfx