From 01240fda89ba8a17b1a7566781900acfed739ac9 Mon Sep 17 00:00:00 2001 From: Jonas Jenwald Date: Tue, 31 Dec 2024 15:57:26 +0100 Subject: [PATCH] Remove the `requestRange`/`requestFull` methods from the `NetworkManager` class Originally the code in this file was used in both the GENERIC and MOZCENTRAL builds, however that's no longer the case. Hence we can now directly call `NetworkManager.prototype.request` and remove these old "helper" methods that only had a single call-site each. --- src/display/network.js | 31 ++++++++----------------------- 1 file changed, 8 insertions(+), 23 deletions(-) diff --git a/src/display/network.js b/src/display/network.js index f46fcad7cac17..8b65a5a27e675 100644 --- a/src/display/network.js +++ b/src/display/network.js @@ -52,21 +52,6 @@ class NetworkManager { this.pendingRequests = Object.create(null); } - requestRange(begin, end, listeners) { - const args = { - begin, - end, - }; - for (const prop in listeners) { - args[prop] = listeners[prop]; - } - return this.request(args); - } - - requestFull(listeners) { - return this.request(listeners); - } - request(args) { const xhr = new XMLHttpRequest(); const xhrId = this.currXhrId++; @@ -248,14 +233,13 @@ class PDFNetworkStreamFullRequestReader { constructor(manager, source) { this._manager = manager; - const args = { + this._url = source.url; + this._fullRequestId = manager.request({ onHeadersReceived: this._onHeadersReceived.bind(this), onDone: this._onDone.bind(this), onError: this._onError.bind(this), onProgress: this._onProgress.bind(this), - }; - this._url = source.url; - this._fullRequestId = manager.requestFull(args); + }); this._headersCapability = Promise.withResolvers(); this._disableRange = source.disableRange || false; this._contentLength = source.length; // Optional @@ -418,14 +402,15 @@ class PDFNetworkStreamRangeRequestReader { constructor(manager, begin, end) { this._manager = manager; - const args = { + this._url = manager.url; + this._requestId = manager.request({ + begin, + end, onHeadersReceived: this._onHeadersReceived.bind(this), onDone: this._onDone.bind(this), onError: this._onError.bind(this), onProgress: this._onProgress.bind(this), - }; - this._url = manager.url; - this._requestId = manager.requestRange(begin, end, args); + }); this._requests = []; this._queuedChunk = null; this._done = false;