| 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 |
| (...skipping 199 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 210 | 210 |
| 211 void SMILTimeContainer::scheduleAnimationFrame(SMILTime fireTime) | 211 void SMILTimeContainer::scheduleAnimationFrame(SMILTime fireTime) |
| 212 { | 212 { |
| 213 if (!isTimelineRunning()) | 213 if (!isTimelineRunning()) |
| 214 return; | 214 return; |
| 215 | 215 |
| 216 if (!fireTime.isFinite()) | 216 if (!fireTime.isFinite()) |
| 217 return; | 217 return; |
| 218 | 218 |
| 219 SMILTime delay = max(fireTime - elapsed(), SMILTime(animationFrameDelay)); | 219 SMILTime delay = max(fireTime - elapsed(), SMILTime(animationFrameDelay)); |
| 220 m_timer.startOneShot(delay.value()); | 220 m_timer.startOneShot(delay.value(), FROM_HERE); |
| 221 } | 221 } |
| 222 | 222 |
| 223 void SMILTimeContainer::scheduleAnimationFrame() | 223 void SMILTimeContainer::scheduleAnimationFrame() |
| 224 { | 224 { |
| 225 if (!isTimelineRunning()) | 225 if (!isTimelineRunning()) |
| 226 return; | 226 return; |
| 227 | 227 |
| 228 m_timer.startOneShot(0); | 228 m_timer.startOneShot(0, FROM_HERE); |
| 229 } | 229 } |
| 230 | 230 |
| 231 void SMILTimeContainer::cancelAnimationFrame() | 231 void SMILTimeContainer::cancelAnimationFrame() |
| 232 { | 232 { |
| 233 m_timer.stop(); | 233 m_timer.stop(); |
| 234 } | 234 } |
| 235 | 235 |
| 236 void SMILTimeContainer::timerFired(Timer<SMILTimeContainer>*) | 236 void SMILTimeContainer::timerFired(Timer<SMILTimeContainer>*) |
| 237 { | 237 { |
| 238 ASSERT(isTimelineRunning()); | 238 ASSERT(isTimelineRunning()); |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 351 | 351 |
| 352 if (animDiscard->inDocument()) { | 352 if (animDiscard->inDocument()) { |
| 353 animDiscard->remove(IGNORE_EXCEPTION); | 353 animDiscard->remove(IGNORE_EXCEPTION); |
| 354 ASSERT(!animDiscard->inDocument()); | 354 ASSERT(!animDiscard->inDocument()); |
| 355 } | 355 } |
| 356 } | 356 } |
| 357 } | 357 } |
| 358 } | 358 } |
| 359 | 359 |
| 360 } | 360 } |
| OLD | NEW |