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

plugin/mac/o3d_layer.mm

 /*
  * Copyright 2009, Google Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 97 matching lines @@
 }
 
 
 
 
 /* Called by the CAOpenGLLayer implementation when a rendering context
  * is needed by the layer. Should return an OpenGL context with
  * 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_;
 }
 
 /*
 - (CGLPixelFormatObj)copyCGLPixelFormatForDisplayMask:(uint32_t)mask {
   return [super copyCGLPixelFormatForDisplayMask:mask];
 }*/
 
 
 #define PFA(number) static_cast<CGLPixelFormatAttribute>(number)
@@ skipping 46 matching lines @@
   return glContext_;
 }
 
 - (void)setWidth:(int)width height:(int)height {
   width_ = width;
   height_ = height;
   was_resized_ = true;
 }
 
 @end