Allow GraphicsContext3D to be created with a NULL WebView for offscreen

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 96 matching lines @@
     bool render_directly_to_web_view) {
   if (!gfx::GLSurface::InitializeOneOff())
     return false;
   gfx::BindSkiaToInProcessGL();
 
   render_directly_to_web_view_ = render_directly_to_web_view;
   gfx::GLShareGroup* share_group = 0;
 
   if (!render_directly_to_web_view) {
     // Pick up the compositor's context to share resources with.
-    WebGraphicsContext3D* view_context = webView->graphicsContext3D();
+    WebGraphicsContext3D* view_context = webView ?
+                                         webView->graphicsContext3D() : NULL;
     if (view_context) {
       WebGraphicsContext3DInProcessImpl* contextImpl =
           static_cast<WebGraphicsContext3DInProcessImpl*>(view_context);
       share_group = contextImpl->gl_context_->share_group();
     } else {
       // The compositor's context didn't get created
       // successfully, so conceptually there is no way we can
       // render successfully to the WebView.
       render_directly_to_web_view_ = false;
     }
@@ skipping 13 matching lines @@
     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();
+    if (webView) webView->mainFrame()->collectGarbage();
 
     gl_surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false,
                                                            gfx::Size(1, 1));
     if (!gl_surface_.get())
       return false;
   }
 
   gl_context_ = gfx::GLContext::CreateGLContext(share_group,
                                                 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();
+    if (webView) webView->mainFrame()->collectGarbage();
 
     gl_context_ = gfx::GLContext::CreateGLContext(share_group,
                                                   gl_surface_.get());
     if (!gl_context_.get())
       return false;
   }
 
   attributes_ = attributes;
 
   // FIXME: for the moment we disable multisampling for the compositor.
@@ skipping 1139 matching lines @@
 }
 
 DELEGATE_TO_GL_2(sampleCoverage, SampleCoverage, WGC3Dclampf, WGC3Dboolean)
 
 DELEGATE_TO_GL_4(scissor, Scissor, WGC3Dint, WGC3Dint, WGC3Dsizei, WGC3Dsizei)
 
 void WebGraphicsContext3DInProcessImpl::texImage2D(
     WGC3Denum target, WGC3Dint level, WGC3Denum internalFormat,
     WGC3Dsizei width, WGC3Dsizei height, WGC3Dint border,
     WGC3Denum format, WGC3Denum type, const void* pixels) {
-  if (width && height && !pixels) {
-    synthesizeGLError(GL_INVALID_VALUE);
-    return;
-  }
   makeContextCurrent();
   glTexImage2D(target, level, internalFormat,
                width, height, border, format, type, pixels);
 }
 
 void WebGraphicsContext3DInProcessImpl::shaderSource(
     WebGLId shader, const WGC3Dchar* source) {
   makeContextCurrent();
   GLint length = source ? strlen(source) : 0;
   ShaderSourceMap::iterator result = shader_source_map_.find(shader);
@@ skipping 282 matching lines @@
   if (length > 1) {
     entry->translated_source.reset(new char[length]);
     ShGetObjectCode(compiler, entry->translated_source.get());
   }
   entry->is_valid = true;
   return true;
 }
 
 }  // namespace gpu
 }  // namespace webkit