cc: Clear entries from animations maps only when main thread wins

cc/trees/layer_tree_host_unittest.cc

 // Copyright 2011 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 "cc/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 966 matching lines @@
 
   void DidCommit() override {
     EffectTree& effect_tree = layer_tree_host()->property_trees()->effect_tree;
     EffectNode* node = effect_tree.Node(root_->effect_tree_index());
     switch (layer_tree_host()->source_frame_number()) {
       case 1:
         node->data.opacity = 0.5f;
         node->data.is_currently_animating_opacity = true;
         break;
       case 2:
+        node->data.is_currently_animating_opacity = true;
+        break;
+      case 3:
         node->data.is_currently_animating_opacity = false;
         break;
+      case 4:
+        node->data.opacity = 0.25f;
+        node->data.is_currently_animating_opacity = true;
     }
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
     EffectTree& effect_tree = impl->sync_tree()->property_trees()->effect_tree;
     EffectNode* node = effect_tree.Node(
         impl->sync_tree()->root_layer_for_testing()->effect_tree_index());
     switch (impl->sync_tree()->source_frame_number()) {
       case 0:
         impl->sync_tree()->root_layer_for_testing()->OnOpacityAnimated(0.75f);
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
         EXPECT_EQ(node->data.opacity, 0.75f);
+        PostSetNeedsCommitToMainThread();
+        break;
+      case 2:
+        EXPECT_EQ(node->data.opacity, 0.75f);
         impl->sync_tree()->root_layer_for_testing()->OnOpacityAnimated(0.75f);
         PostSetNeedsCommitToMainThread();
         break;
-      case 2:
+      case 3:
         EXPECT_EQ(node->data.opacity, 0.5f);
+        PostSetNeedsCommitToMainThread();
+        break;
+      case 4:
+        EXPECT_EQ(node->data.opacity, 0.25f);
         EndTest();
         break;
     }
   }
 
   void AfterTest() override {}
 
  private:
   scoped_refptr<Layer> root_;
 };
@@ skipping 20 matching lines @@
       case 1:
         node->data.local = rotate10;
         node->data.is_currently_animating = true;
         break;
       case 2:
         node->data.is_currently_animating = true;
         break;
       case 3:
         node->data.is_currently_animating = false;
         break;
+      case 4:
+        node->data.local = gfx::Transform();
+        node->data.is_currently_animating = true;
+        break;
     }
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
     TransformTree& transform_tree =
         impl->sync_tree()->property_trees()->transform_tree;
     TransformNode* node = transform_tree.Node(
         impl->sync_tree()->root_layer_for_testing()->transform_tree_index());
     gfx::Transform rotate10;
     rotate10.Rotate(10.f);
     gfx::Transform rotate20;
     rotate20.Rotate(20.f);
     switch (impl->sync_tree()->source_frame_number()) {
       case 0:
         impl->sync_tree()->root_layer_for_testing()->OnTransformAnimated(
             rotate20);
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
         EXPECT_EQ(node->data.local, rotate20);
-        impl->sync_tree()->root_layer_for_testing()->OnTransformAnimated(
-            rotate20);
         PostSetNeedsCommitToMainThread();
         break;
       case 2:
         EXPECT_EQ(node->data.local, rotate20);
         impl->sync_tree()->root_layer_for_testing()->OnTransformAnimated(
             rotate20);
         PostSetNeedsCommitToMainThread();
         break;
       case 3:
         EXPECT_EQ(node->data.local, rotate10);
+        PostSetNeedsCommitToMainThread();
+        break;
+      case 4:
+        EXPECT_EQ(node->data.local, gfx::Transform());
         EndTest();
     }
   }
 
   void AfterTest() override {}
 
  private:
   scoped_refptr<Layer> root_;
 };
 
@@ skipping 5681 matching lines @@
  private:
   FakeContentLayerClient client_;
   const gfx::Size viewport_size_;
   const gfx::Size large_image_size_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(GpuRasterizationSucceedsWithLargeImage);
 
 }  // namespace
 }  // namespace cc