OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2007 Apple Inc. All rights reserved. | 2 * Copyright (C) 2007 Apple 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 | 5 * modification, are permitted provided that the following conditions |
6 * are met: | 6 * are met: |
7 * | 7 * |
8 * 1. Redistributions of source code must retain the above copyright | 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright | 10 * 2. Redistributions in binary form must reproduce the above copyright |
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
215 if (!animatedStyle) | 215 if (!animatedStyle) |
216 animatedStyle = RenderStyle::clone(m_object->style()); | 216 animatedStyle = RenderStyle::clone(m_object->style()); |
217 | 217 |
218 HashSet<int>::const_iterator endProperties = m_keyframes.endProperties(); | 218 HashSet<int>::const_iterator endProperties = m_keyframes.endProperties(); |
219 for (HashSet<int>::const_iterator it = m_keyframes.beginProperties(); it !=
endProperties; ++it) { | 219 for (HashSet<int>::const_iterator it = m_keyframes.beginProperties(); it !=
endProperties; ++it) { |
220 int property = *it; | 220 int property = *it; |
221 | 221 |
222 // Get the from/to styles and progress between | 222 // Get the from/to styles and progress between |
223 const RenderStyle* fromStyle = 0; | 223 const RenderStyle* fromStyle = 0; |
224 const RenderStyle* toStyle = 0; | 224 const RenderStyle* toStyle = 0; |
225 double progress; | 225 double progress = 0; |
226 fetchIntervalEndpointsForProperty(property, fromStyle, toStyle, progress
); | 226 fetchIntervalEndpointsForProperty(property, fromStyle, toStyle, progress
); |
227 | 227 |
228 blendProperties(this, property, animatedStyle.get(), fromStyle, toStyle,
progress); | 228 blendProperties(this, property, animatedStyle.get(), fromStyle, toStyle,
progress); |
229 } | 229 } |
230 } | 230 } |
231 | 231 |
232 bool KeyframeAnimation::hasAnimationForProperty(int property) const | 232 bool KeyframeAnimation::hasAnimationForProperty(int property) const |
233 { | 233 { |
234 // FIXME: why not just m_keyframes.containsProperty()? | 234 // FIXME: why not just m_keyframes.containsProperty()? |
235 HashSet<int>::const_iterator end = m_keyframes.endProperties(); | 235 HashSet<int>::const_iterator end = m_keyframes.endProperties(); |
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
448 | 448 |
449 if (acceleratedPropertiesOnly) { | 449 if (acceleratedPropertiesOnly) { |
450 bool isLooping; | 450 bool isLooping; |
451 getTimeToNextEvent(t, isLooping); | 451 getTimeToNextEvent(t, isLooping); |
452 } | 452 } |
453 #endif | 453 #endif |
454 return t; | 454 return t; |
455 } | 455 } |
456 | 456 |
457 } // namespace WebCore | 457 } // namespace WebCore |
OLD | NEW |