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 10 matching lines...) Expand all Loading... |
21 | 21 |
22 #include "config.h" | 22 #include "config.h" |
23 #include "core/rendering/style/KeyframeList.h" | 23 #include "core/rendering/style/KeyframeList.h" |
24 | 24 |
25 #include "core/animation/Animation.h" | 25 #include "core/animation/Animation.h" |
26 #include "core/css/StylePropertySet.h" | 26 #include "core/css/StylePropertySet.h" |
27 #include "core/rendering/RenderObject.h" | 27 #include "core/rendering/RenderObject.h" |
28 | 28 |
29 namespace WebCore { | 29 namespace WebCore { |
30 | 30 |
31 void KeyframeValue::addProperties(const StylePropertySet* propertySet) | |
32 { | |
33 if (!propertySet) | |
34 return; | |
35 unsigned propertyCount = propertySet->propertyCount(); | |
36 for (unsigned i = 0; i < propertyCount; ++i) { | |
37 CSSPropertyID property = propertySet->propertyAt(i).id(); | |
38 // Timing-function within keyframes is special, because it is not animat
ed; it just | |
39 // describes the timing function between this keyframe and the next. | |
40 if (property != CSSPropertyWebkitAnimationTimingFunction && property !=
CSSPropertyAnimationTimingFunction) | |
41 addProperty(property); | |
42 } | |
43 } | |
44 | |
45 TimingFunction* KeyframeValue::timingFunction(const RenderStyle& keyframeStyle) | 31 TimingFunction* KeyframeValue::timingFunction(const RenderStyle& keyframeStyle) |
46 { | 32 { |
47 const CSSAnimationDataList* animations = keyframeStyle.animations(); | 33 const CSSAnimationDataList* animations = keyframeStyle.animations(); |
48 ASSERT(animations && !animations->isEmpty()); | 34 ASSERT(animations && !animations->isEmpty()); |
49 return animations->animation(0)->timingFunction(); | 35 return animations->animation(0)->timingFunction(); |
50 } | 36 } |
51 | 37 |
52 KeyframeList::~KeyframeList() | 38 KeyframeList::~KeyframeList() |
53 { | 39 { |
54 clear(); | 40 clear(); |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 for (HashSet<CSSPropertyID>::const_iterator it = currKeyframe.proper
ties().begin(); it != currKeyframe.properties().end(); ++it) | 79 for (HashSet<CSSPropertyID>::const_iterator it = currKeyframe.proper
ties().begin(); it != currKeyframe.properties().end(); ++it) |
94 m_properties.add(*it); | 80 m_properties.add(*it); |
95 } | 81 } |
96 } else { | 82 } else { |
97 for (HashSet<CSSPropertyID>::const_iterator it = keyframe.properties().b
egin(); it != keyframe.properties().end(); ++it) | 83 for (HashSet<CSSPropertyID>::const_iterator it = keyframe.properties().b
egin(); it != keyframe.properties().end(); ++it) |
98 m_properties.add(*it); | 84 m_properties.add(*it); |
99 } | 85 } |
100 } | 86 } |
101 | 87 |
102 } // namespace WebCore | 88 } // namespace WebCore |
OLD | NEW |