Support multiple service instances with GLInProcessContext

android_webview/browser/in_process_view_renderer.h

Index: android_webview/browser/in_process_view_renderer.h
diff --git a/android_webview/browser/in_process_view_renderer.h b/android_webview/browser/in_process_view_renderer.h
index f7c4279006aa243488f08f8fdc170019fa1a5161..ee9638cad867be2582b8567315e909d1096beac7 100644
--- a/android_webview/browser/in_process_view_renderer.h
+++ b/android_webview/browser/in_process_view_renderer.h
@@ -5,6 +5,7 @@
 #ifndef ANDROID_WEBVIEW_BROWSER_IN_PROCESS_VIEW_RENDERER_H_
 #define ANDROID_WEBVIEW_BROWSER_IN_PROCESS_VIEW_RENDERER_H_
 
+#include <queue>
 #include <string>
 
 #include "android_webview/browser/browser_view_renderer.h"
@@ -12,6 +13,7 @@
 #include "base/cancelable_callback.h"
 #include "content/public/browser/android/synchronous_compositor.h"
 #include "content/public/browser/android/synchronous_compositor_client.h"
+#include "gpu/command_buffer/service/in_process_command_buffer.h"
 #include "ui/gfx/vector2d_f.h"
 
 namespace content {
@@ -26,6 +28,25 @@ namespace android_webview {
 
 class AwGLSurface;
 
+class DeferredGpuCommandService : public gpu::InProcessCommandBuffer::Service {
+ public:
+  DeferredGpuCommandService();
+
+  virtual void ScheduleTask(const base::Closure& task) OVERRIDE;
+  virtual void ScheduleIdleWork(const base::Closure& task) OVERRIDE;
+  virtual bool UseVirtualizedGLContexts() OVERRIDE { return true; }
+
+  void RunTasks();
+
+ protected:
+  virtual ~DeferredGpuCommandService();
+
+ private:
+  base::Lock tasks_lock_;
+  std::queue<base::Closure> tasks_;
+  DISALLOW_COPY_AND_ASSIGN(DeferredGpuCommandService);
+};
+
 // Provides RenderViewHost wrapper functionality for sending WebView-specific
 // IPC messages to the renderer and from there to WebKit.
 class InProcessViewRenderer : public BrowserViewRenderer,
@@ -186,6 +207,8 @@ class InProcessViewRenderer : public BrowserViewRenderer,
 
   content::SynchronousCompositorMemoryPolicy memory_policy_;
 
+  scoped_refptr<DeferredGpuCommandService> gl_queue_;
+
   DISALLOW_COPY_AND_ASSIGN(InProcessViewRenderer);
 };