OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) | 2 * Copyright (C) 1999 Antti Koivisto (koivisto@kde.org) |
3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. | 3 * Copyright (C) 2004, 2005, 2006, 2007, 2008 Apple Inc. All rights reserved. |
4 * | 4 * |
5 * This library is free software; you can redistribute it and/or | 5 * This library is free software; you can redistribute it and/or |
6 * modify it under the terms of the GNU Library General Public | 6 * modify it under the terms of the GNU Library General Public |
7 * License as published by the Free Software Foundation; either | 7 * License as published by the Free Software Foundation; either |
8 * version 2 of the License, or (at your option) any later version. | 8 * version 2 of the License, or (at your option) any later version. |
9 * | 9 * |
10 * This library is distributed in the hope that it will be useful, | 10 * This library is distributed in the hope that it will be useful, |
(...skipping 18 matching lines...) Expand all Loading... |
29 | 29 |
30 void KeyframeValue::addProperties(const StylePropertySet* propertySet) | 30 void KeyframeValue::addProperties(const StylePropertySet* propertySet) |
31 { | 31 { |
32 if (!propertySet) | 32 if (!propertySet) |
33 return; | 33 return; |
34 unsigned propertyCount = propertySet->propertyCount(); | 34 unsigned propertyCount = propertySet->propertyCount(); |
35 for (unsigned i = 0; i < propertyCount; ++i) { | 35 for (unsigned i = 0; i < propertyCount; ++i) { |
36 CSSPropertyID property = propertySet->propertyAt(i).id(); | 36 CSSPropertyID property = propertySet->propertyAt(i).id(); |
37 // Timing-function within keyframes is special, because it is not animat
ed; it just | 37 // Timing-function within keyframes is special, because it is not animat
ed; it just |
38 // describes the timing function between this keyframe and the next. | 38 // describes the timing function between this keyframe and the next. |
39 if (property != CSSPropertyWebkitAnimationTimingFunction) | 39 if (property != CSSPropertyWebkitAnimationTimingFunction && property !=
CSSPropertyAnimationTimingFunction) |
40 addProperty(property); | 40 addProperty(property); |
41 } | 41 } |
42 } | 42 } |
43 | 43 |
44 KeyframeList::~KeyframeList() | 44 KeyframeList::~KeyframeList() |
45 { | 45 { |
46 clear(); | 46 clear(); |
47 } | 47 } |
48 | 48 |
49 void KeyframeList::clear() | 49 void KeyframeList::clear() |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
104 for (HashSet<CSSPropertyID>::const_iterator it = currKeyframe.proper
ties().begin(); it != currKeyframe.properties().end(); ++it) | 104 for (HashSet<CSSPropertyID>::const_iterator it = currKeyframe.proper
ties().begin(); it != currKeyframe.properties().end(); ++it) |
105 m_properties.add(*it); | 105 m_properties.add(*it); |
106 } | 106 } |
107 } else { | 107 } else { |
108 for (HashSet<CSSPropertyID>::const_iterator it = keyframe.properties().b
egin(); it != keyframe.properties().end(); ++it) | 108 for (HashSet<CSSPropertyID>::const_iterator it = keyframe.properties().b
egin(); it != keyframe.properties().end(); ++it) |
109 m_properties.add(*it); | 109 m_properties.add(*it); |
110 } | 110 } |
111 } | 111 } |
112 | 112 |
113 } // namespace WebCore | 113 } // namespace WebCore |
OLD | NEW |