1 files changed, 5 insertions, 10 deletions

diff --git a/chromium/cc/resources/resource_pool.h b/chromium/cc/resources/resource_pool.h
index e1ee35aa72c..f79455905dd 100644
--- a/chromium/cc/resources/resource_pool.h
+++ b/chromium/cc/resources/resource_pool.h
@@ -19,14 +19,14 @@ class ScopedResource;
 class CC_EXPORT ResourcePool {
  public:
   static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider,
-                                         GLenum target,
-                                         ResourceFormat format) {
-    return make_scoped_ptr(new ResourcePool(resource_provider, target, format));
+                                         GLenum target) {
+    return make_scoped_ptr(new ResourcePool(resource_provider, target));
   }
 
   virtual ~ResourcePool();
 
-  scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size);
+  scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size,
+                                             ResourceFormat format);
   void ReleaseResource(scoped_ptr<ScopedResource>);
 
   void SetResourceUsageLimits(size_t max_memory_usage_bytes,
@@ -49,12 +49,8 @@ class CC_EXPORT ResourcePool {
   }
   size_t busy_resource_count() const { return busy_resources_.size(); }
 
-  ResourceFormat resource_format() const { return format_; }
-
  protected:
-  ResourcePool(ResourceProvider* resource_provider,
-               GLenum target,
-               ResourceFormat format);
+  ResourcePool(ResourceProvider* resource_provider, GLenum target);
 
   bool ResourceUsageTooHigh();
 
@@ -63,7 +59,6 @@ class CC_EXPORT ResourcePool {
 
   ResourceProvider* resource_provider_;
   const GLenum target_;
-  const ResourceFormat format_;
   size_t max_memory_usage_bytes_;
   size_t max_unused_memory_usage_bytes_;
   size_t max_resource_count_;