cc : Use effect node data to determine which opacity wins at commit.

cc/trees/layer_tree_host_unittest.cc

Index: cc/trees/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 34868a4c729259963f0787a8f16f6c542edae6bb..6f72d0636dcf22b1a3f7754c94694da5d139a479 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -835,6 +835,59 @@ class LayerTreeHostTestPropertyTreesChangedSync : public LayerTreeHostTest {
 
 SINGLE_THREAD_TEST_F(LayerTreeHostTestPropertyTreesChangedSync);
 
+class LayerTreeHostTestEffectTreeSync : public LayerTreeHostTest {
+ protected:
+  void SetupTree() override {
+    root_ = Layer::Create();
+    layer_tree_host()->SetRootLayer(root_);
+    LayerTreeHostTest::SetupTree();
+  }
+
+  void BeginTest() override { PostSetNeedsCommitToMainThread(); }
+
+  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 = false;
+        break;
+    }
+  }
+
+  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()->effect_tree_index());
+    switch (impl->sync_tree()->source_frame_number()) {
+      case 0:
+        impl->sync_tree()->root_layer()->OnOpacityAnimated(0.75f);
+        PostSetNeedsCommitToMainThread();
+        break;
+      case 1:
+        EXPECT_EQ(node->data.opacity, 0.75f);
+        impl->sync_tree()->root_layer()->OnOpacityAnimated(0.75f);
+        PostSetNeedsCommitToMainThread();
+        break;
+      case 2:
+        EXPECT_EQ(node->data.opacity, 0.5f);
+        EndTest();
+        break;
+    }
+  }
+
+  void AfterTest() override {}
+
+ private:
+  scoped_refptr<Layer> root_;
+};
+
+SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestEffectTreeSync);
+
 // Verify damage status is updated even when the transform tree doesn't need
 // to be updated at draw time.
 class LayerTreeHostTestTransformTreeDamageIsUpdated : public LayerTreeHostTest {