Merge 106394 - Fixed bugs with Pepper 3D under dynamic GPU switching.

ui/gfx/gl/gl_context_cgl.cc

 // Copyright (c) 2011 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/gfx/gl/gl_context_cgl.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #include "ui/gfx/gl/gl_surface_cgl.h"
 
 namespace gfx {
 
 GLContextCGL::GLContextCGL(GLShareGroup* share_group)
   : GLContext(share_group),
     context_(NULL),
     gpu_preference_(PreferIntegratedGpu) {
 }
 
 GLContextCGL::~GLContextCGL() {
   Destroy();
 }
 
 bool GLContextCGL::Initialize(
     GLSurface* compatible_surface, GpuPreference gpu_preference) {
   DCHECK(compatible_surface);
 
-  // Ensure the GPU preference is compatible with contexts already in the
-  // share group.
   GLContextCGL* share_context = share_group() ?
       static_cast<GLContextCGL*>(share_group()->GetContext()) : NULL;
-  if (share_context && gpu_preference != share_context->GetGpuPreference())
-    return false;
+  if (SupportsDualGpus()) {
+    // Ensure the GPU preference is compatible with contexts already in the
+    // share group.
+    if (share_context && gpu_preference != share_context->GetGpuPreference())
+      return false;
+  }
 
   std::vector<CGLPixelFormatAttribute> attribs;
   attribs.push_back(kCGLPFAPBuffer);
   bool using_offline_renderer =
       SupportsDualGpus() && gpu_preference == PreferIntegratedGpu;
   if (using_offline_renderer) {
     attribs.push_back(kCGLPFAAllowOfflineRenderers);
   }
   attribs.push_back((CGLPixelFormatAttribute) 0);
 
@@ skipping 108 matching lines @@
 void GLContextCGL::SetSwapInterval(int interval) {
   DCHECK(IsCurrent(NULL));
   LOG(WARNING) << "GLContex: GLContextCGL::SetSwapInterval is ignored.";
 }
 
 GpuPreference GLContextCGL::GetGpuPreference() {
   return gpu_preference_;
 }
 
 }  // namespace gfx