| Index: third_party/WebKit/Source/core/timing/PerformanceBase.cpp
|
| diff --git a/third_party/WebKit/Source/core/timing/PerformanceBase.cpp b/third_party/WebKit/Source/core/timing/PerformanceBase.cpp
|
| index 660507eee11d03eae3d5bff86da2a268791a26b1..995c7eb671c0e218f340f43dbc78430d06d43f51 100644
|
| --- a/third_party/WebKit/Source/core/timing/PerformanceBase.cpp
|
| +++ b/third_party/WebKit/Source/core/timing/PerformanceBase.cpp
|
| @@ -556,16 +556,23 @@ double PerformanceBase::clampTimeResolution(double timeSeconds) {
|
| }
|
|
|
| DOMHighResTimeStamp PerformanceBase::monotonicTimeToDOMHighResTimeStamp(
|
| - double monotonicTime) const {
|
| + double timeOrigin,
|
| + double monotonicTime) {
|
| // Avoid exposing raw platform timestamps.
|
| - if (m_timeOrigin == 0.0)
|
| + if (!monotonicTime || !timeOrigin)
|
| return 0.0;
|
|
|
| - double timeInSeconds = monotonicTime - m_timeOrigin;
|
| + double timeInSeconds = monotonicTime - timeOrigin;
|
| + DCHECK_GE(timeInSeconds, 0);
|
| return convertSecondsToDOMHighResTimeStamp(
|
| clampTimeResolution(timeInSeconds));
|
| }
|
|
|
| +DOMHighResTimeStamp PerformanceBase::monotonicTimeToDOMHighResTimeStamp(
|
| + double monotonicTime) const {
|
| + return monotonicTimeToDOMHighResTimeStamp(m_timeOrigin, monotonicTime);
|
| +}
|
| +
|
| DOMHighResTimeStamp PerformanceBase::now() const {
|
| return monotonicTimeToDOMHighResTimeStamp(monotonicallyIncreasingTime());
|
| }
|
|
|