cc: Fix the format of GpuMemoryBuffer for SurfaceTexture

cc/resources/resource_pool.cc

 // 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 "cc/resources/resource_pool.h"
 
 #include "cc/resources/resource_provider.h"
 #include "cc/resources/scoped_resource.h"
+#include "ui/gfx/gpu_memory_buffer.h"
 
 namespace cc {
 
-ResourcePool::ResourcePool(ResourceProvider* resource_provider, GLenum target)
+ResourcePool::ResourcePool(ResourceProvider* resource_provider,
+                           std::vector<uint> targets)
     : resource_provider_(resource_provider),
-      target_(target),
+      targets_(targets),
       max_memory_usage_bytes_(0),
       max_unused_memory_usage_bytes_(0),
       max_resource_count_(0),
       memory_usage_bytes_(0),
       unused_memory_usage_bytes_(0),
       resource_count_(0) {}
 
 ResourcePool::~ResourcePool() {
   while (!busy_resources_.empty()) {
     auto const& front = busy_resources_.front();
@@ skipping 22 matching lines @@
       continue;
 
     unused_resources_.erase(it);
     unused_memory_usage_bytes_ -=
         Resource::UncheckedMemorySizeBytes(size, format);
     return make_scoped_ptr(resource);
   }
 
   scoped_ptr<ScopedResource> resource =
       ScopedResource::Create(resource_provider_);
-  resource->AllocateManaged(size, target_, format);
+  resource->AllocateManaged(
+      size, targets_[resource_provider_->ToGpuMemoryBufferFormat(format)],
+      format);
 
   DCHECK(Resource::VerifySizeInBytes(resource->size(), resource->format()));
   memory_usage_bytes_ +=
       Resource::UncheckedMemorySizeBytes(resource->size(), resource->format());
   ++resource_count_;
   return resource.Pass();
 }
 
 scoped_ptr<ScopedResource> ResourcePool::TryAcquireResourceWithContentId(
     uint64_t content_id) {
@@ skipping 82 matching lines @@
 }
 
 void ResourcePool::DidFinishUsingResource(ScopedResource* resource,
                                           uint64_t content_id) {
   unused_memory_usage_bytes_ +=
       Resource::UncheckedMemorySizeBytes(resource->size(), resource->format());
   unused_resources_.push_back(PoolResource(resource, content_id));
 }
 
 }  // namespace cc