| Index: cc/CCResourceProviderTest.cpp
|
| diff --git a/cc/CCResourceProviderTest.cpp b/cc/CCResourceProviderTest.cpp
|
| index ac9176ca3c3a0bdac3882ac5849ac3d7bb3bed1e..44806b2a4fdb7801364515f8dff88841791ce99a 100644
|
| --- a/cc/CCResourceProviderTest.cpp
|
| +++ b/cc/CCResourceProviderTest.cpp
|
| @@ -442,8 +442,9 @@ TEST_P(CCResourceProviderTest, TransferResources)
|
| CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
|
| resourceIdsToTransfer.append(id1);
|
| resourceIdsToTransfer.append(id2);
|
| - CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
|
| - EXPECT_NE(0u, list.syncPoint);
|
| + CCResourceProvider::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));
|
| @@ -472,8 +473,9 @@ TEST_P(CCResourceProviderTest, TransferResources)
|
| // parent is a noop.
|
| CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
|
| resourceIdsToTransfer.append(id1);
|
| - CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
|
| - EXPECT_EQ(0u, list.syncPoint);
|
| + CCResourceProvider::TransferableResourceList list;
|
| + childResourceProvider->prepareSendToParent(resourceIdsToTransfer, &list);
|
| + EXPECT_EQ(0u, list.sync_point);
|
| EXPECT_EQ(0u, list.resources.size());
|
| }
|
|
|
| @@ -482,8 +484,9 @@ TEST_P(CCResourceProviderTest, TransferResources)
|
| CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
|
| resourceIdsToTransfer.append(mappedId1);
|
| resourceIdsToTransfer.append(mappedId2);
|
| - CCResourceProvider::TransferableResourceList list = m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer);
|
| - EXPECT_NE(0u, list.syncPoint);
|
| + CCResourceProvider::TransferableResourceList list;
|
| + m_resourceProvider->prepareSendToChild(childId, resourceIdsToTransfer, &list);
|
| + EXPECT_NE(0u, list.sync_point);
|
| EXPECT_EQ(2u, list.resources.size());
|
| childResourceProvider->receiveFromParent(list);
|
| }
|
| @@ -513,8 +516,9 @@ TEST_P(CCResourceProviderTest, TransferResources)
|
| CCResourceProvider::ResourceIdArray resourceIdsToTransfer;
|
| resourceIdsToTransfer.append(id1);
|
| resourceIdsToTransfer.append(id2);
|
| - CCResourceProvider::TransferableResourceList list = childResourceProvider->prepareSendToParent(resourceIdsToTransfer);
|
| - EXPECT_NE(0u, list.syncPoint);
|
| + CCResourceProvider::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));
|
| @@ -527,7 +531,7 @@ TEST_P(CCResourceProviderTest, TransferResources)
|
| EXPECT_EQ(0u, m_resourceProvider->mailboxCount());
|
| }
|
|
|
| -TEST_P(CCResourceProviderTest, DeleteTransferredResources)
|
| +TEST_P(CCResourceProviderTest, DeleteTransferedResources)
|
| {
|
| // Resource transfer is only supported with GL textures for now.
|
| if (GetParam() != CCResourceProvider::GLTexture)
|
|
|