Don't initialize GL again in AcceleratedSurface::Initialize()

content/child/npapi/plugin_host.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 "content/child/npapi/plugin_host.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 43 matching lines @@
 #if defined(OS_MACOSX)
 // Returns true if Core Animation plugins are supported. This requires that the
 // OS supports shared accelerated surfaces via IOSurface. This is true on Snow
 // Leopard and higher.
 static bool SupportsCoreAnimationPlugins() {
   if (CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kDisableCoreAnimationPlugins))
     return false;
   // We also need to be running with desktop GL and not the software
   // OSMesa renderer in order to share accelerated surfaces between
-  // processes.
-  gfx::GLImplementation implementation = gfx::GetGLImplementation();
+  // processes. Because on MacOS we lazy-initialize GLSurface in the
+  // renderer process here, ensure we're not also initializing GL somewhere
+  // else, and that we only do this once.
+  static gfx::GLImplementation implementation = gfx::kGLImplementationNone;
   if (implementation == gfx::kGLImplementationNone) {
     // Not initialized yet.
+    DCHECK_EQ(implementation, gfx::GetGLImplementation())
+        << "GL already initialized by someone else to: "
+        << gfx::GetGLImplementation();
     if (!gfx::GLSurface::InitializeOneOff()) {
       return false;
     }
     implementation = gfx::GetGLImplementation();
   }
   return (implementation == gfx::kGLImplementationDesktopGL);
 }
 #endif
 
 PluginHost::PluginHost() {
@@ skipping 1022 matching lines @@
 }
 
 void NPN_URLRedirectResponse(NPP instance, void* notify_data, NPBool allow) {
   scoped_refptr<PluginInstance> plugin(FindInstance(instance));
   if (plugin.get()) {
     plugin->URLRedirectResponse(!!allow, notify_data);
   }
 }
 
 }  // extern "C"