| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> | 2 * Copyright (C) 2004, 2005, 2007, 2008 Nikolas Zimmermann <zimmermann@kde.org> |
| 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> | 3 * Copyright (C) 2004, 2005, 2006 Rob Buis <buis@kde.org> |
| 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. | 4 * Copyright (C) Research In Motion Limited 2010. All rights reserved. |
| 5 * | 5 * |
| 6 * This library is free software; you can redistribute it and/or | 6 * This library is free software; you can redistribute it and/or |
| 7 * modify it under the terms of the GNU Library General Public | 7 * modify it under the terms of the GNU Library General Public |
| 8 * License as published by the Free Software Foundation; either | 8 * License as published by the Free Software Foundation; either |
| 9 * version 2 of the License, or (at your option) any later version. | 9 * version 2 of the License, or (at your option) any later version. |
| 10 * | 10 * |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 SVGMarkerOrientType otherOrientType = other.orientType()->enumValue(); | 382 SVGMarkerOrientType otherOrientType = other.orientType()->enumValue(); |
| 383 if (otherOrientType == SVGMarkerOrientAngle) | 383 if (otherOrientType == SVGMarkerOrientAngle) |
| 384 newValueSpecifiedUnits(other.unitType(), other.valueInSpecifiedUnits()); | 384 newValueSpecifiedUnits(other.unitType(), other.valueInSpecifiedUnits()); |
| 385 else | 385 else |
| 386 m_orientType->setEnumValue(otherOrientType); | 386 m_orientType->setEnumValue(otherOrientType); |
| 387 } | 387 } |
| 388 | 388 |
| 389 void SVGAngle::calculateAnimatedValue(SVGAnimationElement* animationElement, flo
at percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> fro
m, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropert
yBase> toAtEndOfDuration, SVGElement*) | 389 void SVGAngle::calculateAnimatedValue(SVGAnimationElement* animationElement, flo
at percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> fro
m, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPropert
yBase> toAtEndOfDuration, SVGElement*) |
| 390 { | 390 { |
| 391 ASSERT(animationElement); | 391 ASSERT(animationElement); |
| 392 bool isToAnimation = animationElement->animationMode() == ToAnimation; | 392 bool isToAnimation = animationElement->getAnimationMode() == ToAnimation; |
| 393 | 393 |
| 394 RefPtrWillBeRawPtr<SVGAngle> fromAngle = isToAnimation ? PassRefPtrWillBeRaw
Ptr<SVGAngle>(this) : toSVGAngle(from); | 394 RefPtrWillBeRawPtr<SVGAngle> fromAngle = isToAnimation ? PassRefPtrWillBeRaw
Ptr<SVGAngle>(this) : toSVGAngle(from); |
| 395 RefPtrWillBeRawPtr<SVGAngle> toAngle = toSVGAngle(to); | 395 RefPtrWillBeRawPtr<SVGAngle> toAngle = toSVGAngle(to); |
| 396 SVGMarkerOrientType fromOrientType = fromAngle->orientType()->enumValue(); | 396 SVGMarkerOrientType fromOrientType = fromAngle->orientType()->enumValue(); |
| 397 SVGMarkerOrientType toOrientType = toAngle->orientType()->enumValue(); | 397 SVGMarkerOrientType toOrientType = toAngle->orientType()->enumValue(); |
| 398 | 398 |
| 399 if (fromOrientType != toOrientType) { | 399 if (fromOrientType != toOrientType) { |
| 400 // Fall back to discrete animation. | 400 // Fall back to discrete animation. |
| 401 assign(percentage < 0.5f ? *fromAngle : *toAngle); | 401 assign(percentage < 0.5f ? *fromAngle : *toAngle); |
| 402 return; | 402 return; |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 436 | 436 |
| 437 void SVGAngle::orientTypeChanged() | 437 void SVGAngle::orientTypeChanged() |
| 438 { | 438 { |
| 439 if (orientType()->enumValue() == SVGMarkerOrientAuto || orientType()->enumVa
lue() == SVGMarkerOrientAutoStartReverse) { | 439 if (orientType()->enumValue() == SVGMarkerOrientAuto || orientType()->enumVa
lue() == SVGMarkerOrientAutoStartReverse) { |
| 440 m_unitType = SVG_ANGLETYPE_UNSPECIFIED; | 440 m_unitType = SVG_ANGLETYPE_UNSPECIFIED; |
| 441 m_valueInSpecifiedUnits = 0; | 441 m_valueInSpecifiedUnits = 0; |
| 442 } | 442 } |
| 443 } | 443 } |
| 444 | 444 |
| 445 } // namespace blink | 445 } // namespace blink |
| OLD | NEW |