Chromium Code Reviews| 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 #ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 5 #ifndef CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| 6 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 6 #define CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <unordered_map> | 9 #include <unordered_map> |
| 10 | 10 |
| (...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 TargetProperty::Type target_property, | 237 TargetProperty::Type target_property, |
| 238 int group) override; | 238 int group) override; |
| 239 void NotifyAnimationAborted(base::TimeTicks monotonic_time, | 239 void NotifyAnimationAborted(base::TimeTicks monotonic_time, |
| 240 TargetProperty::Type target_property, | 240 TargetProperty::Type target_property, |
| 241 int group) override; | 241 int group) override; |
| 242 void NotifyAnimationTakeover(base::TimeTicks monotonic_time, | 242 void NotifyAnimationTakeover(base::TimeTicks monotonic_time, |
| 243 TargetProperty::Type target_property, | 243 TargetProperty::Type target_property, |
| 244 double animation_start_time, | 244 double animation_start_time, |
| 245 std::unique_ptr<AnimationCurve> curve) override; | 245 std::unique_ptr<AnimationCurve> curve) override; |
| 246 | 246 |
| 247 bool started() { return started_; } | 247 int started() { return started_; } |
|
ajuma
2016/07/28 18:36:40
Please rename the variables and getters so its cle
| |
| 248 | 248 |
| 249 bool finished() { return finished_; } | 249 int finished() { return finished_; } |
| 250 | 250 |
| 251 bool aborted() { return aborted_; } | 251 int aborted() { return aborted_; } |
| 252 | 252 |
| 253 bool takeover() { return takeover_; } | 253 int takeover() { return takeover_; } |
| 254 | 254 |
| 255 base::TimeTicks start_time() { return start_time_; } | 255 base::TimeTicks start_time() { return start_time_; } |
| 256 | 256 |
| 257 private: | 257 private: |
| 258 bool started_; | 258 int started_; |
| 259 bool finished_; | 259 int finished_; |
| 260 bool aborted_; | 260 int aborted_; |
| 261 bool takeover_; | 261 int takeover_; |
| 262 base::TimeTicks start_time_; | 262 base::TimeTicks start_time_; |
| 263 }; | 263 }; |
| 264 | 264 |
| 265 class AnimationTimelinesTest : public testing::Test { | 265 class AnimationTimelinesTest : public testing::Test { |
| 266 public: | 266 public: |
| 267 AnimationTimelinesTest(); | 267 AnimationTimelinesTest(); |
| 268 ~AnimationTimelinesTest() override; | 268 ~AnimationTimelinesTest() override; |
| 269 | 269 |
| 270 protected: | 270 protected: |
| 271 void SetUp() override; | 271 void SetUp() override; |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 309 scoped_refptr<AnimationTimeline> timeline_; | 309 scoped_refptr<AnimationTimeline> timeline_; |
| 310 scoped_refptr<AnimationPlayer> player_; | 310 scoped_refptr<AnimationPlayer> player_; |
| 311 | 311 |
| 312 scoped_refptr<AnimationTimeline> timeline_impl_; | 312 scoped_refptr<AnimationTimeline> timeline_impl_; |
| 313 scoped_refptr<AnimationPlayer> player_impl_; | 313 scoped_refptr<AnimationPlayer> player_impl_; |
| 314 }; | 314 }; |
| 315 | 315 |
| 316 } // namespace cc | 316 } // namespace cc |
| 317 | 317 |
| 318 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ | 318 #endif // CC_TEST_ANIMATION_TIMELINES_TEST_COMMON_H_ |
| OLD | NEW |