Remove the pools from the ResourceProvider.

cc/resource_provider_unittest.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/resource_provider.h"
 
 #include "base/logging.h"
 #include "cc/output_surface.h"
 #include "cc/scoped_ptr_deque.h"
 #include "cc/scoped_ptr_hash_map.h"
@@ skipping 292 matching lines @@
 protected:
     scoped_ptr<ContextSharedData> m_sharedData;
     scoped_ptr<OutputSurface> m_outputSurface;
     scoped_ptr<ResourceProvider> m_resourceProvider;
 };
 
 TEST_P(ResourceProviderTest, Basic)
 {
     gfx::Size size(1, 1);
     WGC3Denum format = GL_RGBA;
-    int pool = 1;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
-    ResourceProvider::ResourceId id = m_resourceProvider->createResource(pool, size, format, ResourceProvider::TextureUsageAny);
+    ResourceProvider::ResourceId id = m_resourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
     expectNumResources(1);
 
     uint8_t data[4] = {1, 2, 3, 4};
     gfx::Rect rect(gfx::Point(), size);
     m_resourceProvider->setPixels(id, data, rect, rect, gfx::Vector2d());
 
     uint8_t result[4] = {0};
     getResourcePixels(id, size, format, result);
     EXPECT_EQ(0, memcmp(data, result, pixelSize));
 
     m_resourceProvider->deleteResource(id);
     expectNumResources(0);
 }
 
-TEST_P(ResourceProviderTest, DeleteOwnedResources)
-{
-    gfx::Size size(1, 1);
-    WGC3Denum format = GL_RGBA;
-    int pool = 1;
-
-    const int count = 3;
-    for (int i = 0; i < count; ++i)
-        m_resourceProvider->createResource(pool, size, format, ResourceProvider::TextureUsageAny);
-    expectNumResources(3);
-
-    m_resourceProvider->deleteOwnedResources(pool+1);
-    expectNumResources(3);
-
-    m_resourceProvider->deleteOwnedResources(pool);
-    expectNumResources(0);
-}
-
 TEST_P(ResourceProviderTest, Upload)
 {
     gfx::Size size(2, 2);
     WGC3Denum format = GL_RGBA;
-    int pool = 1;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(16U, pixelSize);
 
-    ResourceProvider::ResourceId id = m_resourceProvider->createResource(pool, size, format, ResourceProvider::TextureUsageAny);
+    ResourceProvider::ResourceId id = m_resourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
 
     uint8_t image[16] = {0};
     gfx::Rect imageRect(gfx::Point(), size);
     m_resourceProvider->setPixels(id, image, imageRect, imageRect, gfx::Vector2d());
 
     for (uint8_t i = 0 ; i < pixelSize; ++i)
         image[i] = i;
 
     uint8_t result[16] = {0};
     {
@@ skipping 46 matching lines @@
 {
     // Resource transfer is only supported with GL textures for now.
     if (GetParam() != ResourceProvider::GLTexture)
         return;
 
     scoped_ptr<OutputSurface> childOutputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));
     scoped_ptr<ResourceProvider> childResourceProvider(ResourceProvider::create(childOutputSurface.get()));
 
     gfx::Size size(1, 1);
     WGC3Denum format = GL_RGBA;
-    int pool = 1;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
-    ResourceProvider::ResourceId id1 = childResourceProvider->createResource(pool, size, format, ResourceProvider::TextureUsageAny);
+    ResourceProvider::ResourceId id1 = childResourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
     uint8_t data1[4] = {1, 2, 3, 4};
     gfx::Rect rect(gfx::Point(), size);
     childResourceProvider->setPixels(id1, data1, rect, rect, gfx::Vector2d());
 
-    ResourceProvider::ResourceId id2 = childResourceProvider->createResource(pool, size, format, ResourceProvider::TextureUsageAny);
+    ResourceProvider::ResourceId id2 = childResourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
     uint8_t data2[4] = {5, 5, 5, 5};
     childResourceProvider->setPixels(id2, data2, rect, rect, gfx::Vector2d());
 
-    int childPool = 2;
-    int childId = m_resourceProvider->createChild(childPool);
+    int childId = m_resourceProvider->createChild();
 
     {
         // Transfer some resources to the parent.
         ResourceProvider::ResourceIdArray resourceIdsToTransfer;
         resourceIdsToTransfer.push_back(id1);
         resourceIdsToTransfer.push_back(id2);
         TransferableResourceList list;
         childResourceProvider->prepareSendToParent(resourceIdsToTransfer, &list);
         EXPECT_NE(0u, list.sync_point);
         EXPECT_EQ(2u, list.resources.size());
@@ skipping 82 matching lines @@
 {
     // Resource transfer is only supported with GL textures for now.
     if (GetParam() != ResourceProvider::GLTexture)
         return;
 
     scoped_ptr<OutputSurface> childOutputSurface(FakeOutputSurface::Create3d(ResourceProviderContext::create(m_sharedData.get()).PassAs<WebKit::WebGraphicsContext3D>()));
     scoped_ptr<ResourceProvider> childResourceProvider(ResourceProvider::create(childOutputSurface.get()));
 
     gfx::Size size(1, 1);
     WGC3Denum format = GL_RGBA;
-    int pool = 1;
     size_t pixelSize = textureSize(size, format);
     ASSERT_EQ(4U, pixelSize);
 
-    ResourceProvider::ResourceId id = childResourceProvider->createResource(pool, size, format, ResourceProvider::TextureUsageAny);
+    ResourceProvider::ResourceId id = childResourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
     uint8_t data[4] = {1, 2, 3, 4};
     gfx::Rect rect(gfx::Point(), size);
     childResourceProvider->setPixels(id, data, rect, rect, gfx::Vector2d());
 
-    int childPool = 2;
-    int childId = m_resourceProvider->createChild(childPool);
+    int childId = m_resourceProvider->createChild();
 
     {
         // Transfer some resource to the parent.
         ResourceProvider::ResourceIdArray resourceIdsToTransfer;
         resourceIdsToTransfer.push_back(id);
         TransferableResourceList list;
         childResourceProvider->prepareSendToParent(resourceIdsToTransfer, &list);
         EXPECT_NE(0u, list.sync_point);
         EXPECT_EQ(1u, list.resources.size());
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id));
@@ skipping 31 matching lines @@
     // Sampling is only supported for GL textures.
     if (GetParam() != ResourceProvider::GLTexture)
         return;
 
     scoped_ptr<OutputSurface> outputSurface(FakeOutputSurface::Create3d(scoped_ptr<WebKit::WebGraphicsContext3D>(new TextureStateTrackingContext)));
     TextureStateTrackingContext* context = static_cast<TextureStateTrackingContext*>(outputSurface->Context3D());
     scoped_ptr<ResourceProvider> resourceProvider(ResourceProvider::create(outputSurface.get()));
 
     gfx::Size size(1, 1);
     WGC3Denum format = GL_RGBA;
-    int pool = 1;
     int textureId = 1;
 
     // Check that the texture gets created with the right sampler settings.
     EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, textureId));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
     EXPECT_CALL(*context, texParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
-    ResourceProvider::ResourceId id = resourceProvider->createResource(pool, size, format, ResourceProvider::TextureUsageAny);
+    ResourceProvider::ResourceId id = resourceProvider->createResource(size, format, ResourceProvider::TextureUsageAny);
 
     // Creating a sampler with the default filter should not change any texture
     // parameters.
     {
         EXPECT_CALL(*context, bindTexture(GL_TEXTURE_2D, textureId));
         ResourceProvider::ScopedSamplerGL sampler(resourceProvider.get(), id, GL_TEXTURE_2D, GL_LINEAR);
     }
 
     // Using a different filter should be reflected in the texture parameters.
     {
@@ skipping 14 matching lines @@
     Mock::VerifyAndClearExpectations(context);
 }
 
 INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
                         ResourceProviderTest,
                         ::testing::Values(ResourceProvider::GLTexture,
                                           ResourceProvider::Bitmap));
 
 }  // namespace
 }  // namespace cc