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) {
+    return make_scoped_ptr(new ResourcePool(resource_provider));
+  }
+
   static scoped_ptr<ResourcePool> Create(ResourceProvider* resource_provider,
                                          GLenum target) {
     return make_scoped_ptr(new ResourcePool(resource_provider, target));
   }
 
   virtual ~ResourcePool();
 
   scoped_ptr<ScopedResource> AcquireResource(const gfx::Size& size,
                                              ResourceFormat format);
   scoped_ptr<ScopedResource> TryAcquireResourceWithContentId(uint64 content_id);
@@ skipping 14 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);

[reveman, 2015/07/28 08:58:25]

nit: explicit ResourcePool(ResourceProv...

   ResourcePool(ResourceProvider* resource_provider, GLenum target);

[reveman, 2015/07/28 08:58:25]

Can we remove this ctor with "target" and and always use the image texture
target?

[jchen10, 2015/07/29 04:33:47]

I'm afraid we can't. The image texture is only used by the zero-copy and
one-copy tile task worker pools. Other pools(including the one-copy) need to use
GL_TEXTURE_2D target. The functions that can be used for GL_TEXTURE_2D are not
guaranteed by other texture targets, e.g. "gl*Tex*Image*()" with
GL_TEXTURE_EXTERNAL_OES(See
https://www.khronos.org/registry/gles/extensions/OES/OES_EGL_image_external.txt).
Actually I have ever tried it, but met some wired gfx error.

[reveman, 2015/07/30 02:41:43]

Ok. No need to do anything in this patch but I think we should change this so
the user of this API will always have to ask for a specific target when
acquiring a resource.

 
   bool ResourceUsageTooHigh();
 
  private:
   void DidFinishUsingResource(ScopedResource* resource, uint64_t content_id);
 
   ResourceProvider* resource_provider_;
   const GLenum target_;
   size_t max_memory_usage_bytes_;
   size_t max_unused_memory_usage_bytes_;
@@ skipping 11 matching lines @@
   typedef std::deque<PoolResource> ResourceList;
   ResourceList unused_resources_;
   ResourceList busy_resources_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourcePool);
 };
 
 }  // namespace cc
 
 #endif  // CC_RESOURCES_RESOURCE_POOL_H_