Merge branch 'incoming'

1 files changed, 14 insertions, 8 deletions

diff --git a/src/library_browser.js b/src/library_browser.js
index 591a3c11..235ccc78 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -830,15 +830,21 @@ mergeInto(LibraryManager.library, {
   },
 
   emscripten_get_now: function() {
-    if (ENVIRONMENT_IS_NODE) {
-        var t = process['hrtime']();
-        return t[0] * 1e3 + t[1] / 1e6;
-    }
-    else if (ENVIRONMENT_IS_WEB && window['performance'] && window['performance']['now']) {
-      return window['performance']['now']();
-    } else {
-      return Date.now();
+    if (!_emscripten_get_now.actual) {
+      if (ENVIRONMENT_IS_NODE) {
+          _emscripten_get_now.actual = function() {
+            var t = process['hrtime']();
+            return t[0] * 1e3 + t[1] / 1e6;
+          }
+      } else if (typeof dateNow !== 'undefined') {
+        _emscripten_get_now.actual = dateNow;
+      } else if (ENVIRONMENT_IS_WEB && window['performance'] && window['performance']['now']) {
+        _emscripten_get_now.actual = function() { return window['performance']['now'](); };
+      } else {
+        _emscripten_get_now.actual = Date.now;
+      }
     }
+    return _emscripten_get_now.actual();
   },
 
   emscripten_create_worker: function(url) {