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

Unified Diff: cc/CCResourceProvider.cpp

Issue 10961008: cc: Remove TextureUploaderOption. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Settle for removing TextureUploaderOption in this CL. I'll figure out what to do with the uploader … Created 8 years, 3 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
« no previous file with comments | « cc/CCResourceProvider.h ('k') | cc/CCResourceProviderTest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/CCResourceProvider.cpp
diff --git a/cc/CCResourceProvider.cpp b/cc/CCResourceProvider.cpp
index 54811f043c685ee4506888ff86f183aab29730ac..0cc511cc507fd940c1fb8b62c514111a637a3830 100644
--- a/cc/CCResourceProvider.cpp
+++ b/cc/CCResourceProvider.cpp
@@ -107,10 +107,10 @@ CCResourceProvider::Child::~Child()
{
}
-PassOwnPtr<CCResourceProvider> CCResourceProvider::create(CCGraphicsContext* context, TextureUploaderOption option)
+PassOwnPtr<CCResourceProvider> CCResourceProvider::create(CCGraphicsContext* context)
{
OwnPtr<CCResourceProvider> resourceProvider(adoptPtr(new CCResourceProvider(context)));
- if (!resourceProvider->initialize(option))
+ if (!resourceProvider->initialize())
return nullptr;
return resourceProvider.release();
}
@@ -447,7 +447,7 @@ CCResourceProvider::CCResourceProvider(CCGraphicsContext* context)
{
}
-bool CCResourceProvider::initialize(TextureUploaderOption textureUploaderOption)
+bool CCResourceProvider::initialize()
{
ASSERT(CCProxy::isImplThread());
WebGraphicsContext3D* context3d = m_context->context3D();
@@ -482,10 +482,7 @@ bool CCResourceProvider::initialize(TextureUploaderOption textureUploaderOption)
m_texSubImage = adoptPtr(new LayerTextureSubImage(useMapSub));
m_textureCopier = AcceleratedTextureCopier::create(context3d, useBindUniform);
- if (textureUploaderOption == ThrottledUploader)
- m_textureUploader = ThrottledTextureUploader::create(context3d);
- else
- m_textureUploader = UnthrottledTextureUploader::create();
+ m_textureUploader = ThrottledTextureUploader::create(context3d);
GLC(context3d, context3d->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_maxTextureSize));
return true;
}
« no previous file with comments | « cc/CCResourceProvider.h ('k') | cc/CCResourceProviderTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698