cc: Route offscreen context creation for compositor to the browser.

ui/compositor/compositor.h

Index: ui/compositor/compositor.h
diff --git a/ui/compositor/compositor.h b/ui/compositor/compositor.h
index aa773b25e7c330e3ad10c1908666fe60ed8e61e5..8899f12f7b6c801cd711695954876d57296ec3c9 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -10,7 +10,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "cc/layer_tree_host_client.h"
+#include "skia/ext/refptr.h"
 #include "ui/compositor/compositor_export.h"
+#include "ui/compositor/offscreen_context.h"
 #include "ui/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
 #include "ui/gfx/transform.h"
@@ -67,12 +69,22 @@ class COMPOSITOR_EXPORT ContextFactory {
   // with all compositors.
   virtual WebKit::WebGraphicsContext3D* CreateOffscreenContext() = 0;
 
+  virtual WebKit::WebGraphicsContext3D*
+      OffscreenContextForMainThread() = 0;
+  virtual WebKit::WebGraphicsContext3D*
+      OffscreenContextForCompositorThread() = 0;
+  virtual GrContext*
+      OffscreenGrContextForMainThread() = 0;
+  virtual GrContext*
+      OffscreenGrContextForCompositorThread() = 0;
+
   // Destroys per-compositor data.
   virtual void RemoveCompositor(Compositor* compositor) = 0;
 };
 
 // The default factory that creates in-process contexts.
-class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
+class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory,
+                                                public OffscreenContextClient {
  public:
   DefaultContextFactory();
   virtual ~DefaultContextFactory();
@@ -81,6 +93,14 @@ class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
   virtual cc::OutputSurface* CreateOutputSurface(
       Compositor* compositor) OVERRIDE;
   virtual WebKit::WebGraphicsContext3D* CreateOffscreenContext() OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D*
+      OffscreenContextForMainThread() OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D*
+      OffscreenContextForCompositorThread() OVERRIDE;
+  virtual GrContext*
+      OffscreenGrContextForMainThread() OVERRIDE;
+  virtual GrContext*
+      OffscreenGrContextForCompositorThread() OVERRIDE;
   virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
 
   bool Initialize();
@@ -94,7 +114,14 @@ class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
       Compositor* compositor,
       bool offscreen);
 
+  // OffscreenContextClient implementation.
+  virtual void DidLoseContext(OffscreenContext* offscreen_context) OVERRIDE {}
+  virtual void DidCreateContext(OffscreenContext* offscreen_context,
+                                bool success) OVERRIDE {}
+
   scoped_refptr<gfx::GLShareGroup> share_group_;
+  OffscreenContext main_thread_offscreen_context_;
+  OffscreenContext compositor_thread_offscreen_context_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultContextFactory);
 };
@@ -261,6 +288,13 @@ class COMPOSITOR_EXPORT Compositor
   virtual scoped_ptr<cc::OutputSurface>
       createOutputSurface() OVERRIDE;
   virtual void didRecreateOutputSurface(bool success) OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D*
+      offscreenContext3dForMainThread() OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D*
+      offscreenContext3dForCompositorThread() OVERRIDE;
+  virtual GrContext* offscreenGrContextForMainThread() OVERRIDE;
+  virtual GrContext* offscreenGrContextForCompositorThread()
+      OVERRIDE;
   virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
   virtual void willCommit() OVERRIDE;
   virtual void didCommit() OVERRIDE;