[svg2] Make 'x' and 'y' presentation attributes

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 144 matching lines @@
 {
     SVGAnimatedTypeAnimator* animator = ensureAnimator();
 
     SVGElement* targetElement = this->targetElement();
     const QualifiedName& attributeName = this->attributeName();
     ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement, attributeName);
 
     if (shouldApply == DontApplyAnimation)
         return;
 
-    if (shouldApply == ApplyXMLAnimation) {
+    if (shouldApply == ApplyXMLAnimation || shouldApply == ApplyXMLandCSSAnimation) {
         // SVG DOM animVal animation code-path.
         SVGElementInstances animatedElements = findElementInstances(targetElement);
         ASSERT(!animatedElements.isEmpty());
 
         for (SVGElement* element : animatedElements)
             addReferenceTo(element);
 
         if (!m_animatedProperty)
             m_animatedProperty = animator->startAnimValAnimation(animatedElements);
         else
@@ skipping 99 matching lines @@
 void SVGAnimateElement::clearAnimatedType(SVGElement* targetElement)
 {
     if (!m_animatedProperty)
         return;
 
     if (!targetElement) {
         m_animatedProperty.clear();
         return;
     }
 
-    if (ensureAnimator()->isAnimatingCSSProperty()) {
+    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement, attributeName());
+    if (shouldApply == ApplyXMLandCSSAnimation) {
+        removeCSSPropertyFromTargetAndInstances(targetElement, attributeName());
+    } else if (ensureAnimator()->isAnimatingCSSProperty()) {
         // CSS properties animation code-path.
         removeCSSPropertyFromTargetAndInstances(targetElement, attributeName());
         m_animatedProperty.clear();
         return;
     }
 
     // SVG DOM animVal animation code-path.
     if (m_animator) {
         SVGElementInstances animatedElements = findElementInstances(targetElement);
         m_animator->stopAnimValAnimation(animatedElements);
         notifyTargetAndInstancesAboutAnimValChange(targetElement, attributeName());
     }
 
     m_animatedProperty.clear();
 }
 
 void SVGAnimateElement::applyResultsToTarget()
 {
     ASSERT(m_animator);
     ASSERT(animatedPropertyType() != AnimatedTransformList || isSVGAnimateTransformElement(*this));
     ASSERT(animatedPropertyType() != AnimatedUnknown);
 
     // Early exit if our animated type got destructed by a previous endedActiveInterval().
     if (!m_animatedProperty)
         return;
 
-    if (m_animator->isAnimatingCSSProperty()) {
+    // We do update the style and the animation property independent of each other.
+    ShouldApplyAnimation shouldApply = shouldApplyAnimation(targetElement(), attributeName());
+    if (shouldApply == ApplyXMLandCSSAnimation) {
+        applyCSSPropertyToTargetAndInstances(targetElement(), attributeName(), m_animatedProperty->valueAsString());
+    } else if (m_animator->isAnimatingCSSProperty()) {
         // CSS properties animation code-path.
         // Convert the result of the animation to a String and apply it as CSS property on the target & all instances.
         applyCSSPropertyToTargetAndInstances(targetElement(), attributeName(), m_animatedProperty->valueAsString());
         return;
     }
 
     // SVG DOM animVal animation code-path.
     // At this point the SVG DOM values are already changed, unlike for CSS.
     // We only have to trigger update notifications here.
     notifyTargetAndInstancesAboutAnimValChange(targetElement(), attributeName());
@@ skipping 65 matching lines @@
 {
     visitor->trace(m_fromProperty);
     visitor->trace(m_toProperty);
     visitor->trace(m_toAtEndOfDurationProperty);
     visitor->trace(m_animatedProperty);
     visitor->trace(m_animator);
     SVGAnimationElement::trace(visitor);
 }
 
 }