| 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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 70 notifyChange(); | 70 notifyChange(); |
| 71 return SVGParseStatus::NoError; | 71 return SVGParseStatus::NoError; |
| 72 } | 72 } |
| 73 } | 73 } |
| 74 | 74 |
| 75 notifyChange(); | 75 notifyChange(); |
| 76 return SVGParseStatus::ExpectedEnumeration; | 76 return SVGParseStatus::ExpectedEnumeration; |
| 77 } | 77 } |
| 78 | 78 |
| 79 void SVGEnumerationBase::add(SVGPropertyBase*, SVGElement*) { | 79 void SVGEnumerationBase::add(SVGPropertyBase*, SVGElement*) { |
| 80 ASSERT_NOT_REACHED(); | 80 NOTREACHED(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void SVGEnumerationBase::calculateAnimatedValue( | 83 void SVGEnumerationBase::calculateAnimatedValue( |
| 84 SVGAnimationElement* animationElement, | 84 SVGAnimationElement* animationElement, |
| 85 float percentage, | 85 float percentage, |
| 86 unsigned repeatCount, | 86 unsigned repeatCount, |
| 87 SVGPropertyBase* from, | 87 SVGPropertyBase* from, |
| 88 SVGPropertyBase* to, | 88 SVGPropertyBase* to, |
| 89 SVGPropertyBase*, | 89 SVGPropertyBase*, |
| 90 SVGElement*) { | 90 SVGElement*) { |
| 91 ASSERT(animationElement); | 91 ASSERT(animationElement); |
| 92 unsigned short fromEnumeration = | 92 unsigned short fromEnumeration = |
| 93 animationElement->getAnimationMode() == ToAnimation | 93 animationElement->getAnimationMode() == ToAnimation |
| 94 ? m_value | 94 ? m_value |
| 95 : toSVGEnumerationBase(from)->value(); | 95 : toSVGEnumerationBase(from)->value(); |
| 96 unsigned short toEnumeration = toSVGEnumerationBase(to)->value(); | 96 unsigned short toEnumeration = toSVGEnumerationBase(to)->value(); |
| 97 | 97 |
| 98 animationElement->animateDiscreteType<unsigned short>( | 98 animationElement->animateDiscreteType<unsigned short>( |
| 99 percentage, fromEnumeration, toEnumeration, m_value); | 99 percentage, fromEnumeration, toEnumeration, m_value); |
| 100 } | 100 } |
| 101 | 101 |
| 102 float SVGEnumerationBase::calculateDistance(SVGPropertyBase*, SVGElement*) { | 102 float SVGEnumerationBase::calculateDistance(SVGPropertyBase*, SVGElement*) { |
| 103 // No paced animations for boolean. | 103 // No paced animations for boolean. |
| 104 return -1; | 104 return -1; |
| 105 } | 105 } |
| 106 | 106 |
| 107 } // namespace blink | 107 } // namespace blink |
| OLD | NEW |