| 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 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 void DocumentTimeline::setZeroTime(double zeroTime) | 117 void DocumentTimeline::setZeroTime(double zeroTime) |
| 118 { | 118 { |
| 119 ASSERT(isNull(m_zeroTime)); | 119 ASSERT(isNull(m_zeroTime)); |
| 120 m_zeroTime = zeroTime; | 120 m_zeroTime = zeroTime; |
| 121 ASSERT(!isNull(m_zeroTime)); | 121 ASSERT(!isNull(m_zeroTime)); |
| 122 serviceAnimations(); | 122 serviceAnimations(); |
| 123 } | 123 } |
| 124 | 124 |
| 125 void DocumentTimeline::DocumentTimelineTiming::wakeAfter(double duration) | 125 void DocumentTimeline::DocumentTimelineTiming::wakeAfter(double duration) |
| 126 { | 126 { |
| 127 m_timer.startOneShot(duration); | 127 m_timer.startOneShot(duration, FROM_HERE); |
| 128 } | 128 } |
| 129 | 129 |
| 130 void DocumentTimeline::DocumentTimelineTiming::cancelWake() | 130 void DocumentTimeline::DocumentTimelineTiming::cancelWake() |
| 131 { | 131 { |
| 132 m_timer.stop(); | 132 m_timer.stop(); |
| 133 } | 133 } |
| 134 | 134 |
| 135 void DocumentTimeline::DocumentTimelineTiming::serviceOnNextFrame() | 135 void DocumentTimeline::DocumentTimelineTiming::serviceOnNextFrame() |
| 136 { | 136 { |
| 137 if (m_timeline->m_document && m_timeline->m_document->view()) | 137 if (m_timeline->m_document && m_timeline->m_document->view()) |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 175 count += (timedItem && (timedItem->isCurrent() || timedItem->isInEff
ect())); | 175 count += (timedItem && (timedItem->isCurrent() || timedItem->isInEff
ect())); |
| 176 } | 176 } |
| 177 return count; | 177 return count; |
| 178 } | 178 } |
| 179 | 179 |
| 180 void DocumentTimeline::detachFromDocument() { | 180 void DocumentTimeline::detachFromDocument() { |
| 181 m_document = 0; | 181 m_document = 0; |
| 182 } | 182 } |
| 183 | 183 |
| 184 } // namespace | 184 } // namespace |
| OLD | NEW |