Fix crash caused by concurrent access to framebuffer_combo_complete_map_.

android_webview/browser/deferred_gpu_command_service.h

Index: android_webview/browser/deferred_gpu_command_service.h
diff --git a/android_webview/browser/deferred_gpu_command_service.h b/android_webview/browser/deferred_gpu_command_service.h
index c7f230dd0249f355562e6480ea4bd196c41b5018..395fd681a537404b417230c649f068b5cf8a3e79 100644
--- a/android_webview/browser/deferred_gpu_command_service.h
+++ b/android_webview/browser/deferred_gpu_command_service.h
@@ -46,6 +46,8 @@ class DeferredGpuCommandService
   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();
@@ -76,6 +78,8 @@ class DeferredGpuCommandService
 
   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);
 };