Fold SVGAnimatedTypeAnimator into SVGAnimateElement

third_party/WebKit/Source/core/svg/SVGAnimationElement.cpp

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org>
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au>
  * Copyright (C) Research In Motion Limited 2010. 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
@@ skipping 449 matching lines @@
   if (percent == 1 || valuesCount == 1) {
     from = m_values[valuesCount - 1];
     to = m_values[valuesCount - 1];
     effectivePercent = 1;
     return;
   }
 
   CalcMode calcMode = this->getCalcMode();
   if (isSVGAnimateElement(*this)) {
     SVGAnimateElement& animateElement = toSVGAnimateElement(*this);
-    if (!animateElement.animatedPropertyTypeSupportsAddition()) {
-      ASSERT(animateElement.animatedPropertyType() != AnimatedTransformList ||
-             isSVGAnimateTransformElement(*this));
-      ASSERT(animateElement.animatedPropertyType() != AnimatedUnknown);
+    if (!animateElement.animatedPropertyTypeSupportsAddition())
       calcMode = CalcModeDiscrete;
-    }
   }
   if (!m_keyPoints.isEmpty() && calcMode != CalcModePaced)
     return currentValuesFromKeyPoints(percent, effectivePercent, from, to);
 
   unsigned keyTimesCount = m_keyTimes.size();
   ASSERT(!keyTimesCount || valuesCount == keyTimesCount);
   ASSERT(!keyTimesCount || (keyTimesCount > 1 && !m_keyTimes[0]));
 
   unsigned index = calculateKeyTimesIndex(percent);
   if (calcMode == CalcModeDiscrete) {
@@ skipping 132 matching lines @@
         calculatePercentForSpline(percent, calculateKeyTimesIndex(percent));
   else if (animationMode == FromToAnimation || animationMode == ToAnimation)
     effectivePercent = calculatePercentForFromTo(percent);
   else
     effectivePercent = percent;
 
   calculateAnimatedValue(effectivePercent, repeatCount, resultElement);
 }
 
 }  // namespace blink