| 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 aa49b288243b451cf35a4f9024895baed6f96337..bd280b48ee85ed8f8e8af0cc76b70389baa8aad1 100644
|
| --- a/third_party/WebKit/Source/core/timing/PerformanceBase.cpp
|
| +++ b/third_party/WebKit/Source/core/timing/PerformanceBase.cpp
|
| @@ -553,16 +553,22 @@ 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 (timeOrigin == 0.0)
|
| return 0.0;
|
|
|
| - double timeInSeconds = monotonicTime - m_timeOrigin;
|
| + double timeInSeconds = monotonicTime - timeOrigin;
|
| return convertSecondsToDOMHighResTimeStamp(
|
| clampTimeResolution(timeInSeconds));
|
| }
|
|
|
| +DOMHighResTimeStamp PerformanceBase::monotonicTimeToDOMHighResTimeStamp(
|
| + double monotonicTime) const {
|
| + return monotonicTimeToDOMHighResTimeStamp(m_timeOrigin, monotonicTime);
|
| +}
|
| +
|
| DOMHighResTimeStamp PerformanceBase::now() const {
|
| return monotonicTimeToDOMHighResTimeStamp(monotonicallyIncreasingTime());
|
| }
|
|
|