Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1353)

Unified Diff: cc/trees/layer_tree_host_unittest_delegated.cc

Issue 13445009: cc: Move video upload to VideoResourceUpdater. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix software compositing Created 7 years, 8 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/trees/layer_tree_host_unittest_delegated.cc
diff --git a/cc/trees/layer_tree_host_unittest_delegated.cc b/cc/trees/layer_tree_host_unittest_delegated.cc
index cc81707ee765d7c169105193245a520e203e5407..54de8ce43d616abb064dc88141b9e08e271637be 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -1103,6 +1103,9 @@ class LayerTreeHostDelegatedTestResourceSentToParent
TransferableResourceArray transferable_resources;
host_impl->resource_provider()->PrepareSendToParent(
resources_for_parent, &transferable_resources);
+
+ resource_in_grandparent = transferable_resources[0];
+ EXPECT_EQ(map.find(999)->second, resource_in_grandparent.id);
break;
}
case 2: {
@@ -1115,10 +1118,10 @@ class LayerTreeHostDelegatedTestResourceSentToParent
EXPECT_EQ(1u, delegated_impl->Resources().count(map.find(555)->second));
// Receive 999 back from the grandparent.
- TransferableResource resource;
- resource.id = map.find(999)->second;
+ EXPECT_EQ(map.find(999)->second, resource_in_grandparent.id);
TransferableResourceArray transferable_resources;
- transferable_resources.push_back(resource);
+ transferable_resources.push_back(resource_in_grandparent);
+
host_impl->resource_provider()->ReceiveFromParent(
transferable_resources);
break;
@@ -1134,6 +1137,8 @@ class LayerTreeHostDelegatedTestResourceSentToParent
}
virtual void AfterTest() OVERRIDE {}
+
+ TransferableResource resource_in_grandparent;
};
SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostDelegatedTestResourceSentToParent);

Powered by Google App Engine
This is Rietveld 408576698