OLD | NEW |
---|---|
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "cc/test/animation_timelines_test_common.h" | 5 #include "cc/test/animation_timelines_test_common.h" |
6 | 6 |
7 #include "base/memory/ptr_util.h" | 7 #include "base/memory/ptr_util.h" |
8 #include "cc/animation/animation_events.h" | 8 #include "cc/animation/animation_events.h" |
9 #include "cc/animation/animation_id_provider.h" | 9 #include "cc/animation/animation_id_provider.h" |
10 #include "cc/animation/animation_player.h" | 10 #include "cc/animation/animation_player.h" |
(...skipping 500 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
511 &element_animations->players_list()) | 511 &element_animations->players_list()) |
512 .GetNext() | 512 .GetNext() |
513 : nullptr; | 513 : nullptr; |
514 } | 514 } |
515 | 515 |
516 int AnimationTimelinesTest::NextTestLayerId() { | 516 int AnimationTimelinesTest::NextTestLayerId() { |
517 next_test_layer_id_++; | 517 next_test_layer_id_++; |
518 return next_test_layer_id_; | 518 return next_test_layer_id_; |
519 } | 519 } |
520 | 520 |
521 void AnimationTimelinesTest::ExpectPlayerTimelineNeedsPushProperties( | |
ajuma
2016/08/24 15:52:37
Putting this in a function rather than a macro mea
loyso (OOO)
2016/08/25 00:38:24
Failures in each particular are very rare - those
loyso (OOO)
2016/08/25 00:55:50
I can replace it with CHECK so it crashes and show
danakj
2016/08/25 01:05:59
You can return false from this function if any exp
loyso (OOO)
2016/08/25 03:59:02
Done.
| |
522 bool needs_push_properties) { | |
523 DCHECK(player_); | |
524 DCHECK(timeline_); | |
525 | |
526 EXPECT_EQ(needs_push_properties, player_->needs_push_properties()); | |
527 EXPECT_EQ(needs_push_properties, timeline_->needs_push_properties()); | |
528 if (player_->element_animations()) | |
529 EXPECT_EQ(needs_push_properties, | |
530 player_->element_animations()->needs_push_properties()); | |
531 } | |
532 | |
521 } // namespace cc | 533 } // namespace cc |
OLD | NEW |