Hoist target element null-checks out of SVGAnimateElement::calculate*

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

 /*
  * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org>
  * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org>
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  * Copyright (C) Research In Motion Limited 2011. 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 116 matching lines @@
   SVGElement* svgParent = toSVGElement(parent);
   // Replace 'inherit' by its computed property value.
   String value = computeCSSPropertyValue(
       svgParent, cssPropertyID(attributeName().localName()));
   return m_animator.createPropertyForAnimation(value);
 }
 
 void SVGAnimateElement::calculateAnimatedValue(float percentage,
                                                unsigned repeatCount,
                                                SVGSMILElement* resultElement) {
-  ASSERT(resultElement);
-  SVGElement* targetElement = this->targetElement();
-  if (!targetElement || !isSVGAnimateElement(*resultElement))
+  DCHECK(resultElement);
+  DCHECK(targetElement());
+  if (!isSVGAnimateElement(*resultElement))
     return;
 
   ASSERT(percentage >= 0 && percentage <= 1);
   ASSERT(animatedPropertyType() != AnimatedTransformList ||
          isSVGAnimateTransformElement(*this));
   ASSERT(animatedPropertyType() != AnimatedUnknown);
   ASSERT(m_fromProperty);
   ASSERT(m_fromProperty->type() == animatedPropertyType());
   ASSERT(m_toProperty);
 
   SVGAnimateElement* resultAnimationElement =
       toSVGAnimateElement(resultElement);
   ASSERT(resultAnimationElement->m_animatedProperty);
   ASSERT(resultAnimationElement->animatedPropertyType() ==
          animatedPropertyType());
 
   if (isSVGSetElement(*this))
     percentage = 1;
 
   if (getCalcMode() == CalcModeDiscrete)
     percentage = percentage < 0.5 ? 0 : 1;
 
   // Target element might have changed.
+  SVGElement* targetElement = this->targetElement();
   m_animator.setContextElement(targetElement);
 
   // Values-animation accumulates using the last values entry corresponding to
   // the end of duration time.
   SVGPropertyBase* animatedValue = resultAnimationElement->m_animatedProperty;
   SVGPropertyBase* toAtEndOfDurationValue =
       m_toAtEndOfDurationProperty ? m_toAtEndOfDurationProperty : m_toProperty;
   SVGPropertyBase* fromValue =
       getAnimationMode() == ToAnimation ? animatedValue : m_fromProperty.get();
   SVGPropertyBase* toValue = m_toProperty;
@@ skipping 11 matching lines @@
     const String& toAtEndOfDurationString) {
   if (toAtEndOfDurationString.isEmpty())
     return false;
   m_toAtEndOfDurationProperty =
       m_animator.createPropertyForAnimation(toAtEndOfDurationString);
   return true;
 }
 
 bool SVGAnimateElement::calculateFromAndToValues(const String& fromString,
                                                  const String& toString) {
-  SVGElement* targetElement = this->targetElement();
-  if (!targetElement)
-    return false;
-
+  DCHECK(targetElement());
   m_fromProperty = m_animator.createPropertyForAnimation(fromString);
   m_fromPropertyValueType = propertyValueType(attributeName(), fromString);
   m_toProperty = m_animator.createPropertyForAnimation(toString);
   m_toPropertyValueType = propertyValueType(attributeName(), toString);
   return true;
 }
 
 bool SVGAnimateElement::calculateFromAndByValues(const String& fromString,
                                                  const String& byString) {
-  SVGElement* targetElement = this->targetElement();
-  if (!targetElement)
-    return false;
+  DCHECK(targetElement());
 
   if (getAnimationMode() == ByAnimation && !isAdditive())
     return false;
 
   // from-by animation may only be used with attributes that support addition
   // (e.g. most numeric attributes).
   if (getAnimationMode() == FromByAnimation &&
       !animatedPropertyTypeSupportsAddition())
     return false;
 
   DCHECK(!isSVGSetElement(*this));
 
   m_fromProperty = m_animator.createPropertyForAnimation(fromString);
   m_fromPropertyValueType = propertyValueType(attributeName(), fromString);
   m_toProperty = m_animator.createPropertyForAnimation(byString);
   m_toPropertyValueType = propertyValueType(attributeName(), byString);
-  m_toProperty->add(m_fromProperty, targetElement);
+  m_toProperty->add(m_fromProperty, targetElement());
   return true;
 }
 
 void SVGAnimateElement::resetAnimatedType() {
   SVGElement* targetElement = this->targetElement();
   const QualifiedName& attributeName = this->attributeName();
 
   m_animator.reset(targetElement);
 
   ShouldApplyAnimationType shouldApply =
@@ skipping 115 matching lines @@
       getAnimationMode() == FromByAnimation) {
     if (!animatedPropertyTypeSupportsAddition())
       return false;
   }
 
   return SVGAnimationElement::isAdditive();
 }
 
 float SVGAnimateElement::calculateDistance(const String& fromString,
                                            const String& toString) {
+  DCHECK(targetElement());
   // FIXME: A return value of float is not enough to support paced animations on
   // lists.
-  SVGElement* targetElement = this->targetElement();
-  if (!targetElement)
-    return -1;
   SVGPropertyBase* fromValue =
       m_animator.createPropertyForAnimation(fromString);
   SVGPropertyBase* toValue = m_animator.createPropertyForAnimation(toString);
-  return fromValue->calculateDistance(toValue, targetElement);
+  return fromValue->calculateDistance(toValue, targetElement());
 }
 
 void SVGAnimateElement::setTargetElement(SVGElement* target) {
   SVGAnimationElement::setTargetElement(target);
   resetAnimatedPropertyType();
 }
 
 void SVGAnimateElement::setAttributeName(const QualifiedName& attributeName) {
   SVGAnimationElement::setAttributeName(attributeName);
   resetAnimatedPropertyType();
@@ skipping 10 matching lines @@
 DEFINE_TRACE(SVGAnimateElement) {
   visitor->trace(m_fromProperty);
   visitor->trace(m_toProperty);
   visitor->trace(m_toAtEndOfDurationProperty);
   visitor->trace(m_animatedProperty);
   visitor->trace(m_animator);
   SVGAnimationElement::trace(visitor);
 }
 
 }  // namespace blink