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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 2105173006: cc: Clear entries from animations maps only when main thread wins (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: "DCHECK" Created 4 years, 6 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/layer_tree_host_unittest.cc
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc
index 74e73a25dccf4550cf8aa4d94b0a6b763809103c..50c0e9bbf25fdd74a398150c1fa77b83a68e10e2 100644
--- a/cc/trees/layer_tree_host_unittest.cc
+++ b/cc/trees/layer_tree_host_unittest.cc
@@ -982,6 +982,9 @@ class LayerTreeHostTestEffectTreeSync : public LayerTreeHostTest {
node->data.is_currently_animating_opacity = true;
break;
case 2:
+ node->data.is_currently_animating_opacity = true;
+ break;
+ case 3:
node->data.is_currently_animating_opacity = false;
break;
}
@@ -998,10 +1001,14 @@ class LayerTreeHostTestEffectTreeSync : public LayerTreeHostTest {
break;
case 1:
EXPECT_EQ(node->data.opacity, 0.75f);
- impl->sync_tree()->root_layer_for_testing()->OnOpacityAnimated(0.75f);
PostSetNeedsCommitToMainThread();
break;
case 2:
+ EXPECT_EQ(node->data.opacity, 0.75f);
+ impl->sync_tree()->root_layer_for_testing()->OnOpacityAnimated(0.75f);
+ PostSetNeedsCommitToMainThread();
+ break;
+ case 3:
EXPECT_EQ(node->data.opacity, 0.5f);
EndTest();
break;
@@ -1063,8 +1070,6 @@ class LayerTreeHostTestTransformTreeSync : public LayerTreeHostTest {
break;
case 1:
EXPECT_EQ(node->data.local, rotate20);
- impl->sync_tree()->root_layer_for_testing()->OnTransformAnimated(
- rotate20);
PostSetNeedsCommitToMainThread();
break;
case 2:

Powered by Google App Engine
This is Rietveld 408576698