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

content/renderer/gpu/render_widget_compositor.cc

 // Copyright (c) 2013 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 "content/renderer/gpu/render_widget_compositor.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "cc/font_atlas.h"
 #include "cc/layer.h"
 #include "cc/layer_tree_debug_state.h"
 #include "cc/layer_tree_host.h"
 #include "cc/switches.h"
 #include "cc/thread_impl.h"
 #include "content/renderer/gpu/compositor_thread.h"
 #include "content/renderer/render_thread_impl.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebLayerTreeViewClient.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebSharedGraphicsContext3D.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebSize.h"
 #include "webkit/compositor_bindings/web_layer_impl.h"
 #include "webkit/compositor_bindings/web_to_ccinput_handler_adapter.h"
 
 namespace cc {
 class Layer;
 }
 
 using WebKit::WebFloatPoint;
 using WebKit::WebSize;
@@ skipping 306 matching lines @@
 
 scoped_ptr<cc::OutputSurface> RenderWidgetCompositor::createOutputSurface() {
   return widget_->CreateOutputSurface();
 }
 
 // TODO(jamesr): This should go through WebWidget
 void RenderWidgetCompositor::didRecreateOutputSurface(bool success) {
   client_->didRecreateOutputSurface(success);
 }
 
+// TODO(danakj): This should go through WebWidget
+WebKit::WebGraphicsContext3D*
+RenderWidgetCompositor::OffscreenContext3dForMainThread() {
+  return WebKit::WebSharedGraphicsContext3D::mainThreadContext();
+}
+
+// TODO(danakj): This should go through WebWidget
+WebKit::WebGraphicsContext3D*
+RenderWidgetCompositor::OffscreenContext3dForCompositorThread() {
+  if (!WebKit::WebSharedGraphicsContext3D::haveCompositorThreadContext() &&
+      !WebKit::WebSharedGraphicsContext3D::createCompositorThreadContext())
+    return NULL;
+  return WebKit::WebSharedGraphicsContext3D::compositorThreadContext();

[piman, 2013/02/13 19:13:31]

WebSharedGraphicsContext3D::compositorThreadContext is meant to be called from
the impl thread - I don't think it asserts but I think things will go wrong (see
comments in image_transport_factory)

[danakj, 2013/02/13 20:57:23]

I think this one is okay, it just does this:
    PassRefPtr<GraphicsContext3D> getContext()
    {
        return m_context;
    }

+}
+
+// TODO(danakj): This should go through WebWidget
+GrContext* RenderWidgetCompositor::OffscreenGrContextForMainThread() {
+  return WebKit::WebSharedGraphicsContext3D::mainThreadGrContext();
+}
+
+// TODO(danakj): This should go through WebWidget
+GrContext* RenderWidgetCompositor::OffscreenGrContextForCompositorThread() {
+  return WebKit::WebSharedGraphicsContext3D::compositorThreadGrContext();

[piman, 2013/02/13 19:13:31]

Same here, I think this will break if called on the main thread.

[danakj, 2013/02/13 20:57:23]

Right.. ok I'll have to make the gr context creation on impl.

+}
+
+// TODO(danakj): This should go through WebWidget
+void RenderWidgetCompositor::DestroyOffscreenContext3dForCompositorThread() {
+  WebKit::WebSharedGraphicsContext3D::createCompositorThreadContext();
+}
+
 // TODO(jamesr): This should go through WebWidget
 scoped_ptr<cc::InputHandler> RenderWidgetCompositor::createInputHandler() {
   scoped_ptr<cc::InputHandler> ret;
   scoped_ptr<WebKit::WebInputHandler> web_handler(
       client_->createInputHandler());
   if (web_handler)
      ret = WebKit::WebToCCInputHandlerAdapter::create(web_handler.Pass());
   return ret.Pass();
 }
 
@@ skipping 29 matching lines @@
 
   client_->createFontAtlas(bitmap, ascii_to_web_rect_table, font_height);
 
   for (int i = 0; i < 128; ++i)
     ascii_to_rect_table[i] = ascii_to_web_rect_table[i];
 
   return cc::FontAtlas::create(bitmap, ascii_to_rect_table, font_height).Pass();
 }
 
 }  // namespace content