| Index: content/browser/renderer_host/image_transport_factory_android.cc
|
| diff --git a/content/browser/renderer_host/image_transport_factory_android.cc b/content/browser/renderer_host/image_transport_factory_android.cc
|
| index 5cfdbcf2e9832b77265c5aeffed0951c511b96dc..786a0189f49287a837ab4be6f9d4e411a5ca5dfd 100644
|
| --- a/content/browser/renderer_host/image_transport_factory_android.cc
|
| +++ b/content/browser/renderer_host/image_transport_factory_android.cc
|
| @@ -47,7 +47,7 @@ class DirectGLImageTransportFactory : public ImageTransportFactoryAndroid {
|
| virtual GLHelper* GetGLHelper() OVERRIDE { return NULL; }
|
|
|
| private:
|
| - scoped_ptr<WebGraphicsContext3DInProcessCommandBufferImpl> context_;
|
| + scoped_ptr<WebKit::WebGraphicsContext3D> context_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(DirectGLImageTransportFactory);
|
| };
|
| @@ -56,8 +56,8 @@ DirectGLImageTransportFactory::DirectGLImageTransportFactory() {
|
| WebKit::WebGraphicsContext3D::Attributes attrs;
|
| attrs.shareResources = true;
|
| attrs.noAutomaticFlushes = true;
|
| - context_.reset(webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl::
|
| - CreateViewContext(attrs, NULL));
|
| + context_ = webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl::
|
| + CreateViewContext(attrs, NULL);
|
| if (context_->makeContextCurrent())
|
| context_->pushGroupMarkerEXT(
|
| base::StringPrintf("DirectGLImageTransportFactory-%p", this).c_str());
|
|
|