| 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 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 69 timeline->resetForTesting(); | 69 timeline->resetForTesting(); |
| 70 ASSERT_EQ(0, timeline->currentTimeInternal()); | 70 ASSERT_EQ(0, timeline->currentTimeInternal()); |
| 71 } | 71 } |
| 72 | 72 |
| 73 virtual void TearDown() | 73 virtual void TearDown() |
| 74 { | 74 { |
| 75 document.release(); | 75 document.release(); |
| 76 element.release(); | 76 element.release(); |
| 77 timeline.release(); | 77 timeline.release(); |
| 78 #if ENABLE(OILPAN) | 78 #if ENABLE(OILPAN) |
| 79 Heap::collectAllGarbage(); | 79 ThreadHeap::collectAllGarbage(); |
| 80 #endif | 80 #endif |
| 81 } | 81 } |
| 82 | 82 |
| 83 void updateClockAndService(double time) | 83 void updateClockAndService(double time) |
| 84 { | 84 { |
| 85 document->animationClock().updateTime(time); | 85 document->animationClock().updateTime(time); |
| 86 document->compositorPendingAnimations().update(false); | 86 document->compositorPendingAnimations().update(false); |
| 87 timeline->serviceAnimations(TimingUpdateForAnimationFrame); | 87 timeline->serviceAnimations(TimingUpdateForAnimationFrame); |
| 88 timeline->scheduleNextService(); | 88 timeline->scheduleNextService(); |
| 89 } | 89 } |
| (...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 | 355 |
| 356 TEST_F(AnimationAnimationTimelineTest, UseAnimationAfterTimelineDeref) | 356 TEST_F(AnimationAnimationTimelineTest, UseAnimationAfterTimelineDeref) |
| 357 { | 357 { |
| 358 Animation* animation = timeline->play(0); | 358 Animation* animation = timeline->play(0); |
| 359 timeline.clear(); | 359 timeline.clear(); |
| 360 // Test passes if this does not crash. | 360 // Test passes if this does not crash. |
| 361 animation->setStartTime(0); | 361 animation->setStartTime(0); |
| 362 } | 362 } |
| 363 | 363 |
| 364 } // namespace blink | 364 } // namespace blink |
| OLD | NEW |