core(driver): save performance.now() to avoid conflict (#6387)

GoogleChrome · Oct 25, 2018 · 37a7db7 · 37a7db7
1 parent 888bd6d
commit 37a7db7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html b/lighthouse-cli/test/fixtures/dobetterweb/dbw_tester.html
@@ -120,9 +120,12 @@
   Object.defineProperty(document.getElementById("5934b"), 'matches', {
     value: "blahblah"
   });
-
   // Ensure gatherers still work when the prototype is messed with
   HTMLElement.prototype.matches = { value: "blahblah" };
+
+
+  // Ensure long-task collection still works when performance.now is redefined
+  window.performance.now = 'right now';
 </script>
 
 <div>

diff --git a/lighthouse-core/gather/driver.js b/lighthouse-core/gather/driver.js
@@ -1207,10 +1207,13 @@ class Driver {
    * @return {Promise<void>}
    */
   async cacheNatives() {
-    await this.evaluateScriptOnNewDocument(`window.__nativePromise = Promise;
+    await this.evaluateScriptOnNewDocument(`
+        window.__nativePromise = Promise;
         window.__nativeError = Error;
         window.__nativeURL = URL;
-        window.__ElementMatches = Element.prototype.matches;`);
+        window.__ElementMatches = Element.prototype.matches;
+        window.__perfNow = performance.now.bind(performance);
+    `);
   }
 
   /**

diff --git a/lighthouse-core/lib/page-functions.js b/lighthouse-core/lib/page-functions.js
@@ -37,7 +37,7 @@ function wrapRuntimeEvalErrorInBrowser(err) {
  */
 /* istanbul ignore next */
 function registerPerformanceObserverInPage() {
-  window.____lastLongTask = window.performance.now();
+  window.____lastLongTask = window.__perfNow();
   const observer = new window.PerformanceObserver(entryList => {
     const entries = entryList.getEntries();
     for (const entry of entries) {
@@ -64,12 +64,12 @@ function registerPerformanceObserverInPage() {
 function checkTimeSinceLastLongTask() {
   // Wait for a delta before returning so that we're sure the PerformanceObserver
   // has had time to register the last longtask
-  return new Promise(resolve => {
-    const timeoutRequested = window.performance.now() + 50;
+  return new window.__nativePromise(resolve => {
+    const timeoutRequested = window.__perfNow() + 50;
 
     setTimeout(() => {
       // Double check that a long task hasn't happened since setTimeout
-      const timeoutFired = window.performance.now();
+      const timeoutFired = window.__perfNow();
       const timeSinceLongTask = timeoutFired - timeoutRequested < 50 ?
           timeoutFired - window.____lastLongTask : 0;
       resolve(timeSinceLongTask);