| Index: Source/core/svg/animation/SMILTime.h
|
| diff --git a/Source/core/svg/animation/SMILTime.h b/Source/core/svg/animation/SMILTime.h
|
| index cab9fe9d6123e19c3893b5da31c136c6a750c8f2..18a955db3f49a75be1a19f2282bf7fb285ca93e4 100644
|
| --- a/Source/core/svg/animation/SMILTime.h
|
| +++ b/Source/core/svg/animation/SMILTime.h
|
| @@ -34,23 +34,18 @@ namespace blink {
|
| class SMILTime {
|
| public:
|
| SMILTime() : m_time(0) { }
|
| - SMILTime(double time) : m_time(time) { ASSERT(!std::isnan(time)); }
|
| - SMILTime(const SMILTime& o) : m_time(o.m_time) { }
|
| + SMILTime(double time) : m_time(time) { }
|
|
|
| - static SMILTime unresolved() { return unresolvedValue; }
|
| - static SMILTime indefinite() { return indefiniteValue; }
|
| + static SMILTime unresolved() { return std::numeric_limits<double>::quiet_NaN(); }
|
| + static SMILTime indefinite() { return std::numeric_limits<double>::infinity(); }
|
|
|
| - SMILTime& operator=(const SMILTime& o) { m_time = o.m_time; return *this; }
|
| double value() const { return m_time; }
|
|
|
| - bool isFinite() const { return m_time < indefiniteValue; }
|
| - bool isIndefinite() const { return m_time == indefiniteValue; }
|
| - bool isUnresolved() const { return m_time == unresolvedValue; }
|
| + bool isFinite() const { return std::isfinite(m_time); }
|
| + bool isIndefinite() const { return std::isinf(m_time); }
|
| + bool isUnresolved() const { return std::isnan(m_time); }
|
|
|
| private:
|
| - static const double unresolvedValue;
|
| - static const double indefiniteValue;
|
| -
|
| double m_time;
|
| };
|
|
|
| @@ -88,13 +83,13 @@ struct SMILInterval {
|
| SMILTime end;
|
| };
|
|
|
| -inline bool operator==(const SMILTime& a, const SMILTime& b) { return a.isFinite() && a.value() == b.value(); }
|
| +inline bool operator==(const SMILTime& a, const SMILTime& b) { return (a.isUnresolved() && b.isUnresolved()) || a.value() == b.value(); }
|
| inline bool operator!(const SMILTime& a) { return !a.isFinite() || !a.value(); }
|
| inline bool operator!=(const SMILTime& a, const SMILTime& b) { return !operator==(a, b); }
|
| -inline bool operator>(const SMILTime& a, const SMILTime& b) { return a.value() > b.value(); }
|
| -inline bool operator<(const SMILTime& a, const SMILTime& b) { return a.value() < b.value(); }
|
| -inline bool operator>=(const SMILTime& a, const SMILTime& b) { return a.value() > b.value() || operator==(a, b); }
|
| -inline bool operator<=(const SMILTime& a, const SMILTime& b) { return a.value() < b.value() || operator==(a, b); }
|
| +inline bool operator>(const SMILTime& a, const SMILTime& b) { return a.isUnresolved() || (a.value() > b.value()); }
|
| +inline bool operator<(const SMILTime& a, const SMILTime& b) { return operator>(b, a); }
|
| +inline bool operator>=(const SMILTime& a, const SMILTime& b) { return operator>(a, b) || operator==(a, b); }
|
| +inline bool operator<=(const SMILTime& a, const SMILTime& b) { return operator<(a, b) || operator==(a, b); }
|
| inline bool operator<(const SMILTimeWithOrigin& a, const SMILTimeWithOrigin& b) { return a.time() < b.time(); }
|
|
|
| SMILTime operator+(const SMILTime&, const SMILTime&);
|
|
|