Merge pull request #15987 from Snuffleupagus/onOpenWithTransport-params

Remove unused parameters from the `onOpenWithTransport` method in `PDFViewerApplication.initPassiveLoading`

src/display/api.js

@@ -283,28 +283,32 @@ function getDocument(src) {
 
     switch (key) {
       case "url":
-        if (val instanceof URL) {
+        if (typeof PDFJSDev !== "undefined" && PDFJSDev.test("MOZCENTRAL")) {
-          params[key] = val.href;
+          continue; // The 'url' is unused with `PDFDataRangeTransport`.
-          continue;
+        } else {
-        }
+          if (val instanceof URL) {
-        try {
+            params[key] = val.href;
-          // The full path is required in the 'url' field.
+            continue;
-          params[key] = new URL(val, window.location).href;
-          continue;
-        } catch (ex) {
-          if (
-            typeof PDFJSDev !== "undefined" &&
-            PDFJSDev.test("GENERIC") &&
-            isNodeJS &&
-            typeof val === "string"
-          ) {
-            break; // Use the url as-is in Node.js environments.
           }
+          try {
+            // The full path is required in the 'url' field.
+            params[key] = new URL(val, window.location).href;
+            continue;
+          } catch (ex) {
+            if (
+              typeof PDFJSDev !== "undefined" &&
+              PDFJSDev.test("GENERIC") &&
+              isNodeJS &&
+              typeof val === "string"
+            ) {
+              break; // Use the url as-is in Node.js environments.
+            }
+          }
+          throw new Error(
+            "Invalid PDF url data: " +
+              "either string or URL-object is expected in the url property."
+          );
         }
-        throw new Error(
-          "Invalid PDF url data: " +
-            "either string or URL-object is expected in the url property."
-        );
       case "range":
         rangeTransport = val;
         continue;

web/app.js

@@ -749,8 +749,8 @@ const PDFViewerApplication = {
       throw new Error("Not implemented: initPassiveLoading");
     }
     this.externalServices.initPassiveLoading({
-      onOpenWithTransport: (url, length, transport) => {
+      onOpenWithTransport: range => {
-        this.open({ url, length, range: transport });
+        this.open({ range });
       },
       onOpenWithData: (data, contentDispositionFilename) => {
         if (isPdfFile(contentDispositionFilename)) {

web/firefoxcom.js

@@ -347,11 +347,7 @@ class FirefoxExternalServices extends DefaultExternalServices {
             args.filename
           );
 
-          callbacks.onOpenWithTransport(
+          callbacks.onOpenWithTransport(pdfDataRangeTransport);
-            args.pdfUrl,
-            args.length,
-            pdfDataRangeTransport
-          );
           break;
         case "range":
           pdfDataRangeTransport.onDataRange(args.begin, args.chunk);