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 | 69 |
70 virtual void TearDown() { | 70 virtual void TearDown() { |
71 document.release(); | 71 document.release(); |
72 element.release(); | 72 element.release(); |
73 timeline.release(); | 73 timeline.release(); |
74 ThreadState::current()->collectAllGarbage(); | 74 ThreadState::current()->collectAllGarbage(); |
75 } | 75 } |
76 | 76 |
77 void updateClockAndService(double time) { | 77 void updateClockAndService(double time) { |
78 document->animationClock().updateTime(time); | 78 document->animationClock().updateTime(time); |
79 document->compositorPendingAnimations().update(false); | 79 document->compositorPendingAnimations().update( |
| 80 Optional<CompositorElementIdSet>(), false); |
80 timeline->serviceAnimations(TimingUpdateForAnimationFrame); | 81 timeline->serviceAnimations(TimingUpdateForAnimationFrame); |
81 timeline->scheduleNextService(); | 82 timeline->scheduleNextService(); |
82 } | 83 } |
83 | 84 |
84 std::unique_ptr<DummyPageHolder> pageHolder; | 85 std::unique_ptr<DummyPageHolder> pageHolder; |
85 Persistent<Document> document; | 86 Persistent<Document> document; |
86 Persistent<Element> element; | 87 Persistent<Element> element; |
87 Persistent<AnimationTimeline> timeline; | 88 Persistent<AnimationTimeline> timeline; |
88 Timing timing; | 89 Timing timing; |
89 Persistent<MockPlatformTiming> platformTiming; | 90 Persistent<MockPlatformTiming> platformTiming; |
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
332 } | 333 } |
333 | 334 |
334 TEST_F(AnimationAnimationTimelineTest, UseAnimationAfterTimelineDeref) { | 335 TEST_F(AnimationAnimationTimelineTest, UseAnimationAfterTimelineDeref) { |
335 Animation* animation = timeline->play(0); | 336 Animation* animation = timeline->play(0); |
336 timeline.clear(); | 337 timeline.clear(); |
337 // Test passes if this does not crash. | 338 // Test passes if this does not crash. |
338 animation->setStartTime(0); | 339 animation->setStartTime(0); |
339 } | 340 } |
340 | 341 |
341 } // namespace blink | 342 } // namespace blink |
OLD | NEW |