Revert 160267 - Merge 158192 - cc: Remove TextureUploaderOption.

cc/CCResourceProvider.h

 // 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.
 
 
 #ifndef CCResourceProvider_h
 #define CCResourceProvider_h
 
 #include "CCGraphicsContext.h"
 #include "GraphicsContext3D.h"
 #include "IntSize.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
 #include "TextureCopier.h"
 #include <wtf/Deque.h>
 #include <wtf/HashMap.h>
 #include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/PassRefPtr.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
 
 namespace WebKit {
 class WebGraphicsContext3D;
 }
 
 namespace cc {
 
+enum TextureUploaderOption { ThrottledUploader, UnthrottledUploader };
+
 class IntRect;
 class LayerTextureSubImage;
 class TextureCopier;
 class TextureUploader;
 
 // Thread-safety notes: this class is not thread-safe and can only be called
 // from the thread it was created on (in practice, the compositor thread).
 class CCResourceProvider {
     WTF_MAKE_NONCOPYABLE(CCResourceProvider);
 public:
@@ skipping 13 matching lines @@
         GC3Denum format;
         IntSize size;
         Mailbox mailbox;
     };
     typedef Vector<TransferableResource> TransferableResourceArray;
     struct TransferableResourceList {
         TransferableResourceArray resources;
         unsigned syncPoint;
     };
 
-    static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*);
+    static PassOwnPtr<CCResourceProvider> create(CCGraphicsContext*, TextureUploaderOption);
 
     virtual ~CCResourceProvider();
 
     WebKit::WebGraphicsContext3D* graphicsContext3D();
     TextureUploader* textureUploader() const { return m_textureUploader.get(); }
     TextureCopier* textureCopier() const { return m_textureCopier.get(); }
     int maxTextureSize() const { return m_maxTextureSize; }
     unsigned numResources() const { return m_resources.size(); }
 
     // Checks whether a resource is in use by a consumer.
@@ skipping 182 matching lines @@
     };
     typedef HashMap<ResourceId, Resource> ResourceMap;
     struct Child {
         int pool;
         ResourceIdMap childToParentMap;
         ResourceIdMap parentToChildMap;
     };
     typedef HashMap<int, Child> ChildMap;
 
     explicit CCResourceProvider(CCGraphicsContext*);
-    bool initialize();
+    bool initialize(TextureUploaderOption);
 
     const Resource* lockForRead(ResourceId);
     void unlockForRead(ResourceId);
     const Resource* lockForWrite(ResourceId);
     void unlockForWrite(ResourceId);
     static void populateSkBitmapWithResource(SkBitmap*, const Resource*);
 
     bool transferResource(WebKit::WebGraphicsContext3D*, ResourceId, TransferableResource*);
     void trimMailboxDeque();
 
@@ skipping 11 matching lines @@
     bool m_useShallowFlush;
     OwnPtr<LayerTextureSubImage> m_texSubImage;
     OwnPtr<TextureUploader> m_textureUploader;
     OwnPtr<AcceleratedTextureCopier> m_textureCopier;
     int m_maxTextureSize;
 };
 
 }
 
 #endif