Don't call RenderView directly if USE_THREADED_COMPOSITOR is set.

content/renderer/gpu/webgraphicscontext3d_command_buffer_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.
 
 #if defined(ENABLE_GPU)
 
 #include "content/renderer/gpu/webgraphicscontext3d_command_buffer_impl.h"
 
 #include "gpu/GLES2/gl2.h"
 #ifndef GL_GLEXT_PROTOTYPES
@@ skipping 20 matching lines @@
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/gl_bindings_skia_cmd_buffer.h"
 
 static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> >
     g_all_contexts(base::LINKER_INITIALIZED);
 
 WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl()
     : context_(NULL),
       gl_(NULL),
       web_view_(NULL),

[jamesr, 2011/08/19 21:31:10]

You need to guard this reference to web_view_ as well, don't you?

[lain Merrick, 2011/08/19 21:33:27]

Oops, good catch. I tried compiling with use_threaded_compositor=1, but I
thought the error I hit was in another file. I'll check again more carefully.

 #if defined(OS_MACOSX)
       plugin_handle_(NULL),
 #endif  // defined(OS_MACOSX)
       context_lost_callback_(0),
       context_lost_reason_(GL_NO_ERROR),
       swapbuffers_complete_callback_(0),
       cached_width_(0),
       cached_height_(0),
       bound_fbo_(0) {
 }
@@ skipping 64 matching lines @@
   // HACK: Assume this is a WebGL context by looking for the noExtensions
   // attribute. WebGL contexts must not go in the share group because they
   // rely on destruction of the context to clean up owned resources. Putting
   // them in a share group would prevent this from happening.
   RendererGLContext* share_group = NULL;
   if (!attributes.noExtensions) {
     share_group = g_all_contexts.Pointer()->empty() ?
         NULL : (*g_all_contexts.Pointer()->begin())->context_;
   }
 
+  render_directly_to_web_view_ = render_directly_to_web_view;
   if (render_directly_to_web_view) {
+#ifndef WTF_USE_THREADED_COMPOSITING
     RenderView* renderview = RenderView::FromWebView(web_view);
     if (!renderview)
       return false;
-
     web_view_ = web_view;
+#endif
     context_ = RendererGLContext::CreateViewContext(
         host,
         renderview->routing_id(),
         !attributes.noExtensions,
         share_group,
         preferred_extensions,
         attribs,
         active_url);
     if (context_) {
       context_->SetSwapBuffersCallback(
           NewCallback(this,
               &WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete));
     }
   } else {
     context_ = RendererGLContext::CreateOffscreenContext(
         host,
         gfx::Size(1, 1),
         !attributes.noExtensions,
         share_group,
         preferred_extensions,
         attribs,
         active_url);
+#ifndef WTF_USE_THREADED_COMPOSITING
     web_view_ = NULL;
+#endif
   }
   if (!context_)
     return false;
 
   gl_ = context_->GetImplementation();
   context_->SetContextLostCallback(
       NewCallback(this,
                   &WebGraphicsContext3DCommandBufferImpl::OnContextLost));
 
   // TODO(gman): Remove this.
@@ skipping 50 matching lines @@
 }
 
 WebGLId WebGraphicsContext3DCommandBufferImpl::getPlatformTextureId() {
   DCHECK(context_);
   return context_->GetParentTextureId();
 }
 
 void WebGraphicsContext3DCommandBufferImpl::prepareTexture() {
   // Copies the contents of the off-screen render target into the texture
   // used by the compositor.
+#ifndef WTF_USE_THREADED_COMPOSITING
   RenderView* renderview =
       web_view_ ? RenderView::FromWebView(web_view_) : NULL;
   if (renderview)
     renderview->OnViewContextSwapBuffersPosted();
+#endif
   context_->SwapBuffers();
 }
 
 void WebGraphicsContext3DCommandBufferImpl::reshape(int width, int height) {
   cached_width_ = width;
   cached_height_ = height;
 
-  if (web_view_) {
+  if (render_directly_to_web_view_) {
 #if defined(OS_MACOSX)
     context_->ResizeOnscreen(gfx::Size(width, height));
 #else
     gl_->ResizeCHROMIUM(width, height);
 #endif
   } else {
     context_->ResizeOffscreen(gfx::Size(width, height));
     // Force a SwapBuffers to get the framebuffer to resize.
     context_->SwapBuffers();
   }
@@ skipping 750 matching lines @@
 
 void WebGraphicsContext3DCommandBufferImpl::deleteShader(WebGLId shader) {
   gl_->DeleteShader(shader);
 }
 
 void WebGraphicsContext3DCommandBufferImpl::deleteTexture(WebGLId texture) {
   gl_->DeleteTextures(1, &texture);
 }
 
 void WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete() {
+#ifndef WTF_USE_THREADED_COMPOSITING
   // This may be called after tear-down of the RenderView.
   RenderView* renderview =
       web_view_ ? RenderView::FromWebView(web_view_) : NULL;
   if (renderview)
     renderview->OnViewContextSwapBuffersComplete();
+#endif
   if (swapbuffers_complete_callback_)
     swapbuffers_complete_callback_->onSwapBuffersComplete();
 }
 
 void WebGraphicsContext3DCommandBufferImpl::setContextLostCallback(
     WebGraphicsContext3D::WebGraphicsContextLostCallback* cb) {
   context_lost_callback_ = cb;
 }
 
 WGC3Denum WebGraphicsContext3DCommandBufferImpl::getGraphicsResetStatusARB() {
@@ skipping 28 matching lines @@
 }
 
 }  // anonymous namespace
 
 void WebGraphicsContext3DCommandBufferImpl::OnContextLost(
     RendererGLContext::ContextLostReason reason) {
   context_lost_reason_ = convertReason(reason);
   if (context_lost_callback_) {
     context_lost_callback_->onContextLost();
   }
-
+#ifndef WTF_USE_THREADED_COMPOSITING
   RenderView* renderview =
       web_view_ ? RenderView::FromWebView(web_view_) : NULL;
   if (renderview)
     renderview->OnViewContextSwapBuffersAborted();
+#endif
 }
 
 #endif  // defined(ENABLE_GPU)