| Index: cc/trees/property_tree.cc
|
| diff --git a/cc/trees/property_tree.cc b/cc/trees/property_tree.cc
|
| index 9f8765601db5fb35a14d5131a2db8970a0e76fb7..7b10d1c695c99c9430e98da21f7a1fdb2019723a 100644
|
| --- a/cc/trees/property_tree.cc
|
| +++ b/cc/trees/property_tree.cc
|
| @@ -789,9 +789,9 @@ void TransformTree::UpdateTransforms(int id) {
|
| UndoSnapping(node);
|
| UpdateScreenSpaceTransform(node, parent_node, target_node);
|
| UpdateSublayerScale(node);
|
| - UpdateTargetSpaceTransform(node, target_node);
|
| UpdateAnimationProperties(node, parent_node);
|
| UpdateSnapping(node);
|
| + UpdateTargetSpaceTransform(node, target_node);
|
| UpdateNodeAndAncestorsHaveIntegerTranslations(node, parent_node);
|
| UpdateTransformChanged(node, parent_node, source_node);
|
| UpdateNodeAndAncestorsAreAnimatedOrInvertible(node, parent_node);
|
| @@ -1075,12 +1075,6 @@ void TransformTree::UpdateSnapping(TransformNode* node) {
|
| gfx::Transform from_screen = FromScreen(node->id);
|
| from_screen.matrix().postTranslate(-translation.x(), -translation.y(), 0);
|
| SetFromScreen(node->id, from_screen);
|
| - gfx::Transform to_target = ToTarget(node->id);
|
| - to_target.Translate(translation.x(), translation.y());
|
| - SetToTarget(node->id, to_target);
|
| - gfx::Transform from_target = FromTarget(node->id);
|
| - from_target.matrix().postTranslate(-translation.x(), -translation.y(), 0);
|
| - SetFromTarget(node->id, from_target);
|
| node->data.scroll_snap = translation;
|
| }
|
|
|
|
|