cc/CCResourceProviderTest.cpp - Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs

Unified Diff: cc/CCResourceProviderTest.cpp

Issue 10915298: Add CCDelegatingRenderer, and corresponding IPCs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge fix Created 8 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: cc/CCResourceProviderTest.cpp

diff --git a/cc/CCResourceProviderTest.cpp b/cc/CCResourceProviderTest.cpp

index b4691a5ce244fafc7c515ed6c5af65ff261d9e93..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));

« no previous file with comments | « cc/CCResourceProvider.cpp ('k') | cc/CCSingleThreadProxy.cpp » ('j') | cc/transferable_resource.h » ('J')