2011-06-22 Dirk Schulze <krit@webkit.org>
Reviewed by Nikolas Zimmermann.
Animate viewBox attribute in SVG
https://bugs.webkit.org/show_bug.cgi?id=20057
Test SVGRect animation with from-to and from-by animations.
* svg/animations/script-tests/svgrect-animation-1.js: Added.
(sample1):
(sample2):
(sample3):
(executeTest):
* svg/animations/script-tests/svgrect-animation-2.js: Added.
(sample1):
(sample2):
(sample3):
(executeTest):
* svg/animations/svgrect-animation-1-expected.txt: Added.
* svg/animations/svgrect-animation-1.html: Added.
* svg/animations/svgrect-animation-2-expected.txt: Added.
* svg/animations/svgrect-animation-2.html: Added.
2011-06-22 Dirk Schulze <krit@webkit.org>
Reviewed by Nikolas Zimmermann.
Animate viewBox attribute in SVG
https://bugs.webkit.org/show_bug.cgi?id=20057
Follow up of "SVGAnimation should use direct unit animation for SVGLength": https://bugs.webkit.org/show_bug.cgi?id=61368
This patch continues the conversion to the new concept of SVGAnimatorFactory with SVGRect. With the new animator we support
interpolation between SVGRects. A feature that can be used to get smooth zooming animations for SVGs.
Added parseRect() to SVGParserUtilities for parsing Strings to FloatRects.
Tests: svg/animations/svgrect-animation-1.html
svg/animations/svgrect-animation-2.html
* CMakeLists.txt: Added new file SVGAnimatedRect.cpp to build system.
* GNUmakefile.list.am: Ditto.
* WebCore.gypi: Ditto.
* WebCore.pro: Ditto.
* WebCore.xcodeproj/project.pbxproj: Ditto.
* platform/graphics/FloatRect.h: Added new operators + and +=.
(WebCore::operator+=):
(WebCore::operator+):
* svg/SVGAllInOne.cpp: Added SVGAnimatedRect.cpp for Win build.
* svg/SVGAnimateElement.cpp: Handle AnimatedRect explicitly.
(WebCore::SVGAnimateElement::determineAnimatedAttributeType): Ditto.
(WebCore::SVGAnimateElement::calculateAnimatedValue): Ditto.
(WebCore::SVGAnimateElement::calculateFromAndToValues): Ditto.
(WebCore::SVGAnimateElement::calculateFromAndByValues): Ditto.
(WebCore::SVGAnimateElement::resetToBaseValue): Ditto.
(WebCore::SVGAnimateElement::applyResultsToTarget): Ditto.
(WebCore::SVGAnimateElement::calculateDistance): Ditto.
* svg/SVGAnimatedRect.cpp: Added. The new Animator for SVGRect.
(WebCore::SVGAnimatedRectAnimator::SVGAnimatedRectAnimator):
(WebCore::SVGAnimatedRectAnimator::constructFromString):
(WebCore::SVGAnimatedRectAnimator::calculateFromAndToValues):
(WebCore::SVGAnimatedRectAnimator::calculateFromAndByValues):
(WebCore::SVGAnimatedRectAnimator::calculateAnimatedValue):
(WebCore::SVGAnimatedRectAnimator::calculateDistance):
* svg/SVGAnimatedRect.h:
(WebCore::SVGAnimatedRectAnimator::~SVGAnimatedRectAnimator):
* svg/SVGAnimatedType.cpp: Support for FloatRect.
(WebCore::SVGAnimatedType::~SVGAnimatedType):
(WebCore::SVGAnimatedType::createRect):
(WebCore::SVGAnimatedType::rect):
(WebCore::SVGAnimatedType::valueAsString):
(WebCore::SVGAnimatedType::setValueAsString):
* svg/SVGAnimatedType.h:
* svg/SVGAnimatorFactory.h:
(WebCore::SVGAnimatorFactory::create):
* svg/SVGParserUtilities.cpp: Parse String as FloatRect.
(WebCore::parseRect):
* svg/SVGParserUtilities.h:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@89431 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/svg/SVGAllInOne.cpp b/Source/WebCore/svg/SVGAllInOne.cpp
index fa31e6d..5e96e6b 100644
--- a/Source/WebCore/svg/SVGAllInOne.cpp
+++ b/Source/WebCore/svg/SVGAllInOne.cpp
@@ -33,6 +33,7 @@
#include "SVGAnimatedAngle.cpp"
#include "SVGAnimatedLength.cpp"
#include "SVGAnimatedNumber.cpp"
+#include "SVGAnimatedRect.cpp"
#include "SVGAnimatedType.cpp"
#include "SVGAnimateElement.cpp"
#include "SVGAnimateMotionElement.cpp"
diff --git a/Source/WebCore/svg/SVGAnimateElement.cpp b/Source/WebCore/svg/SVGAnimateElement.cpp
index a033dbe..d7545ee 100644
--- a/Source/WebCore/svg/SVGAnimateElement.cpp
+++ b/Source/WebCore/svg/SVGAnimateElement.cpp
@@ -120,7 +120,6 @@
case AnimatedNumberOptionalNumber:
case AnimatedLengthList:
case AnimatedPreserveAspectRatio:
- case AnimatedRect:
case AnimatedString:
return AnimatedString;
case AnimatedLength:
@@ -132,6 +131,8 @@
return AnimatedPath;
case AnimatedPoints:
return AnimatedPoints;
+ case AnimatedRect:
+ return AnimatedRect;
case AnimatedColor:
return AnimatedColor;
case AnimatedTransformList:
@@ -250,7 +251,8 @@
}
case AnimatedAngle:
case AnimatedLength:
- case AnimatedNumber: {
+ case AnimatedNumber:
+ case AnimatedRect: {
ASSERT(m_animator);
ASSERT(results->m_animatedType);
// Target element might have changed.
@@ -337,6 +339,7 @@
case AnimatedAngle:
case AnimatedLength:
case AnimatedNumber:
+ case AnimatedRect:
ensureAnimator()->calculateFromAndToValues(m_fromType, m_toType, fromString, toString);
return true;
default:
@@ -379,6 +382,7 @@
case AnimatedAngle:
case AnimatedLength:
case AnimatedNumber:
+ case AnimatedRect:
ensureAnimator()->calculateFromAndByValues(m_fromType, m_toType, fromString, byString);
return true;
default:
@@ -414,7 +418,8 @@
return;
case AnimatedAngle:
case AnimatedLength:
- case AnimatedNumber: {
+ case AnimatedNumber:
+ case AnimatedRect: {
if (!m_animatedType)
m_animatedType = ensureAnimator()->constructFromString(baseString);
else
@@ -453,6 +458,7 @@
case AnimatedAngle:
case AnimatedLength:
case AnimatedNumber:
+ case AnimatedRect:
valueToApply = m_animatedType->valueAsString();
break;
default:
@@ -481,6 +487,7 @@
case AnimatedAngle:
case AnimatedLength:
case AnimatedNumber:
+ case AnimatedRect:
return ensureAnimator()->calculateDistance(this, fromString, toString);
default:
break;
diff --git a/Source/WebCore/svg/SVGAnimatedRect.cpp b/Source/WebCore/svg/SVGAnimatedRect.cpp
new file mode 100644
index 0000000..9ef95be
--- /dev/null
+++ b/Source/WebCore/svg/SVGAnimatedRect.cpp
@@ -0,0 +1,104 @@
+/*
+ * Copyright (C) Research In Motion Limited 2011. All rights reserved.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public License
+ * along with this library; see the file COPYING.LIB. If not, write to
+ * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "config.h"
+
+#if ENABLE(SVG) && ENABLE(SVG_ANIMATION)
+#include "SVGAnimatedRect.h"
+
+#include "SVGParserUtilities.h"
+
+namespace WebCore {
+
+SVGAnimatedRectAnimator::SVGAnimatedRectAnimator(SVGElement* contextElement, const QualifiedName&)
+ : SVGAnimatedTypeAnimator(AnimatedRect, contextElement)
+{
+}
+
+PassOwnPtr<SVGAnimatedType> SVGAnimatedRectAnimator::constructFromString(const String& string)
+{
+ OwnPtr<SVGAnimatedType> animatedType = SVGAnimatedType::createRect(new FloatRect);
+ parseRect(string, animatedType->rect());
+ return animatedType.release();
+}
+
+void SVGAnimatedRectAnimator::calculateFromAndToValues(OwnPtr<SVGAnimatedType>& from, OwnPtr<SVGAnimatedType>& to, const String& fromString, const String& toString)
+{
+ from = constructFromString(fromString);
+ to = constructFromString(toString);
+}
+
+void SVGAnimatedRectAnimator::calculateFromAndByValues(OwnPtr<SVGAnimatedType>& from, OwnPtr<SVGAnimatedType>& to, const String& fromString, const String& byString)
+{
+ ASSERT(m_contextElement);
+
+ from = constructFromString(fromString);
+ to = constructFromString(byString);
+
+ to->rect() += from->rect();
+}
+
+void SVGAnimatedRectAnimator::calculateAnimatedValue(SVGSMILElement* smilElement, float percentage, unsigned repeatCount,
+ OwnPtr<SVGAnimatedType>& from, OwnPtr<SVGAnimatedType>& to, OwnPtr<SVGAnimatedType>& animated,
+ bool, bool)
+{
+ ASSERT(smilElement);
+ ASSERT(m_contextElement);
+
+ SVGAnimateElement* animationElement = static_cast<SVGAnimateElement*>(smilElement);
+ AnimationMode animationMode = animationElement->animationMode();
+ // To animation uses contributions from the lower priority animations as the base value.
+ FloatRect& animatedRect = animated->rect();
+ if (animationMode == ToAnimation)
+ from->rect() = animatedRect;
+
+ const FloatRect& fromRect = from->rect();
+ const FloatRect& toRect = to->rect();
+ FloatRect newRect;
+ if (animationElement->calcMode() == CalcModeDiscrete)
+ newRect = percentage < 0.5 ? fromRect : toRect;
+ else
+ newRect = FloatRect((toRect.x() - fromRect.x()) * percentage + fromRect.x(),
+ (toRect.y() - fromRect.y()) * percentage + fromRect.y(),
+ (toRect.width() - fromRect.width()) * percentage + fromRect.width(),
+ (toRect.height() - fromRect.height()) * percentage + fromRect.height());
+
+ // FIXME: This is not correct for values animation. Right now we transform values-animation to multiple from-to-animations and
+ // accumulate every single value to the previous one. But accumulation should just take into account after a complete cycle
+ // of values-animaiton. See example at: http://www.w3.org/TR/2001/REC-smil-animation-20010904/#RepeatingAnim
+ if (animationElement->isAccumulated() && repeatCount) {
+ newRect += toRect;
+ newRect.scale(repeatCount);
+ }
+
+ if (animationElement->isAdditive() && animationMode != ToAnimation)
+ animatedRect += newRect;
+ else
+ animatedRect = newRect;
+}
+
+float SVGAnimatedRectAnimator::calculateDistance(SVGSMILElement*, const String&, const String&)
+{
+ // FIXME: Distance calculation is not possible for SVGRect right now. We need the distance of for every single value.
+ return -1;
+}
+
+}
+
+#endif // ENABLE(SVG) && ENABLE(SVG_ANIMATION)
diff --git a/Source/WebCore/svg/SVGAnimatedRect.h b/Source/WebCore/svg/SVGAnimatedRect.h
index af9f94b..02e8652 100644
--- a/Source/WebCore/svg/SVGAnimatedRect.h
+++ b/Source/WebCore/svg/SVGAnimatedRect.h
@@ -21,6 +21,7 @@
#define SVGAnimatedRect_h
#if ENABLE(SVG)
+#include "SVGAnimateElement.h"
#include "SVGAnimatedPropertyMacros.h"
#include "SVGAnimatedPropertyTearOff.h"
#include "SVGRect.h"
@@ -36,7 +37,26 @@
#define DEFINE_ANIMATED_RECT(OwnerType, DOMAttribute, UpperProperty, LowerProperty) \
DEFINE_ANIMATED_PROPERTY(OwnerType, DOMAttribute, DOMAttribute.localName(), SVGAnimatedRect, FloatRect, UpperProperty, LowerProperty)
+#if ENABLE(SVG_ANIMATION)
+class SVGAnimatedRectAnimator : public SVGAnimatedTypeAnimator {
+
+public:
+ SVGAnimatedRectAnimator(SVGElement* contextElement, const QualifiedName&);
+ virtual ~SVGAnimatedRectAnimator() { }
+
+ virtual PassOwnPtr<SVGAnimatedType> constructFromString(const String&);
+
+ virtual void calculateFromAndToValues(OwnPtr<SVGAnimatedType>& fromValue, OwnPtr<SVGAnimatedType>& toValue, const String& fromString, const String& toString);
+ virtual void calculateFromAndByValues(OwnPtr<SVGAnimatedType>& fromValue, OwnPtr<SVGAnimatedType>& toValue, const String& fromString, const String& byString);
+ virtual void calculateAnimatedValue(SVGSMILElement*, float percentage, unsigned repeatCount,
+ OwnPtr<SVGAnimatedType>& fromValue, OwnPtr<SVGAnimatedType>& toValue, OwnPtr<SVGAnimatedType>& animatedValue,
+ bool fromPropertyInherits, bool toPropertyInherits);
+ virtual float calculateDistance(SVGSMILElement*, const String& fromString, const String& toString);
+
+ static bool parseSVGRect(const String&, FloatRect&);
+};
} // namespace WebCore
+#endif // ENABLE(SVG_ANIMATION)
#endif // ENABLE(SVG)
#endif
diff --git a/Source/WebCore/svg/SVGAnimatedType.cpp b/Source/WebCore/svg/SVGAnimatedType.cpp
index e2fd825..ddfe261 100644
--- a/Source/WebCore/svg/SVGAnimatedType.cpp
+++ b/Source/WebCore/svg/SVGAnimatedType.cpp
@@ -22,6 +22,7 @@
#if ENABLE(SVG) && ENABLE(SVG_ANIMATION)
#include "SVGAnimatedType.h"
+#include "FloatRect.h"
#include "SVGAngle.h"
#include "SVGLength.h"
#include "SVGParserUtilities.h"
@@ -45,6 +46,9 @@
case AnimatedNumber:
delete m_data.number;
break;
+ case AnimatedRect:
+ delete m_data.rect;
+ break;
default:
ASSERT_NOT_REACHED();
break;
@@ -75,6 +79,14 @@
return animatedType.release();
}
+PassOwnPtr<SVGAnimatedType> SVGAnimatedType::createRect(FloatRect* rect)
+{
+ ASSERT(rect);
+ OwnPtr<SVGAnimatedType> animatedType = adoptPtr(new SVGAnimatedType(AnimatedRect));
+ animatedType->m_data.rect = rect;
+ return animatedType.release();
+}
+
SVGAngle& SVGAnimatedType::angle()
{
ASSERT(m_type == AnimatedAngle);
@@ -93,6 +105,12 @@
return *m_data.number;
}
+FloatRect& SVGAnimatedType::rect()
+{
+ ASSERT(m_type == AnimatedRect);
+ return *m_data.rect;
+}
+
String SVGAnimatedType::valueAsString()
{
switch (m_type) {
@@ -105,6 +123,10 @@
case AnimatedNumber:
ASSERT(m_data.number);
return String::number(*m_data.number);
+ case AnimatedRect:
+ ASSERT(m_data.rect);
+ return String::number(m_data.rect->x()) + ' ' + String::number(m_data.rect->y()) + ' '
+ + String::number(m_data.rect->width()) + ' ' + String::number(m_data.rect->height());
default:
break;
}
@@ -128,6 +150,10 @@
ASSERT(m_data.number);
parseNumberFromString(value, *m_data.number);
break;
+ case AnimatedRect:
+ ASSERT(m_data.rect);
+ parseRect(value, *m_data.rect);
+ break;
default:
ASSERT_NOT_REACHED();
break;
diff --git a/Source/WebCore/svg/SVGAnimatedType.h b/Source/WebCore/svg/SVGAnimatedType.h
index 7ef93d1..e8d6add 100644
--- a/Source/WebCore/svg/SVGAnimatedType.h
+++ b/Source/WebCore/svg/SVGAnimatedType.h
@@ -25,6 +25,7 @@
namespace WebCore {
+class FloatRect;
class SVGAngle;
class SVGLength;
@@ -36,12 +37,14 @@
static PassOwnPtr<SVGAnimatedType> createAngle(SVGAngle*);
static PassOwnPtr<SVGAnimatedType> createLength(SVGLength*);
static PassOwnPtr<SVGAnimatedType> createNumber(float*);
+ static PassOwnPtr<SVGAnimatedType> createRect(FloatRect*);
AnimatedAttributeType type() const { return m_type; }
SVGAngle& angle();
SVGLength& length();
float& number();
+ FloatRect& rect();
String valueAsString();
bool setValueAsString(const QualifiedName&, const String&);
@@ -61,6 +64,7 @@
SVGAngle* angle;
SVGLength* length;
float* number;
+ FloatRect* rect;
} m_data;
};
diff --git a/Source/WebCore/svg/SVGAnimatorFactory.h b/Source/WebCore/svg/SVGAnimatorFactory.h
index f880717..62bb770 100644
--- a/Source/WebCore/svg/SVGAnimatorFactory.h
+++ b/Source/WebCore/svg/SVGAnimatorFactory.h
@@ -24,6 +24,7 @@
#include "SVGAnimatedAngle.h"
#include "SVGAnimatedLength.h"
#include "SVGAnimatedNumber.h"
+#include "SVGAnimatedRect.h"
namespace WebCore {
@@ -39,6 +40,8 @@
return adoptPtr(new SVGAnimatedLengthAnimator(contextElement, attributeName));
case AnimatedNumber:
return adoptPtr(new SVGAnimatedNumberAnimator(contextElement, attributeName));
+ case AnimatedRect:
+ return adoptPtr(new SVGAnimatedRectAnimator(contextElement, attributeName));
default:
ASSERT_NOT_REACHED();
return adoptPtr(new SVGAnimatedLengthAnimator(contextElement, attributeName));
diff --git a/Source/WebCore/svg/SVGParserUtilities.cpp b/Source/WebCore/svg/SVGParserUtilities.cpp
index c09f8fe..a858dad 100644
--- a/Source/WebCore/svg/SVGParserUtilities.cpp
+++ b/Source/WebCore/svg/SVGParserUtilities.cpp
@@ -26,7 +26,7 @@
#include "SVGParserUtilities.h"
#include "Document.h"
-#include "FloatPoint.h"
+#include "FloatRect.h"
#include "SVGPointList.h"
#include <limits>
@@ -189,6 +189,21 @@
return cur == end;
}
+bool parseRect(const String& string, FloatRect& rect)
+{
+ const UChar* ptr = string.characters();
+ const UChar* end = ptr + string.length();
+ skipOptionalSpaces(ptr, end);
+
+ float x = 0;
+ float y = 0;
+ float width = 0;
+ float height = 0;
+ bool valid = parseNumber(ptr, end, x) && parseNumber(ptr, end, y) && parseNumber(ptr, end, width) && parseNumber(ptr, end, height, false);
+ rect = FloatRect(x, y, width, height);
+ return valid;
+}
+
bool pointsListFromSVGData(SVGPointList& pointsList, const String& points)
{
if (points.isEmpty())
diff --git a/Source/WebCore/svg/SVGParserUtilities.h b/Source/WebCore/svg/SVGParserUtilities.h
index 921da6a..48406bb 100644
--- a/Source/WebCore/svg/SVGParserUtilities.h
+++ b/Source/WebCore/svg/SVGParserUtilities.h
@@ -30,12 +30,14 @@
namespace WebCore {
+class FloatRect;
class SVGPointList;
bool parseNumber(const UChar*& ptr, const UChar* end, float& number, bool skip = true);
bool parseNumberFromString(const String&, float& number, bool skip = true);
bool parseNumberOptionalNumber(const String& s, float& h, float& v);
bool parseArcFlag(const UChar*& ptr, const UChar* end, bool& flag);
+bool parseRect(const String&, FloatRect&);
// SVG allows several different whitespace characters:
// http://www.w3.org/TR/SVG/paths.html#PathDataBNF
