Fix issue in Safari 5 on Mac OS X 10.6 on Mac Minis where drawInCGLContext/co...

Fix issue in Safari 5 on Mac OS X 10.6 on Mac Minis where drawInCGLContext/copyCGLContextForPixelFormat are called a second time during shutdown in certain hosting pages, causing an assert due to duplicate creation of the Renderer service.

TEST=repeatedly launched/exiting the affected O3D app and verified no crash or other issue
BUG=none


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=49835

[Ken Russell (switch to Gerrit), 2010-06-14 20:47:39]

Thanks for tracking this down and proposing a fix. I think it should be
structured differently, however. Could you try this patch and see whether it
also fixes the problem? It basically just inserts an "if (glContext_ == NULL)"
guard around the logic in copyCGLContextForPixelFormat:.


Index: o3d_layer.mm
===================================================================
--- o3d_layer.mm	(revision 49722)
+++ o3d_layer.mm	(working copy)
@@ -115,14 +115,16 @@
  * renderers from pixel format 'pixelFormat'. The default implementation
  * allocates a new context with a null share context. */
 - (CGLContextObj)copyCGLContextForPixelFormat:(CGLPixelFormatObj)pixelFormat {
-  CGLContextObj share_context = obj_->GetFullscreenShareContext();
-  DCHECK(share_context);
-  if (CGLCreateContext(pixelFormat, share_context, &glContext_) !=
-      kCGLNoError) {
-    glContext_ = [super copyCGLContextForPixelFormat:pixelFormat];
+  if (glContext_ == NULL) {
+    CGLContextObj share_context = obj_->GetFullscreenShareContext();
+    DCHECK(share_context);
+    if (CGLCreateContext(pixelFormat, share_context, &glContext_) !=
+        kCGLNoError) {
+      glContext_ = [super copyCGLContextForPixelFormat:pixelFormat];
+    }
+    obj_->SetMacCGLContext(glContext_);
+    created_context_ = true;
   }
-  obj_->SetMacCGLContext(glContext_);
-  created_context_ = true;
   return glContext_;
 }

[Tristan Schmelcher 2, 2010-06-14 21:31:56]

That works too. New snapshot uploaded.

[Ken Russell (switch to Gerrit), 2010-06-14 21:53:29]

LGTM

[mafv, 2010-06-14 22:56:39]

LGTM