cc::ResourcePool - Re-use larger resources for smaller requests

cc/resources/resource_pool_unittest.cc

 // Copyright 2015 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 <stddef.h>
 
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
@@ skipping 306 matching lines @@
   ResourceFormat format = RGBA_8888;
   gfx::ColorSpace color_space = gfx::ColorSpace::CreateSRGB();
 
   // Create unused resources with sizes close to 100, 100.
   resource_pool_->ReleaseResource(
       resource_pool_->CreateResource(gfx::Size(99, 100), format, color_space));
   resource_pool_->ReleaseResource(
       resource_pool_->CreateResource(gfx::Size(99, 99), format, color_space));
   resource_pool_->ReleaseResource(
       resource_pool_->CreateResource(gfx::Size(100, 99), format, color_space));
-  resource_pool_->ReleaseResource(
-      resource_pool_->CreateResource(gfx::Size(101, 101), format, color_space));
   resource_pool_->CheckBusyResources();
 
-  gfx::Size size(100, 100);
-  Resource* resource = resource_pool_->ReuseResource(size, format, color_space);
-  EXPECT_EQ(nullptr, resource);
-  size = gfx::Size(100, 99);
-  resource = resource_pool_->ReuseResource(size, format, color_space);
+  // 100, 100 is too large, not in our pool.
+  EXPECT_EQ(nullptr, resource_pool_->ReuseResource(gfx::Size(100, 100), format,
+                                                   color_space));
+
+  // 45, 99 is too small, shouldn't match.
+  EXPECT_EQ(nullptr, resource_pool_->ReuseResource(gfx::Size(45, 99), format,

[danakj, 2017/03/10 18:55:40]

Can you test the boundary cases a bit more to establish them in the test? 1/2
size width and height for example.

[ericrk, 2017/03/10 20:04:07]

Done.

+                                                   color_space));
+
+  // 100, 99 is an exact match
+  auto* resource =
+      resource_pool_->ReuseResource(gfx::Size(100, 99), format, color_space);
   EXPECT_NE(nullptr, resource);
-  ASSERT_EQ(nullptr, resource_pool_->ReuseResource(size, format, color_space));
+  EXPECT_EQ(nullptr, resource_pool_->ReuseResource(gfx::Size(100, 99), format,
+                                                   color_space));
+  resource_pool_->ReleaseResource(resource);
+
+  // 98, 98 should match a larger resource size.
+  resource =
+      resource_pool_->ReuseResource(gfx::Size(98, 98), format, color_space);
+  EXPECT_NE(nullptr, resource);
   resource_pool_->ReleaseResource(resource);
 }
 
 TEST_F(ResourcePoolTest, MemoryStateSuspended) {
   // Limits high enough to not be hit by this test.
   size_t bytes_limit = 10 * 1024 * 1024;
   size_t count_limit = 100;
   resource_pool_->SetResourceUsageLimits(bytes_limit, count_limit);
 
   gfx::Size size(100, 100);
@@ skipping 41 matching lines @@
   resource_pool_ =
       ResourcePool::Create(resource_provider_.get(), task_runner_.get(),
                            ResourceProvider::TEXTURE_HINT_DEFAULT,
                            base::TimeDelta::FromMilliseconds(100));
   resource = resource_pool_->AcquireResource(size, format, color_space);
   EXPECT_FALSE(resource_provider_->IsImmutable(resource->id()));
   resource_pool_->ReleaseResource(resource);
 }
 
 }  // namespace cc