Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: third_party/WebKit/Source/wtf/CurrentTime.cpp

Issue 1550563002: Blink Platform: Remove time functions from Platform. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/wtf/CurrentTime.cpp
diff --git a/third_party/WebKit/Source/wtf/CurrentTime.cpp b/third_party/WebKit/Source/wtf/CurrentTime.cpp
index 2c284b1416bbd2e461d0fe15e3f0380de229fe6f..0598cd7a088206e90984d57a3573edf10e75aca0 100644
--- a/third_party/WebKit/Source/wtf/CurrentTime.cpp
+++ b/third_party/WebKit/Source/wtf/CurrentTime.cpp
@@ -30,40 +30,38 @@
#include "wtf/CurrentTime.h"
-namespace WTF {
-
-static TimeFunction currentTimeFunction;
-static TimeFunction monotonicallyIncreasingTimeFunction;
-static TimeFunction systemTraceTimeFunction;
+#include "base/time/time.h"
-void setCurrentTimeFunction(TimeFunction func)
-{
- currentTimeFunction = func;
-}
-
-void setMonotonicallyIncreasingTimeFunction(TimeFunction func)
-{
- monotonicallyIncreasingTimeFunction = func;
-}
+namespace WTF {
-void setSystemTraceTimeFunction(TimeFunction func)
-{
- systemTraceTimeFunction = func;
-}
+static TimeFunction mockTimeFunctionForTesting = nullptr;
double currentTime()
{
- return (*currentTimeFunction)();
+ if (mockTimeFunctionForTesting)
+ return mockTimeFunctionForTesting();
+ return base::Time::Now().ToDoubleT();
}
double monotonicallyIncreasingTime()
{
- return (*monotonicallyIncreasingTimeFunction)();
+ if (mockTimeFunctionForTesting)
+ return mockTimeFunctionForTesting();
+ return base::TimeTicks::Now().ToInternalValue() / static_cast<double>(base::Time::kMicrosecondsPerSecond);
}
double systemTraceTime()
{
- return (*systemTraceTimeFunction)();
+ if (mockTimeFunctionForTesting)
+ return mockTimeFunctionForTesting();
+ return (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
+}
+
+TimeFunction setTimeFunctionsForTesting(TimeFunction newFunction)
+{
+ TimeFunction oldFunction = mockTimeFunctionForTesting;
+ mockTimeFunctionForTesting = newFunction;
+ return oldFunction;
}
} // namespace WTF

Powered by Google App Engine
This is Rietveld 408576698