[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[krit at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 3fde0b9dcea440b0d184084d8c863f4eb32d2247
Author: krit at webkit.org <krit at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 11 17:41:34 2010 +0000

    2010-11-11  Dirk Schulze  <krit at webkit.org>
    
            Unreviewed Qt build fix.
    
            SVGAnimation calcMode 'spline' should be useable for from-to and from-by animations
            https://bugs.webkit.org/show_bug.cgi?id=49284
    
            * svg/SVGAnimationElement.cpp:
            (WebCore::SVGAnimationElement::calculatePercentFromKeyPoints):
            (WebCore::SVGAnimationElement::startedActiveInterval):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71830 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3435d5b..27d3a91 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-11-11  Dirk Schulze  <krit at webkit.org>
+
+        Unreviewed Qt build fix.
+
+        SVGAnimation calcMode 'spline' should be useable for from-to and from-by animations
+        https://bugs.webkit.org/show_bug.cgi?id=49284
+
+        * svg/SVGAnimationElement.cpp:
+        (WebCore::SVGAnimationElement::calculatePercentFromKeyPoints):
+        (WebCore::SVGAnimationElement::startedActiveInterval):
+
 2010-11-11  Hans Wennborg  <hans at chromium.org>
 
         Reviewed by Jeremy Orlow.
diff --git a/WebCore/svg/SVGAnimationElement.cpp b/WebCore/svg/SVGAnimationElement.cpp
index 32b43f2..25b319e 100644
--- a/WebCore/svg/SVGAnimationElement.cpp
+++ b/WebCore/svg/SVGAnimationElement.cpp
@@ -409,9 +409,8 @@ float SVGAnimationElement::calculatePercentFromKeyPoints(float percent) const
 {
     ASSERT(!m_keyPoints.isEmpty());
     ASSERT(calcMode() != CalcModePaced);
-    unsigned keyTimesCount = m_keyTimes.size();
-    ASSERT(keyTimesCount > 1);
-    ASSERT(m_keyPoints.size() == keyTimesCount);
+    ASSERT(m_keyTimes.size() > 1);
+    ASSERT(m_keyPoints.size() == m_keyTimes.size());
 
     unsigned index = calculateKeyTimesIndex(percent);
     float fromPercent = m_keyTimes[index];
@@ -514,7 +513,7 @@ void SVGAnimationElement::startedActiveInterval()
     if (calcMode == CalcModeSpline) {
         unsigned splinesCount = m_keySplines.size() + 1;
         if ((hasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() != splinesCount)
-            || animationMode == ValuesAnimation && m_values.size() != splinesCount)
+            || (animationMode == ValuesAnimation && m_values.size() != splinesCount))
             return;
     }
 

-- 
WebKit Debian packaging