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

Unified Diff: cc/trees/property_tree.cc

Issue 2122193002: cc: transform tree UpdateSnapping before UpdateTargetSpaceTransform (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698