aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJukka Jylänki <jujjyl@gmail.com>2013-04-18 20:42:51 +0300
committerJukka Jylänki <jujjyl@gmail.com>2013-04-18 20:42:51 +0300
commitd1a4bcfa384c2d309a589b6d8cdfa0398e2a48f7 (patch)
tree958c9293716a3e9275b80e87c77945f5fbbad4c2
parentd8a9592f22453faa7577e9c0bf8ab3446da89241 (diff)
Make all paths of emscripten_get_now() return msecs.
-rw-r--r--src/library_browser.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index 6922c42f..85eb93f7 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -706,10 +706,10 @@ mergeInto(LibraryManager.library, {
emscripten_get_now: function() {
if (ENVIRONMENT_IS_NODE) {
var t = process['hrtime']();
- return t[0] + t[1] / 1e9;
+ return t[0] * 1e3 + t[1] / 1e6;
}
else if (window['performance'] && window['performance']['now']) {
- return window['performance']['now']() / 1000.0;
+ return window['performance']['now']();
} else {
return Date.now();
}