Merge pull request #16018 from Snuffleupagus/GeckoView-skip-pageLabels

[GeckoView] Skip fetching/parsing of pageLabels

web/app.js

@@ -467,7 +467,9 @@ const PDFViewerApplication = {
       linkService: pdfLinkService,
       eventBus,
       updateMatchesCountOnProgress:
-        typeof PDFJSDev === "undefined" || !PDFJSDev.test("GECKOVIEW"),
+        typeof PDFJSDev === "undefined"
+          ? !window.isGECKOVIEW
+          : !PDFJSDev.test("GECKOVIEW"),
     });
     this.findController = findController;
 
@@ -1251,14 +1253,18 @@ const PDFViewerApplication = {
               spreadMode = stored.spreadMode | 0;
             }
           }
+          // NOTE: Ignore the pageMode/pageLayout in GeckoView since there's no
+          // sidebar available, nor any UI for changing the Scroll/Spread modes.
+          if (
+            typeof PDFJSDev === "undefined"
+              ? !window.isGECKOVIEW
+              : !PDFJSDev.test("GECKOVIEW")
+          ) {
             // Always let the user preference/view history take precedence.
             if (pageMode && sidebarView === SidebarView.UNKNOWN) {
               sidebarView = apiPageModeToSidebarView(pageMode);
             }
-          // NOTE: Always ignore the pageLayout in GeckoView since there's
-          // no UI available to change Scroll/Spread modes for the user.
             if (
-            (typeof PDFJSDev === "undefined" || !PDFJSDev.test("GECKOVIEW")) &&
               pageLayout &&
               scrollMode === ScrollMode.UNKNOWN &&
               spreadMode === SpreadMode.UNKNOWN
@@ -1269,6 +1275,7 @@ const PDFViewerApplication = {
               // scrollMode = modes.scrollMode;
               spreadMode = modes.spreadMode;
             }
+          }
 
           this.setInitialView(hash, {
             rotation,
@@ -1528,6 +1535,13 @@ const PDFViewerApplication = {
    * @private
    */
   async _initializePageLabels(pdfDocument) {
+    if (
+      typeof PDFJSDev === "undefined"
+        ? window.isGECKOVIEW
+        : PDFJSDev.test("GECKOVIEW")
+    ) {
+      return;
+    }
     const labels = await pdfDocument.getPageLabels();
 
     if (pdfDocument !== this.pdfDocument) {

web/pdf_scripting_manager.js

@@ -269,7 +269,9 @@ class PDFScriptingManager {
           // NOTE: Always ignore the pageLayout in GeckoView since there's
           // no UI available to change Scroll/Spread modes for the user.
           if (
-            (typeof PDFJSDev !== "undefined" && PDFJSDev.test("GECKOVIEW")) ||
+            (typeof PDFJSDev === "undefined"
+              ? window.isGECKOVIEW
+              : PDFJSDev.test("GECKOVIEW")) ||
             isInPresentationMode
           ) {
             return;

web/viewer-geckoview.js

@@ -68,6 +68,7 @@ function webViewerLoad() {
 
       document.head.append(link);
     }
+    window.isGECKOVIEW = true;
 
     import("pdfjs-web/genericcom.js").then(function (genericCom) {
       PDFViewerApplication.run(config);