aw: Ubercomp mega patch

content/browser/android/in_process/synchronous_compositor_factory_impl.cc

 // Copyright 2014 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 "content/browser/android/in_process/synchronous_compositor_factory_impl.h"
 
 #include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/client/gl_in_process_context.h"
 #include "ui/gl/android/surface_texture.h"
@@ skipping 161 matching lines @@
 
   if (failed) {
     offscreen_context_for_main_thread_ = NULL;
   }
   return offscreen_context_for_main_thread_;
 }
 
 scoped_refptr<cc::ContextProvider> SynchronousCompositorFactoryImpl::
     CreateOnscreenContextProviderForCompositorThread(
         scoped_refptr<gfx::GLSurface> surface) {
-  DCHECK(surface);
   DCHECK(service_);
 
-  if (!share_context_.get())
-    share_context_ = CreateContext(NULL, service_, NULL);
+
+  // TODO(boliu): This sucks. Find a better way.
+  gpu::GLInProcessContext* share_context = NULL;
+  {
+    base::AutoLock lock(num_hardware_compositor_lock_);
+    share_context = share_context_.get();
+  }
+  if (!share_context) {
+    scoped_ptr<gpu::GLInProcessContext> context = CreateContext(NULL, service_, NULL);
+    {
+      base::AutoLock lock(num_hardware_compositor_lock_);
+      if (!share_context_.get())
+        share_context_ = context.Pass();
+      share_context = share_context_.get();
+    }
+  }
+
   return webkit::gpu::ContextProviderInProcess::Create(
-      WrapContext(CreateContext(surface, service_, share_context_.get())),
+      WrapContext(CreateContext(surface, service_, share_context)),
       "Compositor-Onscreen");
 }
 
 scoped_refptr<StreamTextureFactory>
 SynchronousCompositorFactoryImpl::CreateStreamTextureFactory(int view_id) {
   scoped_refptr<StreamTextureFactorySynchronousImpl> factory(
       StreamTextureFactorySynchronousImpl::Create(
           base::Bind(
               &SynchronousCompositorFactoryImpl::TryCreateStreamTextureFactory,
               base::Unretained(this)),
@@ skipping 41 matching lines @@
   return video_context_provider_;
 }
 
 void SynchronousCompositorFactoryImpl::SetDeferredGpuService(
     scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
   DCHECK(!service_);
   service_ = service;
 }
 
 }  // namespace content