From dde4e43b4a891fe8644f3847edecfccb0b21a3ee Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Sat, 19 Feb 2022 09:41:04 +0100
Subject: [PATCH] Use the (viewer) `parseQueryString` helper function in the
 reference tests

Rather than re-implementing this functionality in the `Driver` class, we can simply re-use the existing `parseQueryString` helper function instead.
---
 test/driver.js              | 21 +++++++--------------
 web/pdf_viewer.component.js |  3 ++-
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/test/driver.js b/test/driver.js
index 6805017d8..748322672 100644
--- a/test/driver.js
+++ b/test/driver.js
@@ -26,7 +26,7 @@ const {
   shadow,
   XfaLayer,
 } = pdfjsLib;
-const { SimpleLinkService } = pdfjsViewer;
+const { parseQueryString, SimpleLinkService } = pdfjsViewer;
 
 const WAITING_TIME = 100; // ms
 const CMAP_URL = "/build/generic/web/cmaps/";
@@ -332,25 +332,18 @@ class Driver {
     this.end = options.end;
 
     // Set parameters from the query string
-    const parameters = this._getQueryStringParameters();
-    this.browser = parameters.browser;
-    this.manifestFile = parameters.manifestFile;
-    this.delay = parameters.delay | 0 || 0;
+    const params = parseQueryString(window.location.search.substring(1));
+    this.browser = params.get("browser");
+    this.manifestFile = params.get("manifestfile");
+    this.delay = params.get("delay") | 0;
     this.inFlightRequests = 0;
-    this.testFilter = parameters.testFilter
-      ? JSON.parse(parameters.testFilter)
-      : [];
-    this.xfaOnly = parameters.xfaOnly === "true";
+    this.testFilter = JSON.parse(params.get("testfilter") || "[]");
+    this.xfaOnly = params.get("xfaonly") === "true";
 
     // Create a working canvas
     this.canvas = document.createElement("canvas");
   }
 
-  _getQueryStringParameters() {
-    const queryString = window.location.search.substring(1);
-    return Object.fromEntries(new URLSearchParams(queryString).entries());
-  }
-
   run() {
     window.onerror = (message, source, line, column, error) => {
       this._info(
diff --git a/web/pdf_viewer.component.js b/web/pdf_viewer.component.js
index a7a918cf1..51d01d05e 100644
--- a/web/pdf_viewer.component.js
+++ b/web/pdf_viewer.component.js
@@ -24,6 +24,7 @@ import {
   PDFLinkService,
   SimpleLinkService,
 } from "./pdf_link_service.js";
+import { parseQueryString, ProgressBar } from "./ui_utils.js";
 import { PDFSinglePageViewer, PDFViewer } from "./pdf_viewer.js";
 import { AnnotationLayerBuilder } from "./annotation_layer_builder.js";
 import { DownloadManager } from "./download_manager.js";
@@ -34,7 +35,6 @@ import { PDFFindController } from "./pdf_find_controller.js";
 import { PDFHistory } from "./pdf_history.js";
 import { PDFPageView } from "./pdf_page_view.js";
 import { PDFScriptingManager } from "./pdf_scripting_manager.js";
-import { ProgressBar } from "./ui_utils.js";
 import { StructTreeLayerBuilder } from "./struct_tree_layer_builder.js";
 import { TextLayerBuilder } from "./text_layer_builder.js";
 import { XfaLayerBuilder } from "./xfa_layer_builder.js";
@@ -55,6 +55,7 @@ export {
   GenericL10n,
   LinkTarget,
   NullL10n,
+  parseQueryString,
   PDFFindController,
   PDFHistory,
   PDFLinkService,