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..c3d03760b214fdd674de4f18f46284de3a5b8020 100644
--- a/ui/compositor/compositor.h
+++ b/ui/compositor/compositor.h
@@ -10,6 +10,7 @@
 #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/gfx/native_widget_types.h"
 #include "ui/gfx/size.h"
@@ -67,6 +68,15 @@ class COMPOSITOR_EXPORT ContextFactory {
   // with all compositors.
   virtual WebKit::WebGraphicsContext3D* CreateOffscreenContext() = 0;
 
+  virtual WebKit::WebGraphicsContext3D*
+      CreateOrGetOffscreenSkiaContextForMainThread() = 0;
+  virtual WebKit::WebGraphicsContext3D*
+      CreateOrGetOffscreenSkiaContextForCompositorThread() = 0;
+  virtual GrContext*
+      CreateOrGetOffscreenSkiaGrContextForMainThread() = 0;
+  virtual GrContext*
+      CreateOrGetOffscreenSkiaGrContextForCompositorThread() = 0;
+
   // Destroys per-compositor data.
   virtual void RemoveCompositor(Compositor* compositor) = 0;
 };
@@ -81,6 +91,14 @@ class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
   virtual cc::OutputSurface* CreateOutputSurface(
       Compositor* compositor) OVERRIDE;
   virtual WebKit::WebGraphicsContext3D* CreateOffscreenContext() OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D*
+      CreateOrGetOffscreenSkiaContextForMainThread() OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D*
+      CreateOrGetOffscreenSkiaContextForCompositorThread() OVERRIDE;
+  virtual GrContext*
+      CreateOrGetOffscreenSkiaGrContextForMainThread() OVERRIDE;
+  virtual GrContext*
+      CreateOrGetOffscreenSkiaGrContextForCompositorThread() OVERRIDE;
   virtual void RemoveCompositor(Compositor* compositor) OVERRIDE;
 
   bool Initialize();
@@ -94,7 +112,16 @@ class COMPOSITOR_EXPORT DefaultContextFactory : public ContextFactory {
       Compositor* compositor,
       bool offscreen);
 
+  void CreateOrGetOffscreenContextCommon(
+      scoped_ptr<WebKit::WebGraphicsContext3D>* context3d,
+      skia::RefPtr<GrContext>* gr_context);
+
   scoped_refptr<gfx::GLShareGroup> share_group_;
+  scoped_ptr<WebKit::WebGraphicsContext3D> offscreen_skia_context_main_thread_;
+  scoped_ptr<WebKit::WebGraphicsContext3D>
+      offscreen_skia_context_compositor_thread_;
+  skia::RefPtr<GrContext> offscreen_skia_gr_context_main_thread_;
+  skia::RefPtr<GrContext> offscreen_skia_gr_context_compositor_thread_;
 
   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*
+      createOrGetOffscreenContext3dForMainThread() OVERRIDE;
+  virtual WebKit::WebGraphicsContext3D*
+      createOrGetOffscreenContext3dForCompositorThread() OVERRIDE;
+  virtual GrContext* createOrGetOffscreenGrContextForMainThread() OVERRIDE;
+  virtual GrContext* createOrGetOffscreenGrContextForCompositorThread()
+      OVERRIDE;
   virtual scoped_ptr<cc::InputHandler> createInputHandler() OVERRIDE;
   virtual void willCommit() OVERRIDE;
   virtual void didCommit() OVERRIDE;