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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
48 PropertySet KeyframeEffectModelBase::properties() const | 48 PropertySet KeyframeEffectModelBase::properties() const |
49 { | 49 { |
50 PropertySet result; | 50 PropertySet result; |
51 for (const auto& keyframe : m_keyframes) { | 51 for (const auto& keyframe : m_keyframes) { |
52 for (const auto& property : keyframe->properties()) | 52 for (const auto& property : keyframe->properties()) |
53 result.add(property); | 53 result.add(property); |
54 } | 54 } |
55 return result; | 55 return result; |
56 } | 56 } |
57 | 57 |
58 void KeyframeEffectModelBase::setFrames(KeyframeVector& keyframes) | |
59 { | |
60 // FIXME: Should also notify/invalidate the player | |
dstockwell
2015/03/26 22:56:16
TODO(samli):
samli
2015/03/30 00:22:55
Done.
| |
61 m_keyframes = keyframes; | |
62 m_keyframeGroups = nullptr; | |
63 m_interpolationEffect = nullptr; | |
64 } | |
65 | |
58 void KeyframeEffectModelBase::sample(int iteration, double fraction, double iter ationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolat ion>>>& result) const | 66 void KeyframeEffectModelBase::sample(int iteration, double fraction, double iter ationDuration, OwnPtrWillBeRawPtr<WillBeHeapVector<RefPtrWillBeMember<Interpolat ion>>>& result) const |
59 { | 67 { |
60 ASSERT(iteration >= 0); | 68 ASSERT(iteration >= 0); |
61 ASSERT(!isNull(fraction)); | 69 ASSERT(!isNull(fraction)); |
62 ensureKeyframeGroups(); | 70 ensureKeyframeGroups(); |
63 ensureInterpolationEffect(); | 71 ensureInterpolationEffect(); |
64 | 72 |
65 return m_interpolationEffect->getActiveInterpolations(fraction, iterationDur ation, result); | 73 return m_interpolationEffect->getActiveInterpolations(fraction, iterationDur ation, result); |
66 } | 74 } |
67 | 75 |
(...skipping 200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
268 } | 276 } |
269 | 277 |
270 DEFINE_TRACE(KeyframeEffectModelBase::PropertySpecificKeyframeGroup) | 278 DEFINE_TRACE(KeyframeEffectModelBase::PropertySpecificKeyframeGroup) |
271 { | 279 { |
272 #if ENABLE(OILPAN) | 280 #if ENABLE(OILPAN) |
273 visitor->trace(m_keyframes); | 281 visitor->trace(m_keyframes); |
274 #endif | 282 #endif |
275 } | 283 } |
276 | 284 |
277 } // namespace | 285 } // namespace |
OLD | NEW |