| 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 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 544 if (calcMode == CalcModeSpline) { | 544 if (calcMode == CalcModeSpline) { |
| 545 ASSERT(m_keySplines.size() == m_values.size() - 1); | 545 ASSERT(m_keySplines.size() == m_values.size() - 1); |
| 546 effectivePercent = calculatePercentForSpline(effectivePercent, index); | 546 effectivePercent = calculatePercentForSpline(effectivePercent, index); |
| 547 } | 547 } |
| 548 } | 548 } |
| 549 | 549 |
| 550 void SVGAnimationElement::startedActiveInterval() | 550 void SVGAnimationElement::startedActiveInterval() |
| 551 { | 551 { |
| 552 m_animationValid = false; | 552 m_animationValid = false; |
| 553 | 553 |
| 554 if (!isValid()) |
| 555 return; |
| 556 |
| 554 if (!hasValidAttributeType()) | 557 if (!hasValidAttributeType()) |
| 555 return; | 558 return; |
| 556 | 559 |
| 557 // These validations are appropriate for all animation modes. | 560 // These validations are appropriate for all animation modes. |
| 558 if (fastHasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() != m_key
Times.size()) | 561 if (fastHasAttribute(SVGNames::keyPointsAttr) && m_keyPoints.size() != m_key
Times.size()) |
| 559 return; | 562 return; |
| 560 | 563 |
| 561 AnimationMode animationMode = this->animationMode(); | 564 AnimationMode animationMode = this->animationMode(); |
| 562 CalcMode calcMode = this->calcMode(); | 565 CalcMode calcMode = this->calcMode(); |
| 563 if (calcMode == CalcModeSpline) { | 566 if (calcMode == CalcModeSpline) { |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 686 SVGSMILElement::setAttributeName(attributeName); | 689 SVGSMILElement::setAttributeName(attributeName); |
| 687 checkInvalidCSSAttributeType(targetElement()); | 690 checkInvalidCSSAttributeType(targetElement()); |
| 688 } | 691 } |
| 689 | 692 |
| 690 void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target) | 693 void SVGAnimationElement::checkInvalidCSSAttributeType(SVGElement* target) |
| 691 { | 694 { |
| 692 m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attribut
eType() == AttributeTypeCSS && !isTargetAttributeCSSProperty(target, attributeNa
me()); | 695 m_hasInvalidCSSAttributeType = target && hasValidAttributeName() && attribut
eType() == AttributeTypeCSS && !isTargetAttributeCSSProperty(target, attributeNa
me()); |
| 693 } | 696 } |
| 694 | 697 |
| 695 } | 698 } |
| OLD | NEW |