| 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, |
| 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 13 * Library General Public License for more details. | 13 * Library General Public License for more details. |
| 14 * | 14 * |
| 15 * You should have received a copy of the GNU Library General Public License | 15 * You should have received a copy of the GNU Library General Public License |
| 16 * along with this library; see the file COPYING.LIB. If not, write to | 16 * along with this library; see the file COPYING.LIB. If not, write to |
| 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | 17 * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
| 18 * Boston, MA 02110-1301, USA. | 18 * Boston, MA 02110-1301, USA. |
| 19 * | 19 * |
| 20 */ | 20 */ |
| 21 | 21 |
| 22 #include "config.h" | 22 #include "config.h" |
| 23 #include "core/platform/animation/CSSAnimationDataList.h" | 23 #include "core/platform/animation/StyleAnimationDataList.h" |
| 24 | 24 |
| 25 namespace WebCore { | 25 namespace WebCore { |
| 26 | 26 |
| 27 #define FILL_UNSET_PROPERTY(test, propGet, propSet) \ | 27 #define FILL_UNSET_PROPERTY(test, propGet, propSet) \ |
| 28 for (i = 0; i < size() && animation(i)->test(); ++i) { } \ | 28 for (i = 0; i < size() && animation(i)->test(); ++i) { } \ |
| 29 if (i < size() && i != 0) { \ | 29 if (i < size() && i != 0) { \ |
| 30 for (size_t j = 0; i < size(); ++i, ++j) \ | 30 for (size_t j = 0; i < size(); ++i, ++j) \ |
| 31 animation(i)->propSet(animation(j)->propGet()); \ | 31 animation(i)->propSet(animation(j)->propGet()); \ |
| 32 } | 32 } |
| 33 | 33 |
| 34 CSSAnimationDataList::CSSAnimationDataList(const CSSAnimationDataList& o) | 34 StyleAnimationDataList::StyleAnimationDataList(const StyleAnimationDataList& o) |
| 35 { | 35 { |
| 36 for (size_t i = 0; i < o.size(); ++i) | 36 for (size_t i = 0; i < o.size(); ++i) |
| 37 m_animations.append(CSSAnimationData::create(o.animation(i))); | 37 m_animations.append(StyleAnimationData::create(o.animation(i))); |
| 38 } | 38 } |
| 39 | 39 |
| 40 void CSSAnimationDataList::fillUnsetProperties() | 40 void StyleAnimationDataList::fillUnsetProperties() |
| 41 { | 41 { |
| 42 size_t i; | 42 size_t i; |
| 43 FILL_UNSET_PROPERTY(isDelaySet, delay, setDelay); | 43 FILL_UNSET_PROPERTY(isDelaySet, delay, setDelay); |
| 44 FILL_UNSET_PROPERTY(isDirectionSet, direction, setDirection); | 44 FILL_UNSET_PROPERTY(isDirectionSet, direction, setDirection); |
| 45 FILL_UNSET_PROPERTY(isDurationSet, duration, setDuration); | 45 FILL_UNSET_PROPERTY(isDurationSet, duration, setDuration); |
| 46 FILL_UNSET_PROPERTY(isFillModeSet, fillMode, setFillMode); | 46 FILL_UNSET_PROPERTY(isFillModeSet, fillMode, setFillMode); |
| 47 FILL_UNSET_PROPERTY(isIterationCountSet, iterationCount, setIterationCount); | 47 FILL_UNSET_PROPERTY(isIterationCountSet, iterationCount, setIterationCount); |
| 48 FILL_UNSET_PROPERTY(isPlayStateSet, playState, setPlayState); | 48 FILL_UNSET_PROPERTY(isPlayStateSet, playState, setPlayState); |
| 49 FILL_UNSET_PROPERTY(isNameSet, name, setName); | 49 FILL_UNSET_PROPERTY(isNameSet, name, setName); |
| 50 FILL_UNSET_PROPERTY(isTimingFunctionSet, timingFunction, setTimingFunction); | 50 FILL_UNSET_PROPERTY(isTimingFunctionSet, timingFunction, setTimingFunction); |
| 51 FILL_UNSET_PROPERTY(isPropertySet, property, setProperty); | 51 FILL_UNSET_PROPERTY(isPropertySet, property, setProperty); |
| 52 } | 52 } |
| 53 | 53 |
| 54 bool CSSAnimationDataList::operator==(const CSSAnimationDataList& o) const | 54 bool StyleAnimationDataList::operator==(const StyleAnimationDataList& o) const |
| 55 { | 55 { |
| 56 if (size() != o.size()) | 56 if (size() != o.size()) |
| 57 return false; | 57 return false; |
| 58 for (size_t i = 0; i < size(); ++i) | 58 for (size_t i = 0; i < size(); ++i) |
| 59 if (*animation(i) != *o.animation(i)) | 59 if (*animation(i) != *o.animation(i)) |
| 60 return false; | 60 return false; |
| 61 return true; | 61 return true; |
| 62 } | 62 } |
| 63 | 63 |
| 64 } // namespace WebCore | 64 } // namespace WebCore |
| OLD | NEW |