Allow specification of the share group in WebGraphicsContext3DInProcessImpl

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 25 matching lines @@
   }
 
   WGC3Denum type;
   scoped_array<char> source;
   scoped_array<char> log;
   scoped_array<char> translated_source;
   bool is_valid;
 };
 
 WebGraphicsContext3DInProcessImpl::WebGraphicsContext3DInProcessImpl(
-    gfx::PluginWindowHandle window)
+    gfx::PluginWindowHandle window,
+    gfx::GLShareGroup* share_group)
     : initialized_(false),
       render_directly_to_web_view_(false),
       is_gles2_(false),
       have_ext_framebuffer_object_(false),
       have_ext_framebuffer_multisample_(false),
       have_angle_framebuffer_multisample_(false),
       texture_(0),
       fbo_(0),
       depth_stencil_buffer_(0),
       cached_width_(0),
       cached_height_(0),
       multisample_fbo_(0),
       multisample_depth_stencil_buffer_(0),
       multisample_color_buffer_(0),
       bound_fbo_(0),
       bound_texture_(0),
       copy_texture_to_parent_texture_fbo_(0),
 #ifdef FLIP_FRAMEBUFFER_VERTICALLY
       scanline_(0),
 #endif
       fragment_compiler_(0),
       vertex_compiler_(0),
-      window_(window) {
+      window_(window),
+      share_group_(share_group) {
 }
 
 WebGraphicsContext3DInProcessImpl::~WebGraphicsContext3DInProcessImpl() {
   if (!initialized_)
     return;
 
   makeContextCurrent();
 
   if (attributes_.antialias) {
     glDeleteRenderbuffersEXT(1, &multisample_color_buffer_);
@@ skipping 27 matching lines @@
 bool WebGraphicsContext3DInProcessImpl::initialize(
     WebGraphicsContext3D::Attributes attributes,
     WebView* webView,
     bool render_directly_to_web_view) {
   if (!gfx::GLSurface::InitializeOneOff())
     return false;
 
   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 ?
-                                         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;
-    }
-  }
-
   is_gles2_ = gfx::GetGLImplementation() == gfx::kGLImplementationEGLGLES2;
 
   if (window_ != gfx::kNullPluginWindow) {
+    share_group = share_group_;
     gl_surface_ = gfx::GLSurface::CreateViewGLSurface(false, window_);
   } else {
+    if (!render_directly_to_web_view) {
+      // Pick up the compositor's context to share resources with.
+      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;
+      }
+    }
     // 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.
     gl_surface_ = gfx::GLSurface::CreateOffscreenGLSurface(false,
         gfx::Size(1, 1));
   }
 
@@ skipping 1525 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