Push animation value 'inherit' handling 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
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #include "core/svg/SVGAnimationElement.h"
 
 #include "bindings/core/v8/ExceptionState.h"
-#include "core/CSSPropertyNames.h"
 #include "core/SVGNames.h"
-#include "core/css/CSSComputedStyleDeclaration.h"
-#include "core/css/parser/CSSParser.h"
 #include "core/frame/UseCounter.h"
 #include "core/svg/SVGAnimateElement.h"
-#include "core/svg/SVGElement.h"
 #include "core/svg/SVGParserUtilities.h"
 #include "wtf/MathExtras.h"
 
 namespace blink {
 
 SVGAnimationElement::SVGAnimationElement(const QualifiedName& tagName,
                                          Document& document)
     : SVGSMILElement(tagName, document),
-      m_fromPropertyValueType(RegularPropertyValue),
-      m_toPropertyValueType(RegularPropertyValue),
       m_animationValid(false),
       m_attributeType(AttributeTypeAuto),
       m_hasInvalidCSSAttributeType(false),
       m_calcMode(CalcModeLinear),
       m_animationMode(NoAnimation) {
   ASSERT(RuntimeEnabledFeatures::smilEnabled());
   UseCounter::count(document, UseCounter::SVGAnimationElement);
 }
 
 bool SVGAnimationElement::parseValues(const String& value,
                                       Vector<String>& result) {
-  // Per the SMIL specification, leading and trailing white space,
-  // and white space before and after semicolon separators, is allowed and will be ignored.
+  // Per the SMIL specification, leading and trailing white space, and white
+  // space before and after semicolon separators, is allowed and will be
+  // ignored.
   // http://www.w3.org/TR/SVG11/animate.html#ValuesAttribute
   result.clear();
   Vector<String> parseList;
   value.split(';', true, parseList);
   unsigned last = parseList.size() - 1;
   for (unsigned i = 0; i <= last; ++i) {
     if (parseList[i].isEmpty()) {
       // Tolerate trailing ';'
       if (i < last)
         goto fail;
@@ skipping 104 matching lines @@
   }
 
   if (name == SVGNames::keyTimesAttr) {
     if (!parseKeyTimes(value, m_keyTimes, true))
       reportAttributeParsingError(SVGParseStatus::ParsingFailed, name, value);
     return;
   }
 
   if (name == SVGNames::keyPointsAttr) {
     if (isSVGAnimateMotionElement(*this)) {
-      // This is specified to be an animateMotion attribute only but it is simpler to put it here
-      // where the other timing calculatations are.
+      // This is specified to be an animateMotion attribute only but it is
+      // simpler to put it here where the other timing calculatations are.
       if (!parseKeyTimes(value, m_keyPoints, false))
         reportAttributeParsingError(SVGParseStatus::ParsingFailed, name, value);
     }
     return;
   }
 
   if (name == SVGNames::keySplinesAttr) {
     if (!parseKeySplines(value, m_keySplines))
       reportAttributeParsingError(SVGParseStatus::ParsingFailed, name, value);
     return;
@@ skipping 169 matching lines @@
 }
 
 SVGAnimationElement::ShouldApplyAnimationType
 SVGAnimationElement::shouldApplyAnimation(SVGElement* targetElement,
                                           const QualifiedName& attributeName) {
   if (!hasValidAttributeType() || attributeName == anyQName() ||
       !targetElement || !targetElement->inActiveDocument() ||
       !targetElement->parentNode())
     return DontApplyAnimation;
 
-  // Always animate CSS properties, using the ApplyCSSAnimation code path, regardless of the attributeType value.
+  // Always animate CSS properties using the ApplyCSSAnimation code path,
+  // regardless of the attributeType value.
   if (isTargetAttributeCSSProperty(targetElement, attributeName)) {
     if (targetElement->isPresentationAttributeWithSVGDOM(attributeName))
       return ApplyXMLandCSSAnimation;
 
     return ApplyCSSAnimation;
   }
-  // If attributeType="CSS" and attributeName doesn't point to a CSS property, ignore the animation.
+  // If attributeType="CSS" and attributeName doesn't point to a CSS property,
+  // ignore the animation.
   if (getAttributeType() == AttributeTypeCSS)
     return DontApplyAnimation;
 
   return ApplyXMLAnimation;
 }
 
 void SVGAnimationElement::calculateKeyTimesForCalcModePaced() {
   ASSERT(getCalcMode() == CalcModePaced);
   ASSERT(getAnimationMode() == ValuesAnimation);
 
   unsigned valuesCount = m_values.size();
   ASSERT(valuesCount >= 1);
   if (valuesCount == 1)
     return;
 
-  // FIXME, webkit.org/b/109010: m_keyTimes should not be modified in this function.
+  // FIXME, webkit.org/b/109010: m_keyTimes should not be modified in this
+  // function.
   m_keyTimes.clear();
 
   Vector<float> keyTimesForPaced;
   float totalDistance = 0;
   keyTimesForPaced.append(0);
   for (unsigned n = 0; n < valuesCount - 1; ++n) {
     // Distance in any units
     float distance = calculateDistance(m_values[n], m_values[n + 1]);
     if (distance < 0)
       return;
@@ skipping 197 matching lines @@
     return;
   if ((animationMode == FromToAnimation || animationMode == FromByAnimation ||
        animationMode == ToAnimation || animationMode == ByAnimation) &&
       (fastHasAttribute(SVGNames::keyPointsAttr) &&
        fastHasAttribute(SVGNames::keyTimesAttr) &&
        (m_keyTimes.size() < 2 || m_keyTimes.size() != m_keyPoints.size())))
     return;
   if (animationMode == FromToAnimation) {
     m_animationValid = calculateFromAndToValues(from, to);
   } else if (animationMode == ToAnimation) {
-    // For to-animations the from value is the current accumulated value from lower priority animations.
+    // For to-animations the from value is the current accumulated value from
+    // lower priority animations.
     // The value is not static and is determined during the animation.
     m_animationValid = calculateFromAndToValues(emptyString(), to);
   } else if (animationMode == FromByAnimation) {
     m_animationValid = calculateFromAndByValues(from, by);
   } else if (animationMode == ByAnimation) {
     m_animationValid = calculateFromAndByValues(emptyString(), by);
   } else if (animationMode == ValuesAnimation) {
     m_animationValid =
         m_values.size() >= 1 && (calcMode == CalcModePaced ||
                                  !fastHasAttribute(SVGNames::keyTimesAttr) ||
@@ skipping 49 matching lines @@
     effectivePercent =
         calculatePercentForSpline(percent, calculateKeyTimesIndex(percent));
   else if (animationMode == FromToAnimation || animationMode == ToAnimation)
     effectivePercent = calculatePercentForFromTo(percent);
   else
     effectivePercent = percent;
 
   calculateAnimatedValue(effectivePercent, repeatCount, resultElement);
 }
 
-void SVGAnimationElement::computeCSSPropertyValue(SVGElement* element,
-                                                  CSSPropertyID id,
-                                                  String& value) {
-  ASSERT(element);
-  // FIXME: StyleEngine doesn't support document without a frame.
-  // Refer to comment in Element::computedStyle.
-  ASSERT(element->inActiveDocument());
-
-  // Don't include any properties resulting from CSS Transitions/Animations or SMIL animations, as we want to retrieve the "base value".
-  element->setUseOverrideComputedStyle(true);
-  value = CSSComputedStyleDeclaration::create(element)->getPropertyValue(id);
-  element->setUseOverrideComputedStyle(false);
-}
-
-void SVGAnimationElement::adjustForInheritance(
-    SVGElement* targetElement,
-    const QualifiedName& attributeName,
-    String& value) {
-  // FIXME: At the moment the computed style gets returned as a String and needs to get parsed again.
-  // In the future we might want to work with the value type directly to avoid the String parsing.
-  ASSERT(targetElement);
-
-  Element* parent = targetElement->parentElement();
-  if (!parent || !parent->isSVGElement())
-    return;
-
-  SVGElement* svgParent = toSVGElement(parent);
-  computeCSSPropertyValue(svgParent, cssPropertyID(attributeName.localName()),
-                          value);
-}
-
-static bool inheritsFromProperty(SVGElement* targetElement,
-                                 const QualifiedName& attributeName,
-                                 const String& value) {
-  ASSERT(targetElement);
-  DEFINE_STATIC_LOCAL(const AtomicString, inherit, ("inherit"));
-
-  if (value.isEmpty() || value != inherit)
-    return false;
-  return SVGElement::isAnimatableCSSProperty(attributeName);
-}
-
-void SVGAnimationElement::determinePropertyValueTypes(const String& from,
-                                                      const String& to) {
-  SVGElement* targetElement = this->targetElement();
-  ASSERT(targetElement);
-
-  const QualifiedName& attributeName = this->attributeName();
-  if (inheritsFromProperty(targetElement, attributeName, from))
-    m_fromPropertyValueType = InheritValue;
-  if (inheritsFromProperty(targetElement, attributeName, to))
-    m_toPropertyValueType = InheritValue;
-}
-
 void SVGAnimationElement::setTargetElement(SVGElement* target) {
   SVGSMILElement::setTargetElement(target);
   checkInvalidCSSAttributeType();
 }
 
 void SVGAnimationElement::setAttributeName(const QualifiedName& attributeName) {
   SVGSMILElement::setAttributeName(attributeName);
   checkInvalidCSSAttributeType();
 }
 
@@ skipping 12 matching lines @@
     if (!hasInvalidCSSAttributeType)
       schedule();
   }
 
   // Clear values that may depend on the previous target.
   if (targetElement())
     clearAnimatedType();
 }
 
 }  // namespace blink