| 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 111 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  122 void DocumentTimeline::setZeroTime(double zeroTime) |  122 void DocumentTimeline::setZeroTime(double zeroTime) | 
|  123 { |  123 { | 
|  124     ASSERT(isNull(m_zeroTime)); |  124     ASSERT(isNull(m_zeroTime)); | 
|  125     m_zeroTime = zeroTime; |  125     m_zeroTime = zeroTime; | 
|  126     ASSERT(!isNull(m_zeroTime)); |  126     ASSERT(!isNull(m_zeroTime)); | 
|  127     serviceAnimations(); |  127     serviceAnimations(); | 
|  128 } |  128 } | 
|  129  |  129  | 
|  130 void DocumentTimeline::DocumentTimelineTiming::wakeAfter(double duration) |  130 void DocumentTimeline::DocumentTimelineTiming::wakeAfter(double duration) | 
|  131 { |  131 { | 
|  132     m_timer.startOneShot(duration); |  132     m_timer.startOneShot(duration, FROM_HERE); | 
|  133 } |  133 } | 
|  134  |  134  | 
|  135 void DocumentTimeline::DocumentTimelineTiming::cancelWake() |  135 void DocumentTimeline::DocumentTimelineTiming::cancelWake() | 
|  136 { |  136 { | 
|  137     m_timer.stop(); |  137     m_timer.stop(); | 
|  138 } |  138 } | 
|  139  |  139  | 
|  140 void DocumentTimeline::DocumentTimelineTiming::serviceOnNextFrame() |  140 void DocumentTimeline::DocumentTimelineTiming::serviceOnNextFrame() | 
|  141 { |  141 { | 
|  142     if (m_timeline->m_document && m_timeline->m_document->view()) |  142     if (m_timeline->m_document && m_timeline->m_document->view()) | 
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  180             count += (timedItem && (timedItem->isCurrent() || timedItem->isInEff
     ect())); |  180             count += (timedItem && (timedItem->isCurrent() || timedItem->isInEff
     ect())); | 
|  181     } |  181     } | 
|  182     return count; |  182     return count; | 
|  183 } |  183 } | 
|  184  |  184  | 
|  185 void DocumentTimeline::detachFromDocument() { |  185 void DocumentTimeline::detachFromDocument() { | 
|  186     m_document = 0; |  186     m_document = 0; | 
|  187 } |  187 } | 
|  188  |  188  | 
|  189 } // namespace |  189 } // namespace | 
| OLD | NEW |