Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(7620)

Unified Diff: content/browser/renderer_host/image_transport_factory_android.cc

Issue 17447007: Change WGC3DInProcessCBImpl factories to return a base class pointer. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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());
« no previous file with comments | « content/browser/renderer_host/image_transport_factory.cc ('k') | content/common/gpu/client/gl_helper_benchmark.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698