OLD | NEW |
1 /* | 1 /* |
2 * Copyright (c) 2013, Google Inc. All rights reserved. | 2 * Copyright (c) 2013, Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
45 } | 45 } |
46 | 46 |
47 void updateInheritedTime(double time) | 47 void updateInheritedTime(double time) |
48 { | 48 { |
49 TimedItem::updateInheritedTime(time); | 49 TimedItem::updateInheritedTime(time); |
50 } | 50 } |
51 | 51 |
52 void updateChildrenAndEffects(bool wasActiveOrInEffect) const FINAL OVERRIDE
{ | 52 void updateChildrenAndEffects(bool wasActiveOrInEffect) const FINAL OVERRIDE
{ |
53 } | 53 } |
54 | 54 |
| 55 void willDetach() { } |
| 56 |
55 private: | 57 private: |
56 TestTimedItem(const Timing& specified) | 58 TestTimedItem(const Timing& specified) |
57 : TimedItem(specified) | 59 : TimedItem(specified) |
58 { | 60 { |
59 } | 61 } |
60 }; | 62 }; |
61 | 63 |
62 TEST(TimedItem, Sanity) | 64 TEST(TimedItem, Sanity) |
63 { | 65 { |
64 Timing timing; | 66 Timing timing; |
(...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
487 | 489 |
488 timedItem->updateInheritedTime(0); | 490 timedItem->updateInheritedTime(0); |
489 ASSERT_EQ(1, timedItem->currentIteration()); | 491 ASSERT_EQ(1, timedItem->currentIteration()); |
490 ASSERT_EQ(1, timedItem->timeFraction()); | 492 ASSERT_EQ(1, timedItem->timeFraction()); |
491 | 493 |
492 timedItem->updateInheritedTime(1); | 494 timedItem->updateInheritedTime(1); |
493 ASSERT_EQ(1, timedItem->currentIteration()); | 495 ASSERT_EQ(1, timedItem->currentIteration()); |
494 ASSERT_EQ(1, timedItem->timeFraction()); | 496 ASSERT_EQ(1, timedItem->timeFraction()); |
495 } | 497 } |
496 } | 498 } |
OLD | NEW |