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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
265 EXPECT_EQ(to->offset(), 1.0); | 265 EXPECT_EQ(to->offset(), 1.0); |
266 } | 266 } |
267 if (!HasFatalFailure()) { | 267 if (!HasFatalFailure()) { |
268 return AnimatableValueKeyframeEffectModel::create(frames); | 268 return AnimatableValueKeyframeEffectModel::create(frames); |
269 } | 269 } |
270 return nullptr; | 270 return nullptr; |
271 } | 271 } |
272 | 272 |
273 void simulateFrame(double time) { | 273 void simulateFrame(double time) { |
274 m_document->animationClock().updateTime(time); | 274 m_document->animationClock().updateTime(time); |
275 m_document->compositorPendingAnimations().update(false); | 275 m_document->compositorPendingAnimations().update( |
| 276 Optional<CompositorElementIdSet>(), false); |
276 m_timeline->serviceAnimations(TimingUpdateForAnimationFrame); | 277 m_timeline->serviceAnimations(TimingUpdateForAnimationFrame); |
277 } | 278 } |
278 | 279 |
279 std::unique_ptr<CompositorAnimation> convertToCompositorAnimation( | 280 std::unique_ptr<CompositorAnimation> convertToCompositorAnimation( |
280 AnimatableValueKeyframeEffectModel& effect, | 281 AnimatableValueKeyframeEffectModel& effect, |
281 double playerPlaybackRate) { | 282 double playerPlaybackRate) { |
282 Vector<std::unique_ptr<CompositorAnimation>> result; | 283 Vector<std::unique_ptr<CompositorAnimation>> result; |
283 getAnimationOnCompositor(m_timing, effect, result, playerPlaybackRate); | 284 getAnimationOnCompositor(m_timing, effect, result, playerPlaybackRate); |
284 DCHECK_EQ(1U, result.size()); | 285 DCHECK_EQ(1U, result.size()); |
285 return std::move(result[0]); | 286 return std::move(result[0]); |
(...skipping 1010 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1296 | 1297 |
1297 // Clearing the effect node entirely should also produce false. | 1298 // Clearing the effect node entirely should also produce false. |
1298 properties.clearEffect(); | 1299 properties.clearEffect(); |
1299 EXPECT_FALSE(CompositorAnimations::canStartAnimationOnCompositor(*element)); | 1300 EXPECT_FALSE(CompositorAnimations::canStartAnimationOnCompositor(*element)); |
1300 | 1301 |
1301 element->setLayoutObject(nullptr); | 1302 element->setLayoutObject(nullptr); |
1302 LayoutObjectProxy::dispose(layoutObject); | 1303 LayoutObjectProxy::dispose(layoutObject); |
1303 } | 1304 } |
1304 | 1305 |
1305 } // namespace blink | 1306 } // namespace blink |
OLD | NEW |