Changeset 112240 in webkit

Timestamp:

Mar 27, 2012 3:22:35 AM (12 years ago)

Author:

Nikolas Zimmermann

Message:

Enable animVal support for SVGAnimatedString
​https://bugs.webkit.org/show_bug.cgi?id=82316

Reviewed by Zoltan Herczeg.

Source/WebCore:

Enable animVal support for SVGAnimatedString. Very simple now that everything is prepared.
All we have to do is add startAnimValAnimation/etc. methods to SVGAnimatedStringAnimator.

Test: svg/animations/svgstring-animation-1.html

• svg/SVGAnimatedString.cpp:

(WebCore::SVGAnimatedStringAnimator::startAnimValAnimation):
(WebCore::SVGAnimatedStringAnimator::stopAnimValAnimation):
(WebCore::SVGAnimatedStringAnimator::resetAnimValToBaseVal):
(WebCore::SVGAnimatedStringAnimator::animValWillChange):
(WebCore::SVGAnimatedStringAnimator::animValDidChange):

• svg/SVGAnimatedString.h:

(SVGAnimatedStringAnimator):

• svg/SVGAnimatedType.cpp:

(WebCore::SVGAnimatedType::supportsAnimVal):

LayoutTests:

Add new test covering animVal+SVGAnimatedString.

• svg/animations/script-tests/svgstring-animation-1.js: Added.

(sample1):
(sample2):
(sample3):
(executeTest):

• svg/animations/svgstring-animation-1-expected.txt: Added.
• svg/animations/svgstring-animation-1.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/script-tests/svgstring-animation-1.js (added)
• LayoutTests/svg/animations/svgstring-animation-1-expected.txt (added)
• LayoutTests/svg/animations/svgstring-animation-1.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGAnimatedString.cpp (modified) (1 diff)
• Source/WebCore/svg/SVGAnimatedString.h (modified) (2 diffs)
• Source/WebCore/svg/SVGAnimatedType.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-03-27  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Enable animVal support for SVGAnimatedString
+        https://bugs.webkit.org/show_bug.cgi?id=82316
+
+        Reviewed by Zoltan Herczeg.
+
+        Add new test covering animVal+SVGAnimatedString.
+
+        * svg/animations/script-tests/svgstring-animation-1.js: Added.
+        (sample1):
+        (sample2):
+        (sample3):
+        (executeTest):
+        * svg/animations/svgstring-animation-1-expected.txt: Added.
+        * svg/animations/svgstring-animation-1.html: Added.
+
 2012-03-27  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-03-27  Nikolas Zimmermann  <nzimmermann@rim.com>
+
+        Enable animVal support for SVGAnimatedString
+        https://bugs.webkit.org/show_bug.cgi?id=82316
+
+        Reviewed by Zoltan Herczeg.
+
+        Enable animVal support for SVGAnimatedString. Very simple now that everything is prepared.
+        All we have to do is add startAnimValAnimation/etc. methods to SVGAnimatedStringAnimator.
+
+        Test: svg/animations/svgstring-animation-1.html
+
+        * svg/SVGAnimatedString.cpp:
+        (WebCore::SVGAnimatedStringAnimator::startAnimValAnimation):
+        (WebCore::SVGAnimatedStringAnimator::stopAnimValAnimation):
+        (WebCore::SVGAnimatedStringAnimator::resetAnimValToBaseVal):
+        (WebCore::SVGAnimatedStringAnimator::animValWillChange):
+        (WebCore::SVGAnimatedStringAnimator::animValDidChange):
+        * svg/SVGAnimatedString.h:
+        (SVGAnimatedStringAnimator):
+        * svg/SVGAnimatedType.cpp:
+        (WebCore::SVGAnimatedType::supportsAnimVal):
+
 2012-03-27  Levi Weintraub  <leviw@chromium.org>
 

trunk/Source/WebCore/svg/SVGAnimatedString.cpp

@@ -37 +37 @@
     animatedType->string() = string;
     return animatedType.release();
+}
+
+PassOwnPtr<SVGAnimatedType> SVGAnimatedStringAnimator::startAnimValAnimation(const Vector<SVGAnimatedProperty*>& properties)
+{
+    return SVGAnimatedType::createString(constructFromOneBaseValue<String, SVGAnimatedString>(properties));
+}
+
+void SVGAnimatedStringAnimator::stopAnimValAnimation(const Vector<SVGAnimatedProperty*>& properties)
+{
+    SVGAnimatedTypeAnimator::stopAnimValAnimationForType<SVGAnimatedString>(properties);
+}
+
+void SVGAnimatedStringAnimator::resetAnimValToBaseVal(const Vector<SVGAnimatedProperty*>& properties, SVGAnimatedType* type)
+{
+    resetFromOneBaseValue<String, SVGAnimatedString>(properties, type, &SVGAnimatedType::string);
+}
+
+void SVGAnimatedStringAnimator::animValWillChange(const Vector<SVGAnimatedProperty*>& properties)
+{
+    animValWillChangeForType<SVGAnimatedString>(properties);
+}
+
+void SVGAnimatedStringAnimator::animValDidChange(const Vector<SVGAnimatedProperty*>& properties)
+{
+    animValDidChangeForType<SVGAnimatedString>(properties);
 }
 

trunk/Source/WebCore/svg/SVGAnimatedString.h

@@ -40 +40 @@
 
 class SVGAnimatedStringAnimator : public SVGAnimatedTypeAnimator {
-
 public:
     SVGAnimatedStringAnimator(SVGAnimationElement*, SVGElement*);
@@ -46 +45 @@
 
     virtual PassOwnPtr<SVGAnimatedType> constructFromString(const String&);
+    virtual PassOwnPtr<SVGAnimatedType> startAnimValAnimation(const Vector<SVGAnimatedProperty*>&);
+    virtual void stopAnimValAnimation(const Vector<SVGAnimatedProperty*>&);
+    virtual void resetAnimValToBaseVal(const Vector<SVGAnimatedProperty*>&, SVGAnimatedType*);
+    virtual void animValWillChange(const Vector<SVGAnimatedProperty*>&);
+    virtual void animValDidChange(const Vector<SVGAnimatedProperty*>&);
 
     virtual void calculateFromAndToValues(OwnPtr<SVGAnimatedType>& fromValue, OwnPtr<SVGAnimatedType>& toValue, const String& fromString, const String& toString);

trunk/Source/WebCore/svg/SVGAnimatedType.cpp

@@ -480 +480 @@
     case AnimatedNumberList:
     case AnimatedNumberOptionalNumber:
+    case AnimatedString:
     case AnimatedTransformList:
         return true;
@@ -488 +489 @@
     case AnimatedPreserveAspectRatio:
     case AnimatedRect:
-    case AnimatedString:
     case AnimatedUnknown:
         return false;