Changeset 91002 in webkit

Timestamp:

Jul 14, 2011 9:20:01 AM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Patch by Young Han Lee <​joybro@company100.net> on 2011-07-14
Reviewed by Dirk Schulze.

REGRESSION (r89774): svg/W3C-SVG-1.1/animate-elem-82-t.svg hits assertion failure.
​https://bugs.webkit.org/show_bug.cgi?id=63911

Some functions assumed calculateKeyTimesIndex() does not return the last index of
the keyTimes, but it would be right behavior for calculateKeyTimesIndex() when it
accepts 1 as the percent argument.

To avoid the assumption, and for more efficiency, this patch allows the functions
using calculateKeyTimesIndex() to return early when it accepts 1 as the percent argument.
These functions have always returned the last element of the corresponding vector
in that situation.

• svg/SVGAnimationElement.cpp:

(WebCore::SVGAnimationElement::calculatePercentFromKeyPoints):
(WebCore::SVGAnimationElement::currentValuesForValuesAnimation):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/SVGAnimationElement.cpp (modified) (5 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-14  Young Han Lee  <joybro@company100.net>
+
+        Reviewed by Dirk Schulze.
+
+        REGRESSION (r89774): svg/W3C-SVG-1.1/animate-elem-82-t.svg hits assertion failure.
+        https://bugs.webkit.org/show_bug.cgi?id=63911
+
+        Some functions assumed calculateKeyTimesIndex() does not return the last index of
+        the keyTimes, but it would be right behavior for calculateKeyTimesIndex() when it
+        accepts 1 as the percent argument.
+
+        To avoid the assumption, and for more efficiency, this patch allows the functions
+        using calculateKeyTimesIndex() to return early when it accepts 1 as the percent argument.
+        These functions have always returned the last element of the corresponding vector
+        in that situation.
+
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::calculatePercentFromKeyPoints):
+        (WebCore::SVGAnimationElement::currentValuesForValuesAnimation):
+
 2011-07-14  Andrey Kosyakov  <caseq@chromium.org>
 

trunk/Source/WebCore/svg/SVGAnimationElement.cpp

@@ -439 +439 @@
     ASSERT(m_keyPoints.size() == m_keyTimes.size());
 
+    if (percent == 1)
+        return m_keyPoints[m_keyPoints.size() - 1];
+
     unsigned index = calculateKeyTimesIndex(percent);
     float fromPercent = m_keyTimes[index];
@@ -446 +449 @@
     
     if (calcMode() == CalcModeDiscrete)
-        return percent == 1 ? toKeyPoint : fromKeyPoint;
-    
-    float keyPointPercent = percent == 1 ? 1 : (percent - fromPercent) / (toPercent - fromPercent);
+        return fromKeyPoint;
+    
+    float keyPointPercent = (percent - fromPercent) / (toPercent - fromPercent);
     
     if (calcMode() == CalcModeSpline) {
@@ -474 +477 @@
     ASSERT(valuesCount > 1);
     
+    if (percent == 1) {
+        from = m_values[valuesCount - 1];
+        to = m_values[valuesCount - 1];
+        effectivePercent = 1;
+        return;
+    }
+
     CalcMode calcMode = this->calcMode();
     if (hasTagName(SVGNames::animateTag) || hasTagName(SVGNames::animateColorTag)) {
@@ -495 +505 @@
     if (calcMode == CalcModeDiscrete) {
         if (!keyTimesCount) 
-            index = percent == 1 ? valuesCount - 1 : static_cast<unsigned>(percent * valuesCount);
+            index = static_cast<unsigned>(percent * valuesCount);
         from = m_values[index];
         to = m_values[index];
@@ -518 +528 @@
     to = m_values[index + 1];
     ASSERT(toPercent > fromPercent);
-    effectivePercent = percent == 1 ? 1 : (percent - fromPercent) / (toPercent - fromPercent);
+    effectivePercent = (percent - fromPercent) / (toPercent - fromPercent);
     
     if (calcMode == CalcModeSpline) {