Revert 160267 - Merge 158192 - cc: Remove TextureUploaderOption.

cc/CCResourceProvider.cpp

 // Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "CCResourceProvider.h"
 #ifdef LOG
 #undef LOG
 #endif
@@ skipping 31 matching lines @@
     }
 
     return storageFormat;
 }
 
 static bool isTextureFormatSupportedForStorage(GC3Denum format)
 {
     return (format == GraphicsContext3D::RGBA || format == Extensions3D::BGRA_EXT);
 }
 
-PassOwnPtr<CCResourceProvider> CCResourceProvider::create(CCGraphicsContext* context)
+PassOwnPtr<CCResourceProvider> CCResourceProvider::create(CCGraphicsContext* context, TextureUploaderOption option)
 {
     OwnPtr<CCResourceProvider> resourceProvider(adoptPtr(new CCResourceProvider(context)));
-    if (!resourceProvider->initialize())
+    if (!resourceProvider->initialize(option))
         return nullptr;
     return resourceProvider.release();
 }
 
 CCResourceProvider::~CCResourceProvider()
 {
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d || !context3d->makeContextCurrent())
         return;
     m_textureUploader.clear();
@@ skipping 316 matching lines @@
     , m_nextId(1)
     , m_nextChild(1)
     , m_defaultResourceType(GLTexture)
     , m_useTextureStorageExt(false)
     , m_useTextureUsageHint(false)
     , m_useShallowFlush(false)
     , m_maxTextureSize(0)
 {
 }
 
-bool CCResourceProvider::initialize()
+bool CCResourceProvider::initialize(TextureUploaderOption textureUploaderOption)
 {
     ASSERT(CCProxy::isImplThread());
     WebGraphicsContext3D* context3d = m_context->context3D();
     if (!context3d) {
         m_maxTextureSize = INT_MAX;
         m_textureUploader = UnthrottledTextureUploader::create();
 
         // FIXME: Implement this path for software compositing.
         return false;
     }
@@ skipping 14 matching lines @@
             useMapSub = true;
         else if (extensions[i] == "GL_CHROMIUM_shallow_flush")
             m_useShallowFlush = true;
         else if (extensions[i] == "GL_CHROMIUM_bind_uniform_location")
             useBindUniform = true;
     }
 
     m_texSubImage = adoptPtr(new LayerTextureSubImage(useMapSub));
     m_textureCopier = AcceleratedTextureCopier::create(context3d, useBindUniform);
 
-    m_textureUploader = ThrottledTextureUploader::create(context3d);
+    if (textureUploaderOption == ThrottledUploader)
+        m_textureUploader = ThrottledTextureUploader::create(context3d);
+    else
+        m_textureUploader = UnthrottledTextureUploader::create();
     GLC(context3d, context3d->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_maxTextureSize));
     return true;
 }
 
 int CCResourceProvider::createChild(int pool)
 {
     ASSERT(CCProxy::isImplThread());
     Child childInfo;
     childInfo.pool = pool;
     int child = m_nextChild++;
@@ skipping 202 matching lines @@
             if (childPoolSet.contains(it->second.pool))
 #endif
                 ++maxMailboxCount;
         }
     }
     while (m_mailboxes.size() > maxMailboxCount)
         m_mailboxes.removeFirst();
 }
 
 }