Dedupe calls to performance.measure

mapbox · Jan 22, 2021 · 84b47b9 · 84b47b9
1 parent 10f45ed
commit 84b47b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/source/vector_tile_worker_source.js b/src/source/vector_tile_worker_source.js
@@ -192,7 +192,8 @@ class VectorTileWorkerSource implements WorkerSource {
             if (response.cacheControl) cacheControl.cacheControl = response.cacheControl;
 
             const resourceTiming = {};
-            if (perf) {
+            // because of two-phase tile loading, it's necessary to dedupe perf marking to avoid errors
+            if (perf && !perf._marksWereCleared()) {
                 const resourceTimingData = perf.finish();
                 // it's necessary to eval the result of getEntriesByName() here via parse/stringify
                 // late evaluation in the main thread causes TypeError: illegal invocation

diff --git a/src/util/performance.js b/src/util/performance.js
@@ -178,6 +178,10 @@ export class RequestPerformance {
 
         performance.mark(this._marks.start);
     }
+
+    _marksWereCleared() {
+        return performance.getEntriesByName(this._marks.start).length === 0;
+    }
 
     finish() {
         performance.mark(this._marks.end);