Index: Source/core/svg/SVGLengthList.cpp |
diff --git a/Source/core/svg/SVGLengthList.cpp b/Source/core/svg/SVGLengthList.cpp |
index 1518d2c924a541cdfceba3370acb439b96b88560..0b3108e5c0be8972cb4e2316c4f7d374dda26bf9 100644 |
--- a/Source/core/svg/SVGLengthList.cpp |
+++ b/Source/core/svg/SVGLengthList.cpp |
@@ -21,17 +21,65 @@ |
#include "config.h" |
#include "core/svg/SVGLengthList.h" |
-#include "bindings/v8/ExceptionState.h" |
+#include "bindings/v8/ExceptionStatePlaceholder.h" |
+#include "core/svg/SVGAnimationElement.h" |
#include "core/svg/SVGParserUtilities.h" |
#include "wtf/text/StringBuilder.h" |
namespace WebCore { |
-template<typename CharType> |
-void SVGLengthList::parseInternal(const CharType*& ptr, const CharType* end, SVGLengthMode mode) |
+inline PassRefPtr<SVGLengthList> toSVGLengthList(PassRefPtr<NewSVGPropertyBase> passBase) |
{ |
- TrackExceptionState exceptionState; |
+ RefPtr<NewSVGPropertyBase> base = passBase; |
+ ASSERT(base->type() == SVGLengthList::classType()); |
+ return static_pointer_cast<SVGLengthList>(base.release()); |
+} |
+ |
+SVGLengthList::SVGLengthList(SVGLengthMode mode) |
+ : m_mode(mode) |
+{ |
+} |
+ |
+SVGLengthList::~SVGLengthList() |
+{ |
+} |
+ |
+PassRefPtr<SVGLengthList> SVGLengthList::clone() |
+{ |
+ RefPtr<SVGLengthList> ret = SVGLengthList::create(m_mode); |
+ ret->deepCopy(this); |
+ return ret.release(); |
+} |
+ |
+PassRefPtr<NewSVGPropertyBase> SVGLengthList::cloneForAnimation(const String& value) const |
+{ |
+ RefPtr<SVGLengthList> ret = SVGLengthList::create(m_mode); |
+ ret->setValueAsString(value, IGNORE_EXCEPTION); |
+ return ret.release(); |
+} |
+String SVGLengthList::valueAsString() const |
+{ |
+ StringBuilder builder; |
+ |
+ Vector<RefPtr<SVGLength> >::const_iterator it = m_values.begin(); |
+ Vector<RefPtr<SVGLength> >::const_iterator itEnd = m_values.end(); |
+ if (it != itEnd) { |
+ builder.append((*it++)->valueAsString()); |
+ |
+ for (; it != itEnd; ++it) { |
+ builder.append(' '); |
+ builder.append((*it)->valueAsString()); |
+ } |
+ } |
+ |
+ return builder.toString(); |
+} |
+ |
+template <typename CharType> |
+void SVGLengthList::parseInternal(const CharType*& ptr, const CharType* end, ExceptionState& exceptionState) |
+{ |
+ m_values.clear(); |
while (ptr < end) { |
const CharType* start = ptr; |
while (ptr < end && *ptr != ',' && !isSVGSpace(*ptr)) |
@@ -39,47 +87,115 @@ void SVGLengthList::parseInternal(const CharType*& ptr, const CharType* end, SVG |
if (ptr == start) |
break; |
- SVGLength length(mode); |
+ RefPtr<SVGLength> length = SVGLength::create(m_mode); |
String valueString(start, ptr - start); |
if (valueString.isEmpty()) |
return; |
- length.setValueAsString(valueString, exceptionState); |
+ length->setValueAsString(valueString, exceptionState); |
if (exceptionState.hadException()) |
return; |
- append(length); |
+ m_values.append(length); |
skipOptionalSVGSpacesOrDelimiter(ptr, end); |
} |
} |
-void SVGLengthList::parse(const String& value, SVGLengthMode mode) |
+void SVGLengthList::setValueAsString(const String& value, ExceptionState& exceptionState) |
{ |
- clear(); |
if (value.isEmpty()) |
return; |
if (value.is8Bit()) { |
const LChar* ptr = value.characters8(); |
const LChar* end = ptr + value.length(); |
- parseInternal(ptr, end, mode); |
+ parseInternal(ptr, end, exceptionState); |
} else { |
const UChar* ptr = value.characters16(); |
const UChar* end = ptr + value.length(); |
- parseInternal(ptr, end, mode); |
+ parseInternal(ptr, end, exceptionState); |
} |
} |
-String SVGLengthList::valueAsString() const |
+void SVGLengthList::add(PassRefPtr<NewSVGPropertyBase> other, SVGElement* contextElement) |
{ |
- StringBuilder builder; |
+ RefPtr<SVGLengthList> otherList = toSVGLengthList(other); |
- unsigned size = this->size(); |
- for (unsigned i = 0; i < size; ++i) { |
- if (i > 0) |
- builder.append(' '); |
+ if (m_values.size() != otherList->m_values.size()) |
+ return; |
- builder.append(at(i).valueAsString()); |
+ SVGLengthContext lengthContext(contextElement); |
+ for (size_t i = 0; i < m_values.size(); ++i) |
+ m_values[i]->setValue(m_values[i]->value(lengthContext) + otherList->m_values[i]->value(lengthContext), lengthContext, ASSERT_NO_EXCEPTION); |
+} |
+ |
+bool SVGLengthList::adjustFromToListValues(PassRefPtr<SVGLengthList> passFromList, PassRefPtr<SVGLengthList> passToList, float percentage, bool isToAnimation, bool resizeAnimatedListIfNeeded) |
+{ |
+ RefPtr<SVGLengthList> fromList = passFromList; |
+ RefPtr<SVGLengthList> toList = passToList; |
+ |
+ // If no 'to' value is given, nothing to animate. |
+ size_t toListSize = toList->m_values.size(); |
+ 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->m_values.size(); |
+ if (fromListSize != toListSize && fromListSize) { |
+ if (percentage < 0.5) { |
+ if (!isToAnimation) |
+ deepCopy(fromList); |
+ } else { |
+ deepCopy(toList); |
+ } |
+ |
+ return false; |
} |
- return builder.toString(); |
+ ASSERT(!fromListSize || fromListSize == toListSize); |
+ if (resizeAnimatedListIfNeeded && m_values.size() < toListSize) { |
+ size_t paddingCount = toListSize - m_values.size(); |
+ for (size_t i = 0; i < paddingCount; ++i) |
+ m_values.append(SVGLength::create(m_mode)); |
+ } |
+ |
+ return true; |
} |
+void SVGLengthList::calculateAnimatedValue(SVGAnimationElement* animationElement, float percentage, unsigned repeatCount, PassRefPtr<NewSVGPropertyBase> fromValue, PassRefPtr<NewSVGPropertyBase> toValue, PassRefPtr<NewSVGPropertyBase> toAtEndOfDurationValue, SVGElement* contextElement) |
+{ |
+ RefPtr<SVGLengthList> fromList = toSVGLengthList(fromValue); |
+ RefPtr<SVGLengthList> toList = toSVGLengthList(toValue); |
+ RefPtr<SVGLengthList> toAtEndOfDurationList = toSVGLengthList(toAtEndOfDurationValue); |
+ |
+ SVGLengthContext lengthContext(contextElement); |
+ ASSERT(m_mode == SVGLength::lengthModeForAnimatedLengthAttribute(animationElement->attributeName())); |
+ |
+ size_t fromLengthListSize = fromList->m_values.size(); |
+ size_t toLengthListSize = toList->m_values.size(); |
+ size_t toAtEndOfDurationListSize = toAtEndOfDurationList->m_values.size(); |
+ |
+ if (!adjustFromToListValues(fromList, toList, percentage, animationElement->animationMode() == ToAnimation, true)) |
+ return; |
+ |
+ for (size_t i = 0; i < toLengthListSize; ++i) { |
+ float animatedNumber = m_values[i]->value(lengthContext); |
+ SVGLengthType unitType = toList->m_values[i]->unitType(); |
+ float effectiveFrom = 0; |
+ if (fromLengthListSize) { |
+ if (percentage < 0.5) |
+ unitType = fromList->m_values[i]->unitType(); |
+ effectiveFrom = fromList->m_values[i]->value(lengthContext); |
+ } |
+ float effectiveTo = toList->m_values[i]->value(lengthContext); |
+ float effectiveToAtEnd = i < toAtEndOfDurationListSize ? toAtEndOfDurationList->m_values[i]->value(lengthContext) : 0; |
+ |
+ animationElement->animateAdditiveNumber(percentage, repeatCount, effectiveFrom, effectiveTo, effectiveToAtEnd, animatedNumber); |
+ m_values[i]->setUnitType(unitType); |
+ m_values[i]->setValue(animatedNumber, lengthContext, ASSERT_NO_EXCEPTION); |
+ } |
+} |
+ |
+float SVGLengthList::calculateDistance(PassRefPtr<NewSVGPropertyBase> to, SVGElement*) |
+{ |
+ // FIXME: Distance calculation is not possible for SVGLengthList right now. We need the distance for every single value. |
+ return -1; |
+} |
} |