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 249 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
260 if (keyframeVector[i]->composite() != AnimationEffect::CompositeRepl
ace) | 260 if (keyframeVector[i]->composite() != AnimationEffect::CompositeRepl
ace) |
261 return false; | 261 return false; |
262 } | 262 } |
263 } | 263 } |
264 return true; | 264 return true; |
265 } | 265 } |
266 | 266 |
267 void KeyframeEffectModel::trace(Visitor* visitor) | 267 void KeyframeEffectModel::trace(Visitor* visitor) |
268 { | 268 { |
269 visitor->trace(m_keyframes); | 269 visitor->trace(m_keyframes); |
| 270 visitor->trace(m_interpolationEffect); |
270 #if ENABLE_OILPAN | 271 #if ENABLE_OILPAN |
271 visitor->trace(m_keyframeGroups); | 272 visitor->trace(m_keyframeGroups); |
272 #endif | 273 #endif |
273 } | 274 } |
274 | 275 |
275 KeyframeEffectModel::PropertySpecificKeyframe::PropertySpecificKeyframe(double o
ffset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, Composit
eOperation composite) | 276 KeyframeEffectModel::PropertySpecificKeyframe::PropertySpecificKeyframe(double o
ffset, PassRefPtr<TimingFunction> easing, const AnimatableValue* value, Composit
eOperation composite) |
276 : m_offset(offset) | 277 : m_offset(offset) |
277 , m_easing(easing) | 278 , m_easing(easing) |
278 , m_composite(composite) | 279 , m_composite(composite) |
279 { | 280 { |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
334 } | 335 } |
335 | 336 |
336 void KeyframeEffectModel::PropertySpecificKeyframeGroup::trace(Visitor* visitor) | 337 void KeyframeEffectModel::PropertySpecificKeyframeGroup::trace(Visitor* visitor) |
337 { | 338 { |
338 #if ENABLE_OILPAN | 339 #if ENABLE_OILPAN |
339 visitor->trace(m_keyframes); | 340 visitor->trace(m_keyframes); |
340 #endif | 341 #endif |
341 } | 342 } |
342 | 343 |
343 } // namespace | 344 } // namespace |
OLD | NEW |