Tidy up instance time handling in SVGSMILElement

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 235 matching lines @@
     ExceptionState& exceptionState) const {
   SMILTime duration = simpleDuration();
   if (!duration.isFinite()) {
     exceptionState.throwDOMException(NotSupportedError,
                                      "No simple duration defined.");
     return 0;
   }
   return clampTo<float>(duration.value());
 }
 
-void SVGAnimationElement::beginElement() {
-  beginElementAt(0);
-}
-
 void SVGAnimationElement::beginElementAt(float offset) {
-  ASSERT(std::isfinite(offset));
-  SMILTime elapsed = this->elapsed();
-  addBeginTime(elapsed, elapsed + offset, SMILTimeWithOrigin::ScriptOrigin);
-}
-
-void SVGAnimationElement::endElement() {
-  endElementAt(0);
+  DCHECK(std::isfinite(offset));
+  addInstanceTime(Begin, elapsed() + offset, SMILTimeWithOrigin::ScriptOrigin);
 }
 
 void SVGAnimationElement::endElementAt(float offset) {
-  ASSERT(std::isfinite(offset));
-  SMILTime elapsed = this->elapsed();
-  addEndTime(elapsed, elapsed + offset, SMILTimeWithOrigin::ScriptOrigin);
+  DCHECK(std::isfinite(offset));
+  addInstanceTime(End, elapsed() + offset, SMILTimeWithOrigin::ScriptOrigin);
 }
 
 void SVGAnimationElement::updateAnimationMode() {
   // http://www.w3.org/TR/2001/REC-smil-animation-20010904/#AnimFuncValues
   if (hasAttribute(SVGNames::valuesAttr))
     setAnimationMode(ValuesAnimation);
   else if (!toValue().isEmpty())
     setAnimationMode(fromValue().isEmpty() ? ToAnimation : FromToAnimation);
   else if (!byValue().isEmpty())
     setAnimationMode(fromValue().isEmpty() ? ByAnimation : FromByAnimation);
@@ skipping 337 matching lines @@
         calculatePercentForSpline(percent, calculateKeyTimesIndex(percent));
   else if (animationMode == FromToAnimation || animationMode == ToAnimation)
     effectivePercent = calculatePercentForFromTo(percent);
   else
     effectivePercent = percent;
 
   calculateAnimatedValue(effectivePercent, repeatCount, resultElement);
 }
 
 }  // namespace blink