cc: Fix the format of GpuMemoryBuffer for SurfaceTexture

cc/resources/resource_pool.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 CC_RESOURCES_RESOURCE_POOL_H_
 #define CC_RESOURCES_RESOURCE_POOL_H_
 
 #include <deque>
 
 #include "base/memory/scoped_ptr.h"
 #include "cc/base/cc_export.h"
 #include "cc/output/renderer.h"
 #include "cc/resources/resource.h"
 #include "cc/resources/resource_format.h"
 
 namespace cc {
 class ScopedResource;
 
 class CC_EXPORT ResourcePool {
  public:
   static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider,
-                                         GLenum target) {
-    return make_scoped_ptr(new ResourcePool(resource_provider, target));
+                                         std::vector<uint> targets) {

[reveman, 2015/07/27 17:07:15]

nit: here and everywhere else in this patch "std::vector<unsigned>". that or
uint32 is preferred. we use unsigned for texture target in general as that what
GL.h defines GLenum to as I think that's best.

+    return make_scoped_ptr(new ResourcePool(resource_provider, targets));
   }
 
   virtual ~ResourcePool();
 
   scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size,
                                              ResourceFormat format);
   scoped_ptr<ScopedResource> TryAcquireResourceWithContentId(uint64 content_id);
   void ReleaseResource(scoped_ptr<ScopedResource> resource,
                        uint64_t content_id);
 
@@ skipping 11 matching lines @@
   size_t acquired_memory_usage_bytes() const {
     return memory_usage_bytes_ - unused_memory_usage_bytes_;
   }
   size_t total_resource_count() const { return resource_count_; }
   size_t acquired_resource_count() const {
     return resource_count_ - unused_resources_.size();
   }
   size_t busy_resource_count() const { return busy_resources_.size(); }
 
  protected:
-  ResourcePool(ResourceProvider* resource_provider, GLenum target);
+  ResourcePool(ResourceProvider* resource_provider, std::vector<uint> targets);

[reveman, 2015/07/27 17:07:15]

Instead of having to pass the target vector to the ResourcePool, can we keep
this in the ResourceProvider and just have a helper function there to get the
correct target for a specific resource format?

 
   bool ResourceUsageTooHigh();
 
  private:
   void DidFinishUsingResource(ScopedResource* resource, uint64_t content_id);
 
   ResourceProvider* resource_provider_;
-  const GLenum target_;
+  const std::vector<uint> targets_;
   size_t max_memory_usage_bytes_;
   size_t max_unused_memory_usage_bytes_;
   size_t max_resource_count_;
   size_t memory_usage_bytes_;
   size_t unused_memory_usage_bytes_;
   size_t resource_count_;
 
   struct PoolResource {
     PoolResource(ScopedResource* resource, uint64_t content_id)
         : resource(resource), content_id(content_id) {}
     ScopedResource* resource;
     uint64_t content_id;
   };
   typedef std::deque<PoolResource> ResourceList;
   ResourceList unused_resources_;
   ResourceList busy_resources_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_POOL_H_