| Index: Source/core/svg/SVGLengthList.cpp
|
| diff --git a/Source/core/svg/SVGLengthList.cpp b/Source/core/svg/SVGLengthList.cpp
|
| index e6dbf564fe405b2fff55056de0852ed28f53ea83..c9672311028b3b96d85377a92ec447713c140491 100644
|
| --- a/Source/core/svg/SVGLengthList.cpp
|
| +++ b/Source/core/svg/SVGLengthList.cpp
|
| @@ -119,11 +119,11 @@ void SVGLengthList::add(PassRefPtr<NewSVGPropertyBase> other, SVGElement* contex
|
| {
|
| RefPtr<SVGLengthList> otherList = toSVGLengthList(other);
|
|
|
| - if (numberOfItems() != otherList->numberOfItems())
|
| + if (length() != otherList->length())
|
| return;
|
|
|
| SVGLengthContext lengthContext(contextElement);
|
| - for (size_t i = 0; i < numberOfItems(); ++i)
|
| + for (size_t i = 0; i < length(); ++i)
|
| at(i)->setValue(at(i)->value(lengthContext) + otherList->at(i)->value(lengthContext), lengthContext, ASSERT_NO_EXCEPTION);
|
| }
|
|
|
| @@ -133,12 +133,12 @@ bool SVGLengthList::adjustFromToListValues(PassRefPtr<SVGLengthList> passFromLis
|
| RefPtr<SVGLengthList> toList = passToList;
|
|
|
| // If no 'to' value is given, nothing to animate.
|
| - size_t toListSize = toList->numberOfItems();
|
| + size_t toListSize = toList->length();
|
| if (!toListSize)
|
| return false;
|
|
|
| // If the 'from' value is given and it's length doesn't match the 'to' value list length, fallback to a discrete animation.
|
| - size_t fromListSize = fromList->numberOfItems();
|
| + size_t fromListSize = fromList->length();
|
| if (fromListSize != toListSize && fromListSize) {
|
| if (percentage < 0.5) {
|
| if (!isToAnimation)
|
| @@ -151,8 +151,8 @@ bool SVGLengthList::adjustFromToListValues(PassRefPtr<SVGLengthList> passFromLis
|
| }
|
|
|
| ASSERT(!fromListSize || fromListSize == toListSize);
|
| - if (resizeAnimatedListIfNeeded && numberOfItems() < toListSize) {
|
| - size_t paddingCount = toListSize - numberOfItems();
|
| + if (resizeAnimatedListIfNeeded && length() < toListSize) {
|
| + size_t paddingCount = toListSize - length();
|
| for (size_t i = 0; i < paddingCount; ++i)
|
| append(SVGLength::create(m_mode));
|
| }
|
| @@ -169,9 +169,9 @@ void SVGLengthList::calculateAnimatedValue(SVGAnimationElement* animationElement
|
| SVGLengthContext lengthContext(contextElement);
|
| ASSERT(m_mode == SVGLength::lengthModeForAnimatedLengthAttribute(animationElement->attributeName()));
|
|
|
| - size_t fromLengthListSize = fromList->numberOfItems();
|
| - size_t toLengthListSize = toList->numberOfItems();
|
| - size_t toAtEndOfDurationListSize = toAtEndOfDurationList->numberOfItems();
|
| + size_t fromLengthListSize = fromList->length();
|
| + size_t toLengthListSize = toList->length();
|
| + size_t toAtEndOfDurationListSize = toAtEndOfDurationList->length();
|
|
|
| if (!adjustFromToListValues(fromList, toList, percentage, animationElement->animationMode() == ToAnimation, true))
|
| return;
|
|
|