Merge pull request #71 from Polymer/issue_70

fixes #70 -- move d8 specific code into d8_benchmark.js
googlearchive · Sep 5, 2014 · b17a7aa · b17a7aa
2 parents e223268 + 50d3df5
commit b17a7aa
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/benchmark/d8_benchmarks.js b/benchmark/d8_benchmarks.js
@@ -17,6 +17,21 @@ var setTimeout = function(callback) {
   callback();
 }
 
+var hasDebugForceFullDelivery = (function() {
+  try {
+    eval('%RunMicrotasks()');
+    return true;
+  } catch (ex) {
+    return false;
+  }
+})();
+
+if (hasDebugForceFullDelivery) {
+  Platform.performMicrotaskCheckpoint = function() {
+    eval('%RunMicrotasks()');
+  };
+}
+
 recordCount = 0;
 
 var alert = print;

diff --git a/src/observe.js b/src/observe.js
@@ -65,7 +65,7 @@
     // Firefox OS Apps do not allow eval. This feature detection is very hacky
     // but even if some other platform adds support for this function this code
     // will continue to work.
-    if (navigator.getDeviceStorage) {
+    if (typeof navigator != 'undefined' && navigator.getDeviceStorage) {
       return false;
     }
 
@@ -794,26 +794,12 @@
 
   var runningMicrotaskCheckpoint = false;
 
-  var hasDebugForceFullDelivery = hasObserve && hasEval && (function() {
-    try {
-      eval('%RunMicrotasks()');
-      return true;
-    } catch (ex) {
-      return false;
-    }
-  })();
-
   global.Platform = global.Platform || {};
 
   global.Platform.performMicrotaskCheckpoint = function() {
     if (runningMicrotaskCheckpoint)
       return;
 
-    if (hasDebugForceFullDelivery) {
-      eval('%RunMicrotasks()');
-      return;
-    }
-
     if (!collectObservers)
       return;