Remove offscreen compositor contexts.

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 134 matching lines @@
     failed = !offscreen_context_for_main_thread_.get() ||
              !offscreen_context_for_main_thread_->BindToCurrentThread();
   }
 
   if (failed) {
     offscreen_context_for_main_thread_ = NULL;
   }
   return offscreen_context_for_main_thread_;
 }
 
-// This is called on both renderer main thread (offscreen context creation
-// path shared between cross-process and in-process platforms) and renderer
-// compositor impl thread (InitializeHwDraw) in order to support Android
-// WebView synchronously enable and disable hardware mode multiple times in
-// the same task. This is ok because in-process WGC3D creation may happen on
-// any thread and is lightweight.
+// This is called on the renderer compositor impl thread (InitializeHwDraw) in
+// order to support Android WebView synchronously enable and disable hardware
+// mode multiple times in the same task.
 scoped_refptr<cc::ContextProvider> SynchronousCompositorFactoryImpl::
     GetOffscreenContextProviderForCompositorThread() {
-  base::AutoLock lock(offscreen_context_for_compositor_thread_lock_);
   DCHECK(service_);
   bool failed = false;
   if (!offscreen_context_for_compositor_thread_.get() ||
       offscreen_context_for_compositor_thread_->DestroyedOnMainThread()) {
     scoped_ptr<gpu::GLInProcessContext> context =
         CreateContext(new gfx::GLSurfaceStub, service_, NULL);
     wrapped_gl_context_for_compositor_thread_ = context.get();
     offscreen_context_for_compositor_thread_ =
         webkit::gpu::ContextProviderInProcess::Create(
             WrapContext(context.Pass()),
@@ skipping 75 matching lines @@
   return video_context_provider_;
 }
 
 void SynchronousCompositorFactoryImpl::SetDeferredGpuService(
     scoped_refptr<gpu::InProcessCommandBuffer::Service> service) {
   DCHECK(!service_);
   service_ = service;
 }
 
 }  // namespace content