Chromium Code Reviews| Index: Source/core/animation/DocumentTimeline.cpp |
| diff --git a/Source/core/animation/DocumentTimeline.cpp b/Source/core/animation/DocumentTimeline.cpp |
| index 77ef592d566ff005da38639a7d62257444a653db..b6cc311743003ef73179b1b9b35896a59218c896 100644 |
| --- a/Source/core/animation/DocumentTimeline.cpp |
| +++ b/Source/core/animation/DocumentTimeline.cpp |
| @@ -144,11 +144,21 @@ void DocumentTimeline::DocumentTimelineTiming::serviceOnNextFrame() |
| m_timeline->m_document->view()->scheduleAnimation(); |
| } |
| -double DocumentTimeline::currentTime() |
| +double DocumentTimeline::currentTime(bool& isNullTime) |
|
shans
2014/03/31 09:39:11
Is the reference here necessary for the IDL to wor
dstockwell
2014/03/31 23:33:29
just 'isNull'
Eric Willigers
2014/04/01 01:15:45
Done.
Eric Willigers
2014/04/01 01:15:45
This is needed because the IDL has currentTime as
|
| { |
| - if (!m_document) |
| + if (!m_document) { |
| + isNullTime = true; |
| return std::numeric_limits<double>::quiet_NaN(); |
| - return m_document->animationClock().currentTime() - m_zeroTime; |
| + } |
| + double result = m_document->animationClock().currentTime() - m_zeroTime; |
| + isNullTime = isNull(result); |
| + return result; |
| +} |
| + |
| +double DocumentTimeline::currentTime() |
| +{ |
| + bool isNullTime; |
| + return currentTime(isNullTime); |
| } |
| double DocumentTimeline::effectiveTime() |