| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 } | 81 } |
| 82 | 82 |
| 83 void SVGEnumerationBase::add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement
*) | 83 void SVGEnumerationBase::add(PassRefPtrWillBeRawPtr<SVGPropertyBase>, SVGElement
*) |
| 84 { | 84 { |
| 85 ASSERT_NOT_REACHED(); | 85 ASSERT_NOT_REACHED(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 void SVGEnumerationBase::calculateAnimatedValue(SVGAnimationElement* animationEl
ement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropert
yBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<
SVGPropertyBase>, SVGElement*) | 88 void SVGEnumerationBase::calculateAnimatedValue(SVGAnimationElement* animationEl
ement, float percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropert
yBase> from, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<
SVGPropertyBase>, SVGElement*) |
| 89 { | 89 { |
| 90 ASSERT(animationElement); | 90 ASSERT(animationElement); |
| 91 unsigned short fromEnumeration = animationElement->animationMode() == ToAnim
ation ? m_value : toSVGEnumerationBase(from)->value(); | 91 unsigned short fromEnumeration = animationElement->getAnimationMode() == ToA
nimation ? m_value : toSVGEnumerationBase(from)->value(); |
| 92 unsigned short toEnumeration = toSVGEnumerationBase(to)->value(); | 92 unsigned short toEnumeration = toSVGEnumerationBase(to)->value(); |
| 93 | 93 |
| 94 animationElement->animateDiscreteType<unsigned short>(percentage, fromEnumer
ation, toEnumeration, m_value); | 94 animationElement->animateDiscreteType<unsigned short>(percentage, fromEnumer
ation, toEnumeration, m_value); |
| 95 } | 95 } |
| 96 | 96 |
| 97 float SVGEnumerationBase::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBa
se>, SVGElement*) | 97 float SVGEnumerationBase::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBa
se>, SVGElement*) |
| 98 { | 98 { |
| 99 // No paced animations for boolean. | 99 // No paced animations for boolean. |
| 100 return -1; | 100 return -1; |
| 101 } | 101 } |
| 102 | 102 |
| 103 } // namespace blink | 103 } // namespace blink |
| OLD | NEW |