cc: return resources via a ReturnedResource struct rather than TransferableResource

cc/resources/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/resources/resource_provider.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "cc/base/scoped_ptr_deque.h"
 #include "cc/debug/test_web_graphics_context_3d.h"
 #include "cc/output/output_surface.h"
+#include "cc/resources/returned_resource.h"
 #include "cc/test/fake_output_surface.h"
 #include "cc/test/fake_output_surface_client.h"
 #include "gpu/GLES2/gl2extchromium.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/WebKit/public/platform/WebGraphicsContext3D.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 #include "ui/gfx/rect.h"
 
@@ skipping 569 matching lines @@
   {
     // Check that transfering again the same resource from the child to the
     // parent works.
     ResourceProvider::ResourceIdArray resource_ids_to_transfer;
     resource_ids_to_transfer.push_back(id1);
     TransferableResourceArray list;
     child_resource_provider->PrepareSendToParent(resource_ids_to_transfer,
                                                  &list);
     EXPECT_EQ(1u, list.size());
     EXPECT_EQ(id1, list[0].id);
-    child_resource_provider->ReceiveFromParent(list);
+    ReturnedResourceArray returned;
+    TransferableResource::ReturnResources(list, &returned);
+    child_resource_provider->ReceiveReturnsFromParent(returned);
     // id1 was exported twice, we returned it only once, it should still be
     // in-use.
     EXPECT_TRUE(child_resource_provider->InUseByConsumer(id1));
   }
   {
     // Transfer resources back from the parent to the child.
     ResourceProvider::ResourceIdArray resource_ids_to_transfer;
     resource_ids_to_transfer.push_back(mapped_id1);
     resource_ids_to_transfer.push_back(mapped_id2);
-    TransferableResourceArray list;
-    resource_provider_->PrepareSendToChild(
+    ReturnedResourceArray list;
+    resource_provider_->PrepareSendReturnsToChild(
         child_id, resource_ids_to_transfer, &list);
     ASSERT_EQ(2u, list.size());
     EXPECT_NE(0u, list[0].sync_point);
     EXPECT_NE(0u, list[1].sync_point);
-    child_resource_provider->ReceiveFromParent(list);
+    child_resource_provider->ReceiveReturnsFromParent(list);
   }
   EXPECT_FALSE(child_resource_provider->InUseByConsumer(id1));
   EXPECT_FALSE(child_resource_provider->InUseByConsumer(id2));
 
   {
     ResourceProvider::ScopedReadLockGL lock(child_resource_provider.get(), id1);
     ASSERT_NE(0U, lock.texture_id());
     child_context->bindTexture(GL_TEXTURE_2D, lock.texture_id());
     child_context->GetPixels(size, format, result);
     EXPECT_EQ(0, memcmp(data1, result, pixel_size));
@@ skipping 72 matching lines @@
   child_resource_provider->DeleteResource(id);
   EXPECT_EQ(1u, child_resource_provider->num_resources());
   {
     // Transfer resources back from the parent to the child.
     ResourceProvider::ResourceIdMap resource_map =
         resource_provider_->GetChildToParentMap(child_id);
     ResourceProvider::ResourceId mapped_id = resource_map[id];
     EXPECT_NE(0u, mapped_id);
     ResourceProvider::ResourceIdArray resource_ids_to_transfer;
     resource_ids_to_transfer.push_back(mapped_id);
-    TransferableResourceArray list;
-    resource_provider_->PrepareSendToChild(
+    ReturnedResourceArray list;
+    resource_provider_->PrepareSendReturnsToChild(
         child_id, resource_ids_to_transfer, &list);
     ASSERT_EQ(1u, list.size());
     EXPECT_NE(0u, list[0].sync_point);
-    child_resource_provider->ReceiveFromParent(list);
+    child_resource_provider->ReceiveReturnsFromParent(list);
   }
   EXPECT_EQ(0u, child_resource_provider->num_resources());
 }
 
 TEST_P(ResourceProviderTest, TextureFilters) {
   // Resource transfer is only supported with GL textures for now.
   if (GetParam() != ResourceProvider::GLTexture)
     return;
 
   scoped_ptr<ResourceProviderContext> child_context_owned(
@@ skipping 46 matching lines @@
   EXPECT_NE(0u, mapped_id);
   EXPECT_EQ(static_cast<unsigned>(GL_NEAREST),
             GetResourceFilter(resource_provider_.get(), context(), mapped_id));
   SetResourceFilter(resource_provider_.get(), mapped_id, GL_LINEAR);
   EXPECT_EQ(static_cast<unsigned>(GL_LINEAR),
             GetResourceFilter(resource_provider_.get(), context(), mapped_id));
   {
     // Transfer resources back from the parent to the child.
     ResourceProvider::ResourceIdArray resource_ids_to_transfer;
     resource_ids_to_transfer.push_back(mapped_id);
-    TransferableResourceArray list;
-    resource_provider_->PrepareSendToChild(
+    ReturnedResourceArray list;
+    resource_provider_->PrepareSendReturnsToChild(
         child_id, resource_ids_to_transfer, &list);
     ASSERT_EQ(1u, list.size());
     EXPECT_EQ(static_cast<unsigned>(GL_LINEAR), list[0].filter);
-    child_resource_provider->ReceiveFromParent(list);
+    child_resource_provider->ReceiveReturnsFromParent(list);
   }
   EXPECT_EQ(static_cast<unsigned>(GL_LINEAR),
             GetResourceFilter(child_resource_provider.get(),
                               child_context,
                               id));
   SetResourceFilter(child_resource_provider.get(), id, GL_NEAREST);
   EXPECT_EQ(static_cast<unsigned>(GL_NEAREST),
             GetResourceFilter(child_resource_provider.get(),
                               child_context,
                               id));
@@ skipping 52 matching lines @@
     uint8_t test_data[4] = { 0 };
     context()->GetPixels(gfx::Size(1, 1), GL_RGBA, test_data);
     EXPECT_EQ(0, memcmp(data, test_data, sizeof(data)));
     context()->produceTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
     context()->deleteTexture(other_texture);
     list[0].sync_point = context()->insertSyncPoint();
     EXPECT_LT(0u, list[0].sync_point);
 
     // Receive the resource, then delete it, expect the sync points to be
     // consistent.
-    resource_provider_->ReceiveFromParent(list);
+    ReturnedResourceArray returned;
+    TransferableResource::ReturnResources(list, &returned);
+    resource_provider_->ReceiveReturnsFromParent(returned);
     EXPECT_EQ(1, context()->texture_count());
     EXPECT_EQ(0u, release_sync_point);
 
     resource_provider_->DeleteResource(resource);
     EXPECT_LE(list[0].sync_point, release_sync_point);
     EXPECT_FALSE(lost_resource);
   }
 
   // We're going to do the same thing as above, but testing the case where we
   // delete the resource before we receive it back.
@@ skipping 28 matching lines @@
     list[0].sync_point = context()->insertSyncPoint();
     EXPECT_LT(0u, list[0].sync_point);
 
     // Delete the resource, which shouldn't do anything.
     resource_provider_->DeleteResource(resource);
     EXPECT_EQ(1, context()->texture_count());
     EXPECT_EQ(0u, release_sync_point);
 
     // Then receive the resource which should release the mailbox, expect the
     // sync points to be consistent.
-    resource_provider_->ReceiveFromParent(list);
+    ReturnedResourceArray returned;
+    TransferableResource::ReturnResources(list, &returned);
+    resource_provider_->ReceiveReturnsFromParent(returned);
     EXPECT_LE(list[0].sync_point, release_sync_point);
     EXPECT_FALSE(lost_resource);
   }
 
   context()->waitSyncPoint(release_sync_point);
   context()->bindTexture(GL_TEXTURE_2D, texture);
   context()->consumeTextureCHROMIUM(GL_TEXTURE_2D, mailbox.name);
   context()->deleteTexture(texture);
 }
 
@@ skipping 879 matching lines @@
                        output_surface.get());
 }
 
 INSTANTIATE_TEST_CASE_P(
     ResourceProviderTests,
     ResourceProviderTest,
     ::testing::Values(ResourceProvider::GLTexture, ResourceProvider::Bitmap));
 
 }  // namespace
 }  // namespace cc