Changeset 106878 in webkit

Timestamp:

Feb 6, 2012, 4:55:15 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Fix color animations by value
​https://bugs.webkit.org/show_bug.cgi?id=77812

Patch by Philip Rogers <​pdr@google.com> on 2012-02-06
Reviewed by Darin Adler.

Source/WebCore:

Test: svg/animations/animate-color-fill-from-by.html

• svg/SVGAnimatedColor.cpp:

(WebCore::SVGAnimatedColorAnimator::calculateFromAndByValues):

LayoutTests:

• svg/animations/animate-color-fill-from-by-expected.txt: Added.
• svg/animations/animate-color-fill-from-by.html: Added.
• svg/animations/script-tests/animate-color-fill-from-by.js: Added.

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

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/svg/animations/animate-color-fill-from-by-expected.txt (added)
• LayoutTests/svg/animations/animate-color-fill-from-by.html (added)
• LayoutTests/svg/animations/script-tests/animate-color-fill-from-by.js (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/svg/SVGAnimatedColor.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-02-06  Philip Rogers  <pdr@google.com>
+
+        Fix color animations by value
+        https://bugs.webkit.org/show_bug.cgi?id=77812
+
+        Reviewed by Darin Adler.
+
+        * svg/animations/animate-color-fill-from-by-expected.txt: Added.
+        * svg/animations/animate-color-fill-from-by.html: Added.
+        * svg/animations/script-tests/animate-color-fill-from-by.js: Added.
+        (checkFillColor):
+        (sample1):
+        (sample2):
+        (sample3):
+        (executeTest):
+
 2012-02-03  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-06  Philip Rogers  <pdr@google.com>
+
+        Fix color animations by value
+        https://bugs.webkit.org/show_bug.cgi?id=77812
+
+        Reviewed by Darin Adler.
+
+        Test: svg/animations/animate-color-fill-from-by.html
+
+        * svg/SVGAnimatedColor.cpp:
+        (WebCore::SVGAnimatedColorAnimator::calculateFromAndByValues):
+
 2012-02-03  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/svg/SVGAnimatedColor.cpp

@@ -61 +61 @@
     from = constructFromString(fromString);
     to = constructFromString(byString);
+
+    to->color() = ColorDistance::addColorsAndClamp(from->color(), to->color());
 }