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

Unified Diff: cc/trees/property_tree.cc

Issue 2762123004: cc: LayerTreeHostImpl uses element id to tick animations (Closed)
Patch Set: remove accidental debug print Created 3 years, 9 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/property_tree.cc
diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
index 5733ef658d32ac72a573af0a431e9ded2fb19653..947cd88dbea2d816e419bad852b3a187b709f65f 100644
--- a/cc/trees/property_tree.cc
+++ b/cc/trees/property_tree.cc
@@ -186,12 +186,10 @@ TransformNode* TransformTree::FindNodeFromElementId(ElementId id) {
return Node(iterator->second);
}
-void TransformTree::OnTransformAnimated(const gfx::Transform& transform,
- int id,
- LayerTreeImpl* layer_tree_impl) {
- TransformNode* node = Node(id);
- layer_tree_impl->AddToTransformAnimationsMap(node->owning_layer_id,
- transform);
+void TransformTree::OnTransformAnimated(ElementId element_id,
+ const gfx::Transform& transform) {
+ TransformNode* node = FindNodeFromElementId(element_id);
+ DCHECK(node);
if (node->local == transform) {
return;
}
@@ -200,7 +198,6 @@ void TransformTree::OnTransformAnimated(const gfx::Transform& transform,
node->transform_changed = true;
property_trees()->changed = true;
set_needs_update(true);
- layer_tree_impl->set_needs_update_draw_properties();
}
bool TransformTree::NeedsSourceToParentUpdate(TransformNode* node) {
@@ -865,32 +862,25 @@ EffectNode* EffectTree::FindNodeFromElementId(ElementId id) {
return Node(iterator->second);
}
-void EffectTree::OnOpacityAnimated(float opacity,
- int id,
- LayerTreeImpl* layer_tree_impl) {
- EffectNode* node = Node(id);
- layer_tree_impl->AddToOpacityAnimationsMap(node->owning_layer_id, opacity);
+void EffectTree::OnOpacityAnimated(ElementId id, float opacity) {
+ EffectNode* node = FindNodeFromElementId(id);
if (node->opacity == opacity)
return;
node->opacity = opacity;
node->effect_changed = true;
property_trees()->changed = true;
property_trees()->effect_tree.set_needs_update(true);
- layer_tree_impl->set_needs_update_draw_properties();
}
-void EffectTree::OnFilterAnimated(const FilterOperations& filters,
- int id,
- LayerTreeImpl* layer_tree_impl) {
- EffectNode* node = Node(id);
- layer_tree_impl->AddToFilterAnimationsMap(node->owning_layer_id, filters);
+void EffectTree::OnFilterAnimated(ElementId id,
+ const FilterOperations& filters) {
+ EffectNode* node = FindNodeFromElementId(id);
if (node->filters == filters)
return;
node->filters = filters;
node->effect_changed = true;
property_trees()->changed = true;
property_trees()->effect_tree.set_needs_update(true);
- layer_tree_impl->set_needs_update_draw_properties();
}
void EffectTree::UpdateEffects(int id) {

Powered by Google App Engine
This is Rietveld 408576698