| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006, 2007 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> | 4 * Copyright (C) 2007 Eric Seidel <eric@webkit.org> |
| 5 * Copyright (C) 2008 Apple Inc. All rights reserved. | 5 * Copyright (C) 2008 Apple Inc. All rights reserved. |
| 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> | 6 * Copyright (C) 2009 Cameron McCormack <cam@mcc.id.au> |
| 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 7 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 8 * | 8 * |
| 9 * This library is free software; you can redistribute it and/or | 9 * This library is free software; you can redistribute it and/or |
| 10 * modify it under the terms of the GNU Library General Public | 10 * modify it under the terms of the GNU Library General Public |
| (...skipping 528 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 539 if (calcMode == CalcModeSpline) { | 539 if (calcMode == CalcModeSpline) { |
| 540 ASSERT(m_keySplines.size() == m_values.size() - 1); | 540 ASSERT(m_keySplines.size() == m_values.size() - 1); |
| 541 effectivePercent = calculatePercentForSpline(effectivePercent, index); | 541 effectivePercent = calculatePercentForSpline(effectivePercent, index); |
| 542 } | 542 } |
| 543 } | 543 } |
| 544 | 544 |
| 545 void SVGAnimationElement::startedActiveInterval() | 545 void SVGAnimationElement::startedActiveInterval() |
| 546 { | 546 { |
| 547 m_animationValid = false; | 547 m_animationValid = false; |
| 548 | 548 |
| 549 if (!isValid()) |
| 550 return; |
| 551 |
| 549 if (!hasValidAttributeType()) | 552 if (!hasValidAttributeType()) |
| 550 return; | 553 return; |
| 551 | 554 |
| 552 // These validations are appropriate for all animation modes. | 555 // These validations are appropriate for all animation modes. |
| 553 if (fastHasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() != m_key
Times.size()) | 556 if (fastHasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() != m_key
Times.size()) |
| 554 return; | 557 return; |
| 555 | 558 |
| 556 AnimationMode animationMode = this->animationMode(); | 559 AnimationMode animationMode = this->animationMode(); |
| 557 CalcMode calcMode = this->calcMode(); | 560 CalcMode calcMode = this->calcMode(); |
| 558 if (calcMode == CalcModeSpline) { | 561 if (calcMode == CalcModeSpline) { |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 681 SVGSMILElement::setAttributeName(attributeName); | 684 SVGSMILElement::setAttributeName(attributeName); |
| 682 checkInvalidCSSAttributeType(targetElement()); | 685 checkInvalidCSSAttributeType(targetElement()); |
| 683 } | 686 } |
| 684 | 687 |
| 685 void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target) | 688 void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target) |
| 686 { | 689 { |
| 687 m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attribut
eType() == AttributeTypeCSS && !isTargetAttributeCSSProperty(target, attributeNa
me()); | 690 m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attribut
eType() == AttributeTypeCSS && !isTargetAttributeCSSProperty(target, attributeNa
me()); |
| 688 } | 691 } |
| 689 | 692 |
| 690 } | 693 } |
| OLD | NEW |