Fix crash caused by concurrent access to framebuffer_combo_complete_map_.

android_webview/browser/deferred_gpu_command_service.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 "android_webview/browser/deferred_gpu_command_service.h"
 
 #include "android_webview/browser/gl_view_renderer_manager.h"
 #include "android_webview/browser/shared_renderer_state.h"
 #include "base/lazy_instance.h"
 #include "base/synchronization/lock.h"
 #include "base/trace_event/trace_event.h"
 #include "content/public/browser/android/synchronous_compositor.h"
+#include "gpu/command_buffer/service/framebuffer_completeness_cache.h"
 #include "gpu/command_buffer/service/shader_translator_cache.h"
 #include "gpu/command_buffer/service/sync_point_manager.h"
 
 namespace android_webview {
 
 namespace {
 base::LazyInstance<scoped_refptr<DeferredGpuCommandService> >
     g_service = LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
@@ skipping 123 matching lines @@
 
 bool DeferredGpuCommandService::UseVirtualizedGLContexts() { return true; }
 
 scoped_refptr<gpu::gles2::ShaderTranslatorCache>
 DeferredGpuCommandService::shader_translator_cache() {
   if (!shader_translator_cache_.get())
     shader_translator_cache_ = new gpu::gles2::ShaderTranslatorCache;
   return shader_translator_cache_;
 }
 
+scoped_refptr<gpu::gles2::FramebufferCompletenessCache>
+DeferredGpuCommandService::framebuffer_completeness_cache() {
+  if (!framebuffer_completeness_cache_.get())

[boliu, 2015/08/19 17:36:19]

style: need braces for if with multi-line body 

[Tobias Sargeant, 2015/08/20 11:05:13]

Will fix. It was a single line until git cl format. :-/

+    framebuffer_completeness_cache_ =
+        new gpu::gles2::FramebufferCompletenessCache;
+  return framebuffer_completeness_cache_;
+}
+
 gpu::SyncPointManager* DeferredGpuCommandService::sync_point_manager() {
   return sync_point_manager_.get();
 }
 
 void DeferredGpuCommandService::RunTasks() {
   TRACE_EVENT0("android_webview", "DeferredGpuCommandService::RunTasks");
   bool has_more_tasks;
   {
     base::AutoLock lock(tasks_lock_);
     has_more_tasks = tasks_.size() > 0;
@@ skipping 16 matching lines @@
 
 void DeferredGpuCommandService::AddRef() const {
   base::RefCountedThreadSafe<DeferredGpuCommandService>::AddRef();
 }
 
 void DeferredGpuCommandService::Release() const {
   base::RefCountedThreadSafe<DeferredGpuCommandService>::Release();
 }
 
 }  // namespace android_webview