Turning the threaded compositor into a runtime option. This CL

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 24 matching lines @@
 
 static base::LazyInstance<base::Lock>
     g_all_shared_contexts_lock(base::LINKER_INITIALIZED);
 static base::LazyInstance<std::set<WebGraphicsContext3DCommandBufferImpl*> >
     g_all_shared_contexts(base::LINKER_INITIALIZED);
 
 WebGraphicsContext3DCommandBufferImpl::WebGraphicsContext3DCommandBufferImpl()
     : initialize_failed_(false),
       context_(NULL),
       gl_(NULL),
-#ifndef WTF_USE_THREADED_COMPOSITING
       web_view_(NULL),
-#endif
 #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),
       method_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
@@ skipping 37 matching lines @@
   if (web_view && web_view->mainFrame())
     active_url_ = GURL(web_view->mainFrame()->document().url());
 
   attributes_ = attributes;
   render_directly_to_web_view_ = render_directly_to_web_view;
   if (render_directly_to_web_view_) {
     RenderView* render_view = RenderView::FromWebView(web_view);
     if (!render_view)
       return false;
     render_view_routing_id_ = render_view->routing_id();
-#ifndef WTF_USE_THREADED_COMPOSITING
     web_view_ = web_view;
-#endif
   }
   return true;
 }
 
 bool WebGraphicsContext3DCommandBufferImpl::MaybeInitializeGL() {
   if (context_)
     return true;
   if (initialize_failed_)
     return false;
 
@@ skipping 119 matching lines @@
       parent_context_impl ? parent_context_impl->context() : NULL);
 }
 
 WebGLId WebGraphicsContext3DCommandBufferImpl::getPlatformTextureId() {
   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();
   context_->Echo(method_factory_.NewRunnableMethod(
       &WebGraphicsContext3DCommandBufferImpl::OnSwapBuffersComplete));
 #if defined(OS_MACOSX)
   // It appears that making the compositor's on-screen context current on
   // other platforms implies this flush. TODO(kbr): this means that the
   // TOUCH build and, in the future, other platforms might need this.
   gl_->Flush();
 #endif
 }
@@ skipping 757 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 34 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)