cc : Use transform node data to determine which transform wins at commit

cc/trees/layer_tree_impl.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_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 482 matching lines @@
     layers.scroll = nullptr;
 
   if (!layers.main && !layers.scroll)
     element_layers_map_.erase(layer->element_id());
 }
 
 void LayerTreeImpl::AddToOpacityAnimationsMap(int id, float opacity) {
   opacity_animations_map_[id] = opacity;
 }
 
+void LayerTreeImpl::AddToTransformAnimationsMap(int id,
+                                                gfx::Transform transform) {
+  transform_animations_map_[id] = transform;
+}
+
 LayerTreeImpl::ElementLayers LayerTreeImpl::GetMutableLayers(
     uint64_t element_id) {
   auto iter = element_layers_map_.find(element_id);
   if (iter == element_layers_map_.end())
     return ElementLayers();
 
   return iter->second;
 }
 
 LayerImpl* LayerTreeImpl::InnerViewportContainerLayer() const {
@@ skipping 59 matching lines @@
 void LayerTreeImpl::UpdatePropertyTreeScrollingAndAnimationFromMainThread() {
   // TODO(enne): This should get replaced by pulling out scrolling and
   // animations into their own trees.  Then scrolls and animations would have
   // their own ways of synchronizing across commits.  This occurs to push
   // updates from scrolling deltas on the compositor thread that have occurred
   // after begin frame and updates from animations that have ticked since begin
   // frame to a newly-committed property tree.
   if (!root_layer())
     return;
   for (auto& layer_id_to_opacity : opacity_animations_map_) {
-    if (LayerImpl* layer = LayerById(layer_id_to_opacity.first)) {
-      EffectNode* node =
-          property_trees_.effect_tree.Node(layer->effect_tree_index());
-      if (node->owner_id != layer->id() ||
-          !node->data.is_currently_animating_opacity)
+    const int id = layer_id_to_opacity.first;
+    if (property_trees_.IsInIdToIndexMap(PropertyTrees::TreeType::EFFECT, id)) {
+      EffectNode* node = property_trees_.effect_tree.Node(
+          property_trees_.effect_id_to_index_map[id]);
+      if (!node->data.is_currently_animating_opacity ||
+          node->data.opacity == layer_id_to_opacity.second)
         continue;
       node->data.opacity = layer_id_to_opacity.second;
       property_trees_.effect_tree.set_needs_update(true);
     }
   }
   opacity_animations_map_.clear();
+
+  for (auto& layer_id_to_transform : transform_animations_map_) {
+    const int id = layer_id_to_transform.first;
+    if (property_trees_.IsInIdToIndexMap(PropertyTrees::TreeType::TRANSFORM,
+                                         id)) {
+      TransformNode* node = property_trees_.transform_tree.Node(
+          property_trees_.transform_id_to_index_map[id]);
+      if (!node->data.is_currently_animating ||
+          node->data.local == layer_id_to_transform.second)
+        continue;
+      node->data.local = layer_id_to_transform.second;
+      node->data.needs_local_transform_update = true;
+      property_trees_.transform_tree.set_needs_update(true);
+    }
+  }
+  transform_animations_map_.clear();
+
   LayerTreeHostCommon::CallFunctionForEveryLayer(this, [](LayerImpl* layer) {
     layer->UpdatePropertyTreeForScrollingAndAnimationIfNeeded();
   });
 }
 
 void LayerTreeImpl::SetPageScaleOnActiveTree(float active_page_scale) {
   DCHECK(IsActiveTree());
   if (page_scale_factor()->SetCurrent(
           ClampPageScaleFactorToLimits(active_page_scale))) {
     DidUpdatePageScale();
@@ skipping 1428 matching lines @@
 }
 
 void LayerTreeImpl::ResetAllChangeTracking() {
   layers_that_should_push_properties_.clear();
   for (auto* layer : *this)
     layer->ResetChangeTracking();
   property_trees_.ResetAllChangeTracking();
 }
 
 }  // namespace cc