GLContext no longer holds a pointer to a GLSurface.

webkit/gpu/webgraphicscontext3d_in_process_impl.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 "webkit/gpu/webgraphicscontext3d_in_process_impl.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <string>
@@ skipping 72 matching lines @@
   }
   glDeleteTextures(1, &texture_);
   glDeleteFramebuffersEXT(1, &copy_texture_to_parent_texture_fbo_);
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
   if (scanline_)
     delete[] scanline_;
 #endif
   glDeleteFramebuffersEXT(1, &fbo_);
 
   gl_context_->Destroy();
+  gl_surface_->Destroy();
 
   for (ShaderSourceMap::iterator ii = shader_source_map_.begin();
        ii != shader_source_map_.end(); ++ii) {
     if (ii->second)
       delete ii->second;
   }
   AngleDestroyCompilers();
 }
 
 bool WebGraphicsContext3DInProcessImpl::initialize(
@@ skipping 23 matching lines @@
   }
 
   is_gles2_ = gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
 
   // This implementation always renders offscreen regardless of
   // whether render_directly_to_web_view is true. Both DumpRenderTree
   // and test_shell paint first to an intermediate offscreen buffer
   // and from there to the window, and WebViewImpl::paint already
   // correctly handles the case where the compositor is active but
   // the output needs to go to a WebCanvas.
-  scoped_ptr<gfx::GLSurface> surface(gfx::GLSurface::CreateOffscreenGLSurface(
+  gl_surface_.reset(gfx::GLSurface::CreateOffscreenGLSurface(
       gfx::Size(1, 1)));
-  if (!surface.get()) {
+  if (!gl_surface_.get()) {
     if (!is_gles2_)
       return false;
 
     // Embedded systems have smaller limit on number of GL contexts. Sometimes
     // failure of GL context creation is because of existing GL contexts
     // referenced by JavaScript garbages. Collect garbage and try again.
     // TODO: Besides this solution, kbr@chromium.org suggested: upon receiving
     // a page unload event, iterate down any live WebGraphicsContext3D instances
     // and force them to drop their contexts, sending a context lost event if
     // necessary.
     webView->mainFrame()->collectGarbage();
-    surface.reset(gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1)));
-    if (!surface.get())
+
+    gl_surface_.reset(
+        gfx::GLSurface::CreateOffscreenGLSurface(gfx::Size(1, 1)));
+    if (!gl_surface_.get())
       return false;
   }
 
-  gl_context_.reset(gfx::GLContext::CreateGLContext(surface.release(),
-                                                    share_context));
-  if (!gl_context_.get())
-    return false;
+  gl_context_.reset(gfx::GLContext::CreateGLContext(share_context,
+                                                    gl_surface_.get()));
+  if (!gl_context_.get()) {
+    if (!is_gles2_)
+      return false;
+
+    // Embedded systems have smaller limit on number of GL contexts. Sometimes
+    // failure of GL context creation is because of existing GL contexts
+    // referenced by JavaScript garbages. Collect garbage and try again.
+    // TODO: Besides this solution, kbr@chromium.org suggested: upon receiving
+    // a page unload event, iterate down any live WebGraphicsContext3D instances
+    // and force them to drop their contexts, sending a context lost event if
+    // necessary.
+    webView->mainFrame()->collectGarbage();
+
+    gl_context_.reset(gfx::GLContext::CreateGLContext(share_context,
+                                                      gl_surface_.get()));
+    if (!gl_context_.get())
+      return false;
+  }
 
   attributes_ = attributes;
 
   // FIXME: for the moment we disable multisampling for the compositor.
   // It actually works in this implementation, but there are a few
   // considerations. First, we likely want to reduce the fuzziness in
   // these tests as much as possible because we want to run pixel tests.
   // Second, Mesa's multisampling doesn't seem to antialias straight
   // edges in some CSS 3D samples. Third, we don't have multisampling
   // support for the compositor in the normal case at the time of this
   // writing.
   if (render_directly_to_web_view)
     attributes_.antialias = false;
 
-  if (!gl_context_->MakeCurrent()) {
+  if (!gl_context_->MakeCurrent(gl_surface_.get())) {
     gl_context_.reset();
     return false;
   }
 
   const char* extensions =
       reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
   DCHECK(extensions);
   have_ext_framebuffer_object_ =
       strstr(extensions, "GL_EXT_framebuffer_object") != NULL;
   have_ext_framebuffer_multisample_ =
@@ skipping 74 matching lines @@
                              x + width, y + height,
                              x, y,
                              x + width, y + height,
                              GL_COLOR_BUFFER_BIT, GL_NEAREST);
     }
     glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, bound_fbo_);
   }
 }
 
 bool WebGraphicsContext3DInProcessImpl::makeContextCurrent() {
-  return gl_context_->MakeCurrent();
+  return gl_context_->MakeCurrent(gl_surface_.get());
 }
 
 int WebGraphicsContext3DInProcessImpl::width() {
   return cached_width_;
 }
 
 int WebGraphicsContext3DInProcessImpl::height() {
   return cached_height_;
 }
 
@@ skipping 1355 matching lines @@
       strncpy(entry->translated_source.get(), entry->source.get(), length);
     else
       ShGetObjectCode(compiler, entry->translated_source.get());
   }
   entry->is_valid = true;
   return true;
 }
 
 }  // namespace gpu
 }  // namespace webkit