| 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 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 94 platformTiming = new MockPlatformTiming; | 94 platformTiming = new MockPlatformTiming; |
| 95 timeline = AnimationTimeline::create(document.get(), adoptPtrWillBeNoop(
platformTiming)); | 95 timeline = AnimationTimeline::create(document.get(), adoptPtrWillBeNoop(
platformTiming)); |
| 96 ASSERT_EQ(0, timeline->currentTimeInternal()); | 96 ASSERT_EQ(0, timeline->currentTimeInternal()); |
| 97 } | 97 } |
| 98 | 98 |
| 99 virtual void TearDown() | 99 virtual void TearDown() |
| 100 { | 100 { |
| 101 document.release(); | 101 document.release(); |
| 102 element.release(); | 102 element.release(); |
| 103 timeline.release(); | 103 timeline.release(); |
| 104 #if ENABLE(OILPAN) |
| 105 Heap::collectAllGarbage(); |
| 106 #endif |
| 104 } | 107 } |
| 105 | 108 |
| 106 void updateClockAndService(double time) | 109 void updateClockAndService(double time) |
| 107 { | 110 { |
| 108 document->animationClock().updateTime(time); | 111 document->animationClock().updateTime(time); |
| 109 timeline->serviceAnimations(TimingUpdateForAnimationFrame); | 112 timeline->serviceAnimations(TimingUpdateForAnimationFrame); |
| 110 } | 113 } |
| 111 | 114 |
| 112 RefPtrWillBePersistent<Document> document; | 115 RefPtrWillBePersistent<Document> document; |
| 113 RefPtrWillBePersistent<Element> element; | 116 RefPtrWillBePersistent<Element> element; |
| (...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 | 238 |
| 236 TEST_F(AnimationAnimationTimelineTest, UseAnimationPlayerAfterTimelineDeref) | 239 TEST_F(AnimationAnimationTimelineTest, UseAnimationPlayerAfterTimelineDeref) |
| 237 { | 240 { |
| 238 RefPtrWillBeRawPtr<AnimationPlayer> player = timeline->createAnimationPlayer
(0); | 241 RefPtrWillBeRawPtr<AnimationPlayer> player = timeline->createAnimationPlayer
(0); |
| 239 timeline.clear(); | 242 timeline.clear(); |
| 240 // Test passes if this does not crash. | 243 // Test passes if this does not crash. |
| 241 player->setStartTime(0); | 244 player->setStartTime(0); |
| 242 } | 245 } |
| 243 | 246 |
| 244 } | 247 } |
| OLD | NEW |