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; |
} |