| Index: cc/test/animation_timelines_test_common.h
|
| diff --git a/cc/test/animation_timelines_test_common.h b/cc/test/animation_timelines_test_common.h
|
| index d020257b2eadbd8a339c2d110852e1ef21b63ab2..5470b693bf7723f403f79492b7d35518ee174e67 100644
|
| --- a/cc/test/animation_timelines_test_common.h
|
| +++ b/cc/test/animation_timelines_test_common.h
|
| @@ -79,6 +79,20 @@ class TestLayer {
|
| has_potential_opacity_animation_ = is_animating;
|
| }
|
|
|
| + bool filter_is_currently_animating() const {
|
| + return filter_is_currently_animating_;
|
| + }
|
| + void set_filter_is_currently_animating(bool is_animating) {
|
| + filter_is_currently_animating_ = is_animating;
|
| + }
|
| +
|
| + bool has_potential_filter_animation() const {
|
| + return has_potential_filter_animation_;
|
| + }
|
| + void set_has_potential_filter_animation(bool is_animating) {
|
| + has_potential_filter_animation_ = is_animating;
|
| + }
|
| +
|
| bool is_property_mutated(TargetProperty::Type property) const {
|
| return mutated_properties_[property];
|
| }
|
| @@ -94,6 +108,8 @@ class TestLayer {
|
| bool transform_is_currently_animating_;
|
| bool has_potential_opacity_animation_;
|
| bool opacity_is_currently_animating_;
|
| + bool has_potential_filter_animation_;
|
| + bool filter_is_currently_animating_;
|
|
|
| bool mutated_properties_[TargetProperty::LAST_TARGET_PROPERTY + 1];
|
| };
|
| @@ -138,6 +154,11 @@ class TestHostClient : public MutatorHostClient {
|
| AnimationChangeType change_type,
|
| bool is_animating) override;
|
|
|
| + void ElementFilterIsAnimatingChanged(ElementId element_id,
|
| + ElementListType list_type,
|
| + AnimationChangeType change_type,
|
| + bool is_animating) override;
|
| +
|
| void ScrollOffsetAnimationFinished() override {}
|
|
|
| void SetScrollOffsetForAnimation(const gfx::ScrollOffset& scroll_offset);
|
| @@ -174,6 +195,10 @@ class TestHostClient : public MutatorHostClient {
|
| ElementListType list_type) const;
|
| bool GetHasPotentialOpacityAnimation(ElementId element_id,
|
| ElementListType list_type) const;
|
| + bool GetHasPotentialFilterAnimation(ElementId element_id,
|
| + ElementListType list_type) const;
|
| + bool GetFilterIsCurrentlyAnimating(ElementId element_id,
|
| + ElementListType list_type) const;
|
|
|
| void ExpectFilterPropertyMutated(ElementId element_id,
|
| ElementListType list_type,
|
|
|