Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2008 Apple Inc. All rights reserved. | 2 * Copyright (C) 2008 Apple 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #ifndef SMILTime_h | 26 #ifndef SMILTime_h |
| 27 #define SMILTime_h | 27 #define SMILTime_h |
| 28 | 28 |
| 29 #include <algorithm> | 29 #include <algorithm> |
|
pdr.
2013/07/30 03:16:23
Is this in the correct order now?
tfarina
2013/07/30 03:18:59
no, but I left it intentionally :(
I wish we coul
Nico
2013/07/30 15:19:22
For now, blink does not follow chromium order.
| |
| 30 #include <wtf/MathExtras.h> | 30 #include "wtf/MathExtras.h" |
| 31 | 31 |
| 32 namespace WebCore { | 32 namespace WebCore { |
| 33 | 33 |
| 34 class SMILTime { | 34 class SMILTime { |
| 35 public: | 35 public: |
| 36 SMILTime() : m_time(0) { } | 36 SMILTime() : m_time(0) { } |
| 37 SMILTime(double time) : m_time(time) { ASSERT(!std::isnan(time)); } | 37 SMILTime(double time) : m_time(time) { ASSERT(!std::isnan(time)); } |
| 38 SMILTime(const SMILTime& o) : m_time(o.m_time) { } | 38 SMILTime(const SMILTime& o) : m_time(o.m_time) { } |
| 39 | 39 |
| 40 static SMILTime unresolved() { return unresolvedValue; } | 40 static SMILTime unresolved() { return unresolvedValue; } |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 90 inline bool operator<(const SMILTimeWithOrigin& a, const SMILTimeWithOrigin& b) { return a.time() < b.time(); } | 90 inline bool operator<(const SMILTimeWithOrigin& a, const SMILTimeWithOrigin& b) { return a.time() < b.time(); } |
| 91 | 91 |
| 92 SMILTime operator+(const SMILTime&, const SMILTime&); | 92 SMILTime operator+(const SMILTime&, const SMILTime&); |
| 93 SMILTime operator-(const SMILTime&, const SMILTime&); | 93 SMILTime operator-(const SMILTime&, const SMILTime&); |
| 94 // So multiplying times does not make too much sense but SMIL defines it for dur ation * repeatCount | 94 // So multiplying times does not make too much sense but SMIL defines it for dur ation * repeatCount |
| 95 SMILTime operator*(const SMILTime&, const SMILTime&); | 95 SMILTime operator*(const SMILTime&, const SMILTime&); |
| 96 | 96 |
| 97 } | 97 } |
| 98 | 98 |
| 99 #endif // SMILTime_h | 99 #endif // SMILTime_h |
| OLD | NEW |