From caef47a0cf65d978d7734b6283ab7c94bf099e59 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Tue, 25 Oct 2022 15:07:12 +0200
Subject: [PATCH] Remove the `PdfManager.onLoadedStream` method (PR 15616
 follow-up)

After the clean-up in PR 15616, the `PdfManager.onLoadedStream` method now only has a single call-site.
Hence why this patch suggests that we remove this method and replace it with an *optional* parameter in `PdfManager.requestLoadedStream` instead. By making the new behaviour opt-in, we'll thus not change any existing call-site.
---
 src/core/chunked_stream.js | 12 +++++-------
 src/core/pdf_manager.js    | 20 ++++----------------
 src/core/worker.js         |  2 +-
 3 files changed, 10 insertions(+), 24 deletions(-)

diff --git a/src/core/chunked_stream.js b/src/core/chunked_stream.js
index b85abe0a8..28ed97855 100644
--- a/src/core/chunked_stream.js
+++ b/src/core/chunked_stream.js
@@ -282,10 +282,6 @@ class ChunkedStreamManager {
     this._loadedStreamCapability = createPromiseCapability();
   }
 
-  onLoadedStream() {
-    return this._loadedStreamCapability.promise;
-  }
-
   sendRequest(begin, end) {
     const rangeReader = this.pdfNetworkStream.getRangeReader(begin, end);
     if (!rangeReader.isStreamingSupported) {
@@ -327,9 +323,11 @@ class ChunkedStreamManager {
    * Get all the chunks that are not yet loaded and group them into
    * contiguous ranges to load in as few requests as possible.
    */
-  requestAllChunks() {
-    const missingChunks = this.stream.getMissingChunks();
-    this._requestChunks(missingChunks);
+  requestAllChunks(noFetch = false) {
+    if (!noFetch) {
+      const missingChunks = this.stream.getMissingChunks();
+      this._requestChunks(missingChunks);
+    }
     return this._loadedStreamCapability.promise;
   }
 
diff --git a/src/core/pdf_manager.js b/src/core/pdf_manager.js
index 6c685c997..0e9748222 100644
--- a/src/core/pdf_manager.js
+++ b/src/core/pdf_manager.js
@@ -55,10 +55,6 @@ class BasePdfManager {
     return shadow(this, "docBaseUrl", catalog.baseUrl || this._docBaseUrl);
   }
 
-  onLoadedStream() {
-    unreachable("Abstract method `onLoadedStream` called");
-  }
-
   ensureDoc(prop, args) {
     return this.ensure(this.pdfDocument, prop, args);
   }
@@ -103,7 +99,7 @@ class BasePdfManager {
     unreachable("Abstract method `requestRange` called");
   }
 
-  requestLoadedStream() {
+  requestLoadedStream(noFetch = false) {
     unreachable("Abstract method `requestLoadedStream` called");
   }
 
@@ -156,11 +152,7 @@ class LocalPdfManager extends BasePdfManager {
     return Promise.resolve();
   }
 
-  requestLoadedStream() {
-    return this._loadedStreamPromise;
-  }
-
-  onLoadedStream() {
+  requestLoadedStream(noFetch = false) {
     return this._loadedStreamPromise;
   }
 
@@ -214,18 +206,14 @@ class NetworkPdfManager extends BasePdfManager {
     return this.streamManager.requestRange(begin, end);
   }
 
-  requestLoadedStream() {
-    return this.streamManager.requestAllChunks();
+  requestLoadedStream(noFetch = false) {
+    return this.streamManager.requestAllChunks(noFetch);
   }
 
   sendProgressiveData(chunk) {
     this.streamManager.onReceiveData({ chunk });
   }
 
-  onLoadedStream() {
-    return this.streamManager.onLoadedStream();
-  }
-
   terminate(reason) {
     this.streamManager.abort(reason);
   }
diff --git a/src/core/worker.js b/src/core/worker.js
index f0d0e54a4..073fb2882 100644
--- a/src/core/worker.js
+++ b/src/core/worker.js
@@ -420,7 +420,7 @@ class WorkerMessageHandler {
           }
           pdfManager = newPdfManager;
 
-          pdfManager.onLoadedStream().then(function (stream) {
+          pdfManager.requestLoadedStream(/* noFetch = */ true).then(stream => {
             handler.send("DataLoaded", { length: stream.bytes.byteLength });
           });
         })