Merge 158192 - cc: Remove TextureUploaderOption.

cc/CCResourceProvider.cpp

Index: cc/CCResourceProvider.cpp
===================================================================
--- cc/CCResourceProvider.cpp	(revision 160263)
+++ cc/CCResourceProvider.cpp	(working copy)
@@ -49,10 +49,10 @@
     return (format == GraphicsContext3D::RGBA || format == Extensions3D::BGRA_EXT);
 }
 
-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();
 }
@@ -389,7 +389,7 @@
 {
 }
 
-bool CCResourceProvider::initialize(TextureUploaderOption textureUploaderOption)
+bool CCResourceProvider::initialize()
 {
     ASSERT(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
@@ -424,10 +424,7 @@
     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;
 }