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 5cc806d5381388d12e085fa0812948c3f62f7f9d..0ef507f89070a7fba170ba8277d320a09b50c8f1 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -40,6 +40,7 @@ namespace ui {
 
 class Compositor;
 class CompositorObserver;
+class ContextProvider;
 class Layer;
 class PostedSwapQueue;
 
@@ -67,6 +68,11 @@ class COMPOSITOR_EXPORT ContextFactory {
   // with all compositors.
   virtual WebKit::WebGraphicsContext3D* CreateOffscreenContext() = 0;
 
+  virtual scoped_refptr<ui::ContextProvider>
+      OffscreenContextProviderForMainThread() = 0;
+  virtual scoped_refptr<ui::ContextProvider>
+      OffscreenContextProviderForCompositorThread() = 0;
+
   // Destroys per-compositor data.
   virtual void RemoveCompositor(Compositor* compositor) = 0;
 };
@@ -81,6 +87,10 @@ class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
   virtual cc::OutputSurface* CreateOutputSurface(
       Compositor* compositor) OVERRIDE;
   virtual WebKit::WebGraphicsContext3D* CreateOffscreenContext() OVERRIDE;
+  virtual scoped_refptr<ui::ContextProvider>
+      OffscreenContextProviderForMainThread() OVERRIDE;
+  virtual scoped_refptr<ui::ContextProvider>
+      OffscreenContextProviderForCompositorThread() OVERRIDE;
   virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
 
   bool Initialize();
@@ -95,6 +105,9 @@ class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
       bool offscreen);
 
   scoped_refptr<gfx::GLShareGroup> share_group_;
+  class DefaultContextProvider;
+  scoped_refptr<DefaultContextProvider> offscreen_contexts_main_thread_;
+  scoped_refptr<DefaultContextProvider> offscreen_contexts_compositor_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultContextFactory);
 };
@@ -271,7 +284,10 @@ class COMPOSITOR_EXPORT Compositor
   virtual void didCommitAndDrawFrame() OVERRIDE;
   virtual void didCompleteSwapBuffers() OVERRIDE;
   virtual void scheduleComposite() OVERRIDE;
-
+  virtual scoped_refptr<ui::ContextProvider>
+      OffscreenContextProviderForMainThread() OVERRIDE;
+  virtual scoped_refptr<ui::ContextProvider>
+      OffscreenContextProviderForCompositorThread() OVERRIDE;
 
   int last_started_frame() { return last_started_frame_; }
   int last_ended_frame() { return last_ended_frame_; }