| 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 23 matching lines...) Expand all  Loading... | 
| 34 | 34 | 
| 35 #include "core/svg/SVGAnimationElement.h" | 35 #include "core/svg/SVGAnimationElement.h" | 
| 36 | 36 | 
| 37 namespace blink { | 37 namespace blink { | 
| 38 | 38 | 
| 39 SVGInteger::SVGInteger(int value) | 39 SVGInteger::SVGInteger(int value) | 
| 40     : m_value(value) | 40     : m_value(value) | 
| 41 { | 41 { | 
| 42 } | 42 } | 
| 43 | 43 | 
| 44 PassRefPtr<SVGInteger> SVGInteger::clone() const | 44 PassRefPtrWillBeRawPtr<SVGInteger> SVGInteger::clone() const | 
| 45 { | 45 { | 
| 46     return create(m_value); | 46     return create(m_value); | 
| 47 } | 47 } | 
| 48 | 48 | 
| 49 String SVGInteger::valueAsString() const | 49 String SVGInteger::valueAsString() const | 
| 50 { | 50 { | 
| 51     return String::number(m_value); | 51     return String::number(m_value); | 
| 52 } | 52 } | 
| 53 | 53 | 
| 54 void SVGInteger::setValueAsString(const String& string, ExceptionState& exceptio
    nState) | 54 void SVGInteger::setValueAsString(const String& string, ExceptionState& exceptio
    nState) | 
| (...skipping 10 matching lines...) Expand all  Loading... | 
| 65         exceptionState.throwDOMException(SyntaxError, "The value provided ('" + 
    string + "') is invalid."); | 65         exceptionState.throwDOMException(SyntaxError, "The value provided ('" + 
    string + "') is invalid."); | 
| 66         m_value = 0; | 66         m_value = 0; | 
| 67     } | 67     } | 
| 68 } | 68 } | 
| 69 | 69 | 
| 70 void SVGInteger::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*) | 70 void SVGInteger::add(PassRefPtrWillBeRawPtr<SVGPropertyBase> other, SVGElement*) | 
| 71 { | 71 { | 
| 72     setValue(m_value + toSVGInteger(other)->value()); | 72     setValue(m_value + toSVGInteger(other)->value()); | 
| 73 } | 73 } | 
| 74 | 74 | 
| 75 void SVGInteger::calculateAnimatedValue(SVGAnimationElement* animationElement, f
    loat percentage, unsigned repeatCount, PassRefPtr<SVGPropertyBase> from, PassRef
    Ptr<SVGPropertyBase> to, PassRefPtr<SVGPropertyBase> toAtEndOfDuration, SVGEleme
    nt*) | 75 void SVGInteger::calculateAnimatedValue(SVGAnimationElement* animationElement, f
    loat percentage, unsigned repeatCount, PassRefPtrWillBeRawPtr<SVGPropertyBase> f
    rom, PassRefPtrWillBeRawPtr<SVGPropertyBase> to, PassRefPtrWillBeRawPtr<SVGPrope
    rtyBase> toAtEndOfDuration, SVGElement*) | 
| 76 { | 76 { | 
| 77     ASSERT(animationElement); | 77     ASSERT(animationElement); | 
| 78 | 78 | 
| 79     RefPtr<SVGInteger> fromInteger = toSVGInteger(from); | 79     RefPtrWillBeRawPtr<SVGInteger> fromInteger = toSVGInteger(from); | 
| 80     RefPtr<SVGInteger> toInteger = toSVGInteger(to); | 80     RefPtrWillBeRawPtr<SVGInteger> toInteger = toSVGInteger(to); | 
| 81     RefPtr<SVGInteger> toAtEndOfDurationInteger = toSVGInteger(toAtEndOfDuration
    ); | 81     RefPtrWillBeRawPtr<SVGInteger> toAtEndOfDurationInteger = toSVGInteger(toAtE
    ndOfDuration); | 
| 82 | 82 | 
| 83     float animatedFloat = m_value; | 83     float animatedFloat = m_value; | 
| 84     animationElement->animateAdditiveNumber(percentage, repeatCount, fromInteger
    ->value(), toInteger->value(), toAtEndOfDurationInteger->value(), animatedFloat)
    ; | 84     animationElement->animateAdditiveNumber(percentage, repeatCount, fromInteger
    ->value(), toInteger->value(), toAtEndOfDurationInteger->value(), animatedFloat)
    ; | 
| 85     m_value = static_cast<int>(roundf(animatedFloat)); | 85     m_value = static_cast<int>(roundf(animatedFloat)); | 
| 86 } | 86 } | 
| 87 | 87 | 
| 88 float SVGInteger::calculateDistance(PassRefPtr<SVGPropertyBase> other, SVGElemen
    t*) | 88 float SVGInteger::calculateDistance(PassRefPtrWillBeRawPtr<SVGPropertyBase> othe
    r, SVGElement*) | 
| 89 { | 89 { | 
| 90     return abs(m_value - toSVGInteger(other)->value()); | 90     return abs(m_value - toSVGInteger(other)->value()); | 
| 91 } | 91 } | 
| 92 | 92 | 
| 93 } | 93 } | 
| OLD | NEW | 
|---|