cc: return resources via a ReturnedResource struct rather than TransferableResource

cc/trees/layer_tree_host_unittest_delegated.cc

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 4693707384f834012514f97a80201edefafa07d9..b011d4e8f11a905447ee8fa3d7e0d7dda1f9798e 100644
--- a/cc/trees/layer_tree_host_unittest_delegated.cc
+++ b/cc/trees/layer_tree_host_unittest_delegated.cc
@@ -25,27 +25,42 @@
 namespace cc {
 namespace {
 
-bool TransferableResourceLower(const TransferableResource& a,
-                               const TransferableResource& b) {
+bool ReturnedResourceLower(const ReturnedResource& a,
+                           const ReturnedResource& b) {
   return a.id < b.id;
 }
 
 // Tests if the list of resources matches an expectation, modulo the order.
-bool ResourcesMatch(TransferableResourceArray actual,
+bool ResourcesMatch(ReturnedResourceArray actual,
                     unsigned* expected,
                     size_t expected_count) {
-  EXPECT_EQ(expected_count, actual.size());
-  if (expected_count != actual.size())
-    return false;
-
-  std::sort(actual.begin(), actual.end(), TransferableResourceLower);
+  std::sort(actual.begin(), actual.end(), ReturnedResourceLower);
   std::sort(expected, expected + expected_count);
+  size_t actual_index = 0;
   bool result = true;
-  for (size_t i = 0; i < expected_count; ++i) {
-    EXPECT_EQ(actual[i].id, expected[i]);
-    if (actual[i].id != expected[i])
+
+  // for each element of the expected array, count off one of the actual array
+  // (after checking it matches).
+  for (size_t expected_index = 0; expected_index < expected_count;
+       ++expected_index) {
+    EXPECT_LT(actual_index, actual.size());
+    if (actual_index >= actual.size())
+      return false;
+    EXPECT_EQ(actual[actual_index].id, expected[expected_index]);
+    if (actual[actual_index].id != expected[expected_index])
+      result = false;

[danakj, 2013/08/16 23:33:35]

why not just return false here? If the id's don't match does the rest matter?

[piman, 2013/08/17 01:54:31]

Done.

+    EXPECT_GT(actual[actual_index].count, 0);
+    if (actual[actual_index].count <= 0) {
       result = false;

[danakj, 2013/08/16 23:33:35]

same. if you agree returning immediately is cleaner, you can probably drop the
temp result var entirely.

[piman, 2013/08/17 01:54:31]

Done.

+    } else {
+      --actual[actual_index].count;
+      if (actual[actual_index].count == 0)
+        ++actual_index;
+    }
   }
+  EXPECT_EQ(actual_index, actual.size());
+  if (actual_index != actual.size())
+    result = false;
 
   return result;
 }
@@ -527,7 +542,7 @@ class LayerTreeHostDelegatedTestMergeResources
     AddTransferableResource(frame2.get(), 555);
     delegated_->SetFrameData(frame2.Pass());
 
-    TransferableResourceArray returned_resources;
+    ReturnedResourceArray returned_resources;
     delegated_->TakeUnusedResourcesForChildCompositor(&returned_resources);
     {
       unsigned expected[] = {999};
@@ -623,7 +638,7 @@ class LayerTreeHostDelegatedTestReturnUnusedResources
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
@@ -687,7 +702,7 @@ class LayerTreeHostDelegatedTestReturnUnusedResources
     }
 
     // Resource are never immediately released.
-    TransferableResourceArray empty_resources;
+    ReturnedResourceArray empty_resources;
     delegated_->TakeUnusedResourcesForChildCompositor(&empty_resources);
     EXPECT_TRUE(empty_resources.empty());
   }
@@ -712,7 +727,7 @@ class LayerTreeHostDelegatedTestReusedResources
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
@@ -788,7 +803,7 @@ class LayerTreeHostDelegatedTestFrameBeforeAck
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
@@ -896,7 +911,7 @@ class LayerTreeHostDelegatedTestFrameBeforeTakeResources
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
@@ -1029,7 +1044,7 @@ class LayerTreeHostDelegatedTestBadFrame
 
   virtual void DidCommitAndDrawFrame() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
@@ -1200,7 +1215,7 @@ class LayerTreeHostDelegatedTestUnnamedResource
 
   virtual void DidCommit() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
@@ -1259,7 +1274,7 @@ class LayerTreeHostDelegatedTestDontLeakResource
 
   virtual void DidCommit() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
@@ -1343,7 +1358,7 @@ class LayerTreeHostDelegatedTestResourceSentToParent
  public:
   virtual void DidCommitAndDrawFrame() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {
@@ -1458,7 +1473,7 @@ class LayerTreeHostDelegatedTestCommitWithoutTake
 
   virtual void DidCommit() OVERRIDE {
     scoped_ptr<DelegatedFrameData> frame;
-    TransferableResourceArray resources;
+    ReturnedResourceArray resources;
 
     int next_source_frame_number = layer_tree_host()->source_frame_number();
     switch (next_source_frame_number) {