Fix crash caused by concurrent access to framebuffer_combo_complete_map_.

android_webview/browser/deferred_gpu_command_service.h

 // 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.
 
 #ifndef ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_
 #define ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_
 
 #include <queue>
 #include <utility>
 
@@ skipping 28 matching lines @@
       public base::RefCountedThreadSafe<DeferredGpuCommandService> {
  public:
   static void SetInstance();
   static DeferredGpuCommandService* GetInstance();
 
   void ScheduleTask(const base::Closure& task) override;
   void ScheduleIdleWork(const base::Closure& task) override;
   bool UseVirtualizedGLContexts() override;
   scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache()
       override;
+  scoped_refptr<gpu::gles2::FramebufferCompletenessCache>
+  framebuffer_completeness_cache() override;

[Ken Russell (switch to Gerrit), 2015/08/20 00:04:10]

The second line should be intended here. There are several other places in the
code which need a similar update.

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

This is clang-format'ed, and it's also consistent with how method definitions
with long return types get formatted.

   gpu::SyncPointManager* sync_point_manager() override;
 
   void RunTasks();
   // If |is_idle| is false, this will only run older idle tasks.
   void PerformIdleWork(bool is_idle);
   // Flush the idle queue until it is empty. This is different from
   // PerformIdleWork(is_idle = true), which does not run any newly scheduled
   // idle tasks during the idle run.
   void PerformAllIdleWork();
 
@@ skipping 10 matching lines @@
 
   DeferredGpuCommandService();
   size_t IdleQueueSize();
 
   base::Lock tasks_lock_;
   std::queue<base::Closure> tasks_;
   std::queue<std::pair<base::Time, base::Closure> > idle_tasks_;
 
   scoped_ptr<gpu::SyncPointManager> sync_point_manager_;
   scoped_refptr<gpu::gles2::ShaderTranslatorCache> shader_translator_cache_;
+  scoped_refptr<gpu::gles2::FramebufferCompletenessCache>
+      framebuffer_completeness_cache_;
   DISALLOW_COPY_AND_ASSIGN(DeferredGpuCommandService);
 };
 
 }  // namespace android_webview
 
 #endif  // ANDROID_WEBVIEW_BROWSER_DEFERRED_GPU_COMMAND_SERVICE_H_