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 <algorithm>
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
@@ skipping 20 matching lines @@
 
   uint64_t total_bytes = ResourceUtil::UncheckedSizeInBytesAligned<size_t>(
       resource->size(), resource->format());
   dump->AddScalar(base::trace_event::MemoryAllocatorDump::kNameSize,
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   total_bytes);
   dump->AddScalar("free_size",
                   base::trace_event::MemoryAllocatorDump::kUnitsBytes,
                   is_free ? total_bytes : 0);
 }
+ResourcePool::ResourcePool(ResourceProvider* resource_provider)
+    : resource_provider_(resource_provider),
+      target_(0),
+      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) {
+  base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
+      this, base::ThreadTaskRunnerHandle::Get());
+}
 
 ResourcePool::ResourcePool(ResourceProvider* resource_provider, GLenum target)
     : resource_provider_(resource_provider),
       target_(target),
       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) {
+  DCHECK_NE(0u, target);
   base::trace_event::MemoryDumpManager::GetInstance()->RegisterDumpProvider(
       this, base::ThreadTaskRunnerHandle::Get());
 }
 
 ResourcePool::~ResourcePool() {
   base::trace_event::MemoryDumpManager::GetInstance()->UnregisterDumpProvider(
       this);
   while (!busy_resources_.empty()) {
     auto const& front = busy_resources_.front();
     DidFinishUsingResource(front.resource, front.content_id);
@@ skipping 21 matching lines @@
       continue;
 
     unused_resources_.erase(it);
     unused_memory_usage_bytes_ -=
         ResourceUtil::UncheckedSizeInBytes<size_t>(size, format);
     return make_scoped_ptr(resource);
   }
 
   scoped_ptr<ScopedResource> resource =
       ScopedResource::Create(resource_provider_);
-  resource->AllocateManaged(size, target_, format);
+  GLenum target =
+      target_ ? target_ : resource_provider_->GetImageTextureTarget(format);
+  resource->AllocateManaged(size, target, format);
 
   DCHECK(ResourceUtil::VerifySizeInBytes<size_t>(resource->size(),
                                                  resource->format()));
   memory_usage_bytes_ += ResourceUtil::UncheckedSizeInBytes<size_t>(
       resource->size(), resource->format());
   ++resource_count_;
   return resource.Pass();
 }
 
 scoped_ptr<ScopedResource> ResourcePool::TryAcquireResourceWithContentId(
@@ skipping 105 matching lines @@
   }
   for (const auto& resource : busy_resources_) {
     resource.OnMemoryDump(pmd, false /* is_free */);
   }
   // TODO(ericrk): Dump vended out resources once that data is available.
   // crbug.com/516541
   return true;
 }
 
 }  // namespace cc