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

Unified Diff: cc/trees/layer_tree_host_unittest_animation_timelines.cc

Issue 1472723002: CC Animations: Fix LayerTreeHostTimelinesTestSetPotentiallyAnimatingOnLacDestruction flakiness. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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/layer_tree_host_unittest_animation_timelines.cc
diff --git a/cc/trees/layer_tree_host_unittest_animation_timelines.cc b/cc/trees/layer_tree_host_unittest_animation_timelines.cc
index c95a5ca1a8af104b4c1a0c408f6ab1bee407a14e..2964748340e09ca1ab7e8d632af0d76dad77ad5b 100644
--- a/cc/trees/layer_tree_host_unittest_animation_timelines.cc
+++ b/cc/trees/layer_tree_host_unittest_animation_timelines.cc
@@ -1004,6 +1004,9 @@ class LayerTreeHostTimelinesTestSetPotentiallyAnimatingOnLacDestruction
: public LayerTreeHostTimelinesTest {
public:
void SetupTree() override {
+ prev_screen_space_transform_is_animating_ = true;
+ screen_space_transform_animation_stopped_ = false;
+
LayerTreeHostTimelinesTest::SetupTree();
AttachPlayersToTimeline();
player_->AttachLayer(layer_tree_host()->root_layer()->id());
@@ -1013,24 +1016,11 @@ class LayerTreeHostTimelinesTestSetPotentiallyAnimatingOnLacDestruction
void BeginTest() override { PostSetNeedsCommitToMainThread(); }
void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
- if (host_impl->active_tree()->source_frame_number() == 1) {
- EXPECT_TRUE(host_impl->active_tree());
- EXPECT_TRUE(host_impl->active_tree()->root_layer());
- EXPECT_TRUE(host_impl->pending_tree());
- EXPECT_TRUE(host_impl->pending_tree()->root_layer());
-
- EXPECT_EQ(2, host_impl->pending_tree()->source_frame_number());
-
- EXPECT_TRUE(host_impl->active_tree()
+ if (host_impl->pending_tree()->source_frame_number() <= 1) {
+ EXPECT_TRUE(host_impl->pending_tree()
->root_layer()
->screen_space_transform_is_animating());
- EXPECT_FALSE(host_impl->pending_tree()
- ->root_layer()
- ->screen_space_transform_is_animating());
- } else if (host_impl->active_tree()->source_frame_number() == 2) {
- EXPECT_FALSE(host_impl->active_tree()
- ->root_layer()
- ->screen_space_transform_is_animating());
+ } else {
EXPECT_FALSE(host_impl->pending_tree()
->root_layer()
->screen_space_transform_is_animating());
@@ -1047,12 +1037,47 @@ class LayerTreeHostTimelinesTestSetPotentiallyAnimatingOnLacDestruction
}
}
+ DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* host_impl,
+ LayerTreeHostImpl::FrameData* frame_data,
+ DrawResult draw_result) override {
+ if (!host_impl->active_tree())
ajuma 2015/11/23 14:25:28 Is this needed? (That is, does PrepareToDrawOnThre
loyso (OOO) 2015/11/24 00:04:25 Done.
+ return draw_result;
+
+ const bool screen_space_transform_is_animating =
+ host_impl->active_tree()
+ ->root_layer()
+ ->screen_space_transform_is_animating();
+
+ // Check that screen_space_transform_is_animating changes only once.
+ if (screen_space_transform_is_animating &&
+ prev_screen_space_transform_is_animating_)
+ EXPECT_FALSE(screen_space_transform_animation_stopped_);
+ if (!screen_space_transform_is_animating &&
+ prev_screen_space_transform_is_animating_) {
+ EXPECT_FALSE(screen_space_transform_animation_stopped_);
+ screen_space_transform_animation_stopped_ = true;
+ }
+ if (!screen_space_transform_is_animating &&
+ !prev_screen_space_transform_is_animating_)
+ EXPECT_TRUE(screen_space_transform_animation_stopped_);
+
+ prev_screen_space_transform_is_animating_ =
+ screen_space_transform_is_animating;
+
+ return draw_result;
+ }
+
void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
if (host_impl->active_tree()->source_frame_number() >= 2)
EndTest();
}
- void AfterTest() override {}
+ void AfterTest() override {
+ EXPECT_TRUE(screen_space_transform_animation_stopped_);
+ }
+
+ bool prev_screen_space_transform_is_animating_;
+ bool screen_space_transform_animation_stopped_;
};
MULTI_THREAD_TEST_F(
« 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