| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 double activeDuration() const { return activeDurationInternal() * 1000; } | 95 double activeDuration() const { return activeDurationInternal() * 1000; } |
| 96 double activeDurationInternal() const; | 96 double activeDurationInternal() const; |
| 97 double timeFraction() const { return ensureCalculated().timeFraction; } | 97 double timeFraction() const { return ensureCalculated().timeFraction; } |
| 98 double startTime() const { return m_startTime * 1000; } | 98 double startTime() const { return m_startTime * 1000; } |
| 99 double startTimeInternal() const { return m_startTime; } | 99 double startTimeInternal() const { return m_startTime; } |
| 100 double endTime() const { return endTimeInternal() * 1000; } | 100 double endTime() const { return endTimeInternal() * 1000; } |
| 101 double endTimeInternal() const { return startTime() + specifiedTiming().star
tDelay + activeDurationInternal() + specifiedTiming().endDelay; } | 101 double endTimeInternal() const { return startTime() + specifiedTiming().star
tDelay + activeDurationInternal() + specifiedTiming().endDelay; } |
| 102 | 102 |
| 103 const AnimationPlayer* player() const { return m_player; } | 103 const AnimationPlayer* player() const { return m_player; } |
| 104 AnimationPlayer* player() { return m_player; } | 104 AnimationPlayer* player() { return m_player; } |
| 105 AnimationPlayer* player(bool& isNull) { isNull = !m_player; return m_player;
} | |
| 106 const Timing& specifiedTiming() const { return m_timing; } | 105 const Timing& specifiedTiming() const { return m_timing; } |
| 107 PassRefPtrWillBeRawPtr<AnimationNodeTiming> timing(); | 106 PassRefPtrWillBeRawPtr<AnimationNodeTiming> timing(); |
| 108 void updateSpecifiedTiming(const Timing&); | 107 void updateSpecifiedTiming(const Timing&); |
| 109 | 108 |
| 110 // This method returns time in ms as it is unused except via the API. | 109 // This method returns time in ms as it is unused except via the API. |
| 111 double localTime(bool& isNull) const { isNull = !m_player; return ensureCalc
ulated().localTime * 1000; } | 110 double localTime(bool& isNull) const { isNull = !m_player; return ensureCalc
ulated().localTime * 1000; } |
| 112 double currentIteration(bool& isNull) const { isNull = !ensureCalculated().i
sInEffect; return ensureCalculated().currentIteration; } | 111 double currentIteration(bool& isNull) const { isNull = !ensureCalculated().i
sInEffect; return ensureCalculated().currentIteration; } |
| 113 | 112 |
| 114 virtual void trace(Visitor*); | 113 virtual void trace(Visitor*); |
| 115 | 114 |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 } m_calculated; | 161 } m_calculated; |
| 163 mutable bool m_needsUpdate; | 162 mutable bool m_needsUpdate; |
| 164 mutable double m_lastUpdateTime; | 163 mutable double m_lastUpdateTime; |
| 165 | 164 |
| 166 const CalculatedTiming& ensureCalculated() const; | 165 const CalculatedTiming& ensureCalculated() const; |
| 167 }; | 166 }; |
| 168 | 167 |
| 169 } // namespace WebCore | 168 } // namespace WebCore |
| 170 | 169 |
| 171 #endif | 170 #endif |
| OLD | NEW |