Separate TransferableResource into own header

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 "config.h"
 
 #include "cc/resource_provider.h"
 
 #include "base/logging.h"
 #include "cc/graphics_context.h"
@@ skipping 425 matching lines @@
     childResourceProvider->setPixels(id2, data2, rect, rect, gfx::Vector2d());
 
     int childPool = 2;
     int childId = m_resourceProvider->createChild(childPool);
 
     {
         // Transfer some resources to the parent.
         ResourceProvider::ResourceIdArray resourceIdsToTransfer;
         resourceIdsToTransfer.push_back(id1);
         resourceIdsToTransfer.push_back(id2);
-        ResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
-        EXPECT_NE(0u, list.syncPoint);
+        TransferableResourceList list;
+        childResourceProvider->prepareSendToParent(resourceIdsToTransfer, &list);
+        EXPECT_NE(0u, list.sync_point);
         EXPECT_EQ(2u, list.resources.size());
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id1));
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id2));
         m_resourceProvider->receiveFromChild(childId, list);
     }
 
     EXPECT_EQ(2u, m_resourceProvider->numResources());
     EXPECT_EQ(2u, m_resourceProvider->mailboxCount());
     ResourceProvider::ResourceIdMap resourceMap = m_resourceProvider->getChildToParentMap(childId);
     ResourceProvider::ResourceId mappedId1 = resourceMap[id1];
     ResourceProvider::ResourceId mappedId2 = resourceMap[id2];
     EXPECT_NE(0u, mappedId1);
     EXPECT_NE(0u, mappedId2);
     EXPECT_FALSE(m_resourceProvider->inUseByConsumer(id1));
     EXPECT_FALSE(m_resourceProvider->inUseByConsumer(id2));
 
     uint8_t result[4] = {0};
     getResourcePixels(mappedId1, size, format, result);
     EXPECT_EQ(0, memcmp(data1, result, pixelSize));
 
     getResourcePixels(mappedId2, size, format, result);
     EXPECT_EQ(0, memcmp(data2, result, pixelSize));
 
     {
         // Check that transfering again the same resource from the child to the
         // parent is a noop.
         ResourceProvider::ResourceIdArray resourceIdsToTransfer;
         resourceIdsToTransfer.push_back(id1);
-        ResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
-        EXPECT_EQ(0u, list.syncPoint);
+        TransferableResourceList list;
+        childResourceProvider->prepareSendToParent(resourceIdsToTransfer, &list);
+        EXPECT_EQ(0u, list.sync_point);
         EXPECT_EQ(0u, list.resources.size());
     }
 
     {
         // Transfer resources back from the parent to the child.
         ResourceProvider::ResourceIdArray resourceIdsToTransfer;
         resourceIdsToTransfer.push_back(mappedId1);
         resourceIdsToTransfer.push_back(mappedId2);
-        ResourceProvider::TransferableResourceList list = m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer);
-        EXPECT_NE(0u, list.syncPoint);
+        TransferableResourceList list;
+        m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer, &list);
+        EXPECT_NE(0u, list.sync_point);
         EXPECT_EQ(2u, list.resources.size());
         childResourceProvider->receiveFromParent(list);
     }
     EXPECT_EQ(0u, m_resourceProvider->mailboxCount());
     EXPECT_EQ(2u, childResourceProvider->mailboxCount());
     EXPECT_FALSE(childResourceProvider->inUseByConsumer(id1));
     EXPECT_FALSE(childResourceProvider->inUseByConsumer(id2));
 
     ResourceProviderContext* childContext3D = static_cast<ResourceProviderContext*>(childContext->context3D());
     {
         ResourceProvider::ScopedReadLockGL lock(childResourceProvider.get(), id1);
         ASSERT_NE(0U, lock.textureId());
         childContext3D->bindTexture(GL_TEXTURE_2D, lock.textureId());
         childContext3D->getPixels(size, format, result);
         EXPECT_EQ(0, memcmp(data1, result, pixelSize));
     }
     {
         ResourceProvider::ScopedReadLockGL lock(childResourceProvider.get(), id2);
         ASSERT_NE(0U, lock.textureId());
         childContext3D->bindTexture(GL_TEXTURE_2D, lock.textureId());
         childContext3D->getPixels(size, format, result);
         EXPECT_EQ(0, memcmp(data2, result, pixelSize));
     }
 
     {
         // Transfer resources to the parent again.
         ResourceProvider::ResourceIdArray resourceIdsToTransfer;
         resourceIdsToTransfer.push_back(id1);
         resourceIdsToTransfer.push_back(id2);
-        ResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
-        EXPECT_NE(0u, list.syncPoint);
+        TransferableResourceList list;
+        childResourceProvider->prepareSendToParent(resourceIdsToTransfer, &list);
+        EXPECT_NE(0u, list.sync_point);
         EXPECT_EQ(2u, list.resources.size());
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id1));
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id2));
         m_resourceProvider->receiveFromChild(childId, list);
     }
 
     EXPECT_EQ(2u, m_resourceProvider->numResources());
     m_resourceProvider->destroyChild(childId);
     EXPECT_EQ(0u, m_resourceProvider->numResources());
     EXPECT_EQ(0u, m_resourceProvider->mailboxCount());
@@ skipping 19 matching lines @@
     gfx::Rect rect(gfx::Point(), size);
     childResourceProvider->setPixels(id, data, rect, rect, gfx::Vector2d());
 
     int childPool = 2;
     int childId = m_resourceProvider->createChild(childPool);
 
     {
         // Transfer some resource to the parent.
         ResourceProvider::ResourceIdArray resourceIdsToTransfer;
         resourceIdsToTransfer.push_back(id);
-        ResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
-        EXPECT_NE(0u, list.syncPoint);
+        TransferableResourceList list;
+        childResourceProvider->prepareSendToParent(resourceIdsToTransfer, &list);
+        EXPECT_NE(0u, list.sync_point);
         EXPECT_EQ(1u, list.resources.size());
         EXPECT_TRUE(childResourceProvider->inUseByConsumer(id));
         m_resourceProvider->receiveFromChild(childId, list);
     }
 
     // Delete textures in the child, while they are transfered.
     childResourceProvider->deleteResource(id);
     EXPECT_EQ(1u, childResourceProvider->numResources());
 
     {
         // Transfer resources back from the parent to the child.
         ResourceProvider::ResourceIdMap resourceMap = m_resourceProvider->getChildToParentMap(childId);
         ResourceProvider::ResourceId mappedId = resourceMap[id];
         EXPECT_NE(0u, mappedId);
         ResourceProvider::ResourceIdArray resourceIdsToTransfer;
         resourceIdsToTransfer.push_back(mappedId);
-        ResourceProvider::TransferableResourceList list = m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer);
-        EXPECT_NE(0u, list.syncPoint);
+        TransferableResourceList list;
+        m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer, &list);
+        EXPECT_NE(0u, list.sync_point);
         EXPECT_EQ(1u, list.resources.size());
         childResourceProvider->receiveFromParent(list);
     }
     EXPECT_EQ(0u, childResourceProvider->numResources());
 }
 
 INSTANTIATE_TEST_CASE_P(ResourceProviderTests,
                         ResourceProviderTest,
                         ::testing::Values(ResourceProvider::GLTexture,
                                           ResourceProvider::Bitmap));
 
 } // namespace