aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoseph Gentle <josephg@gmail.com>2013-06-30 10:04:39 -0700
committerJoseph Gentle <josephg@gmail.com>2013-06-30 10:04:39 -0700
commit77b9c550450e39555913ba2e08144a4dd3b964a1 (patch)
tree018d1e065551ce15f3e84bf0a1bab19a10fdbcda
parent18a6854c28e0fcef76f31a5c552cc3a189213625 (diff)
Fixed emscripten_get_now in a shell
-rw-r--r--src/library_browser.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/library_browser.js b/src/library_browser.js
index d007d9a7..d9fd3ee5 100644
--- a/src/library_browser.js
+++ b/src/library_browser.js
@@ -805,7 +805,7 @@ mergeInto(LibraryManager.library, {
var t = process['hrtime']();
return t[0] * 1e3 + t[1] / 1e6;
}
- else if (window['performance'] && window['performance']['now']) {
+ else if (ENVIRONMENT_IS_WEB && window['performance'] && window['performance']['now']) {
return window['performance']['now']();
} else {
return Date.now();