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

ui/compositor/compositor.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/compositor.h"
 
 #include <algorithm>
 #include <deque>
 
 #include "base/bind.h"
@@ skipping 123 matching lines @@
   g_context_factory = instance;
 }
 
 DefaultContextFactory::DefaultContextFactory() {
 }
 
 DefaultContextFactory::~DefaultContextFactory() {
 }
 
 bool DefaultContextFactory::Initialize() {
+  if (g_test_compositor_enabled)
+    return true;
+
   // The following line of code exists soley to disable IO restrictions
   // on this thread long enough to perform the GL bindings.
   // TODO(wjmaclean) Remove this when GL initialisation cleaned up.
   base::ThreadRestrictions::ScopedAllowIO allow_io;
   if (!gfx::GLSurface::InitializeOneOff() ||
       gfx::GetGLImplementation() == gfx::kGLImplementationNone) {
     LOG(ERROR) << "Could not load the GL bindings";
     return false;
   }
   return true;
 }
 
 cc::OutputSurface* DefaultContextFactory::CreateOutputSurface(
     Compositor* compositor) {
   return new WebGraphicsContextToOutputSurfaceAdapter(
       CreateContextCommon(compositor, false));
 }
 
 WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateOffscreenContext() {
   return CreateContextCommon(NULL, true);
 }
 
+WebKit::WebGraphicsContext3D* DefaultContextFactory::
+    OffscreenContextForMainThread() {
+  if (!test_offscreen_context_main_thread_) {
+    scoped_ptr<ui::TestWebGraphicsContext3D> test_context(
+        new ui::TestWebGraphicsContext3D());
+    test_context->Initialize();
+    test_offscreen_context_main_thread_ =
+        test_context.PassAs<WebKit::WebGraphicsContext3D>();
+  }
+  return test_offscreen_context_main_thread_.get();
+}
+
+WebKit::WebGraphicsContext3D* DefaultContextFactory::
+    OffscreenContextForCompositorThread() {
+  if (!test_offscreen_context_compositor_thread_) {
+    scoped_ptr<ui::TestWebGraphicsContext3D> test_context(
+        new ui::TestWebGraphicsContext3D());
+    test_context->Initialize();
+    test_offscreen_context_compositor_thread_ =
+        test_context.PassAs<WebKit::WebGraphicsContext3D>();
+  }
+  return test_offscreen_context_compositor_thread_.get();
+}
+
 void DefaultContextFactory::RemoveCompositor(Compositor* compositor) {
 }
 
 WebKit::WebGraphicsContext3D* DefaultContextFactory::CreateContextCommon(
     Compositor* compositor,
     bool offscreen) {
   DCHECK(offscreen || compositor);
   WebKit::WebGraphicsContext3D::Attributes attrs;
   attrs.depth = false;
   attrs.stencil = false;
@@ skipping 338 matching lines @@
         new WebGraphicsContextToOutputSurfaceAdapter(test_context));
   } else {
     return scoped_ptr<cc::OutputSurface>(
         ContextFactory::GetInstance()->CreateOutputSurface(this));
   }
 }
 
 void Compositor::didRecreateOutputSurface(bool success) {
 }
 
+WebKit::WebGraphicsContext3D*
+    Compositor::OffscreenContext3dForMainThread() {
+  return ContextFactory::GetInstance()->OffscreenContextForMainThread();
+}
+
+WebKit::WebGraphicsContext3D*
+    Compositor::OffscreenContext3dForCompositorThread() {
+  return ContextFactory::GetInstance()->OffscreenContextForCompositorThread();
+}
+
 scoped_ptr<cc::InputHandler> Compositor::createInputHandler() {
   return scoped_ptr<cc::InputHandler>();
 }
 
 void Compositor::willCommit() {
 }
 
 void Compositor::didCommit() {
   DCHECK(!IsLocked());
   FOR_EACH_OBSERVER(CompositorObserver,
@@ skipping 70 matching lines @@
 
 COMPOSITOR_EXPORT void DisableTestCompositor() {
   g_test_compositor_enabled = false;
 }
 
 COMPOSITOR_EXPORT bool IsTestCompositorEnabled() {
   return g_test_compositor_enabled;
 }
 
 }  // namespace ui