| Index: content/renderer/gpu/render_widget_compositor.cc
|
| diff --git a/content/renderer/gpu/render_widget_compositor.cc b/content/renderer/gpu/render_widget_compositor.cc
|
| index 599766b7d0ab21627e93f59df9225a9b8e16c9f0..3913247b420c287226603c197481aafb04343047 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.cc
|
| +++ b/content/renderer/gpu/render_widget_compositor.cc
|
| @@ -17,6 +17,7 @@
|
| #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"
|
| @@ -287,6 +288,31 @@ 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();
|
| +}
|
| +
|
| +// 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();
|
| +}
|
| +
|
| // TODO(jamesr): This should go through WebWidget
|
| scoped_ptr<cc::InputHandler> RenderWidgetCompositor::createInputHandler() {
|
| scoped_ptr<cc::InputHandler> ret;
|
|
|