Skip to content

Commit 30bba5f

Browse files
Merge pull request #19944 from Snuffleupagus/PDFDataRangeTransport-private-fields
Use private fields in the `PDFDataRangeTransport` class
2 parents f72f240 + 99b23ea commit 30bba5f

File tree

1 file changed

+22
-18
lines changed

1 file changed

+22
-18
lines changed

src/display/api.js

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -722,6 +722,16 @@ class PDFDocumentLoadingTask {
722722
* main-thread memory usage, however it will take ownership of the TypedArrays.
723723
*/
724724
class PDFDataRangeTransport {
725+
#capability = Promise.withResolvers();
726+
727+
#progressiveDoneListeners = [];
728+
729+
#progressiveReadListeners = [];
730+
731+
#progressListeners = [];
732+
733+
#rangeListeners = [];
734+
725735
/**
726736
* @param {number} length
727737
* @param {Uint8Array|null} initialData
@@ -738,48 +748,42 @@ class PDFDataRangeTransport {
738748
this.initialData = initialData;
739749
this.progressiveDone = progressiveDone;
740750
this.contentDispositionFilename = contentDispositionFilename;
741-
742-
this._rangeListeners = [];
743-
this._progressListeners = [];
744-
this._progressiveReadListeners = [];
745-
this._progressiveDoneListeners = [];
746-
this._readyCapability = Promise.withResolvers();
747751
}
748752

749753
/**
750754
* @param {function} listener
751755
*/
752756
addRangeListener(listener) {
753-
this._rangeListeners.push(listener);
757+
this.#rangeListeners.push(listener);
754758
}
755759

756760
/**
757761
* @param {function} listener
758762
*/
759763
addProgressListener(listener) {
760-
this._progressListeners.push(listener);
764+
this.#progressListeners.push(listener);
761765
}
762766

763767
/**
764768
* @param {function} listener
765769
*/
766770
addProgressiveReadListener(listener) {
767-
this._progressiveReadListeners.push(listener);
771+
this.#progressiveReadListeners.push(listener);
768772
}
769773

770774
/**
771775
* @param {function} listener
772776
*/
773777
addProgressiveDoneListener(listener) {
774-
this._progressiveDoneListeners.push(listener);
778+
this.#progressiveDoneListeners.push(listener);
775779
}
776780

777781
/**
778782
* @param {number} begin
779783
* @param {Uint8Array|null} chunk
780784
*/
781785
onDataRange(begin, chunk) {
782-
for (const listener of this._rangeListeners) {
786+
for (const listener of this.#rangeListeners) {
783787
listener(begin, chunk);
784788
}
785789
}
@@ -789,8 +793,8 @@ class PDFDataRangeTransport {
789793
* @param {number|undefined} total
790794
*/
791795
onDataProgress(loaded, total) {
792-
this._readyCapability.promise.then(() => {
793-
for (const listener of this._progressListeners) {
796+
this.#capability.promise.then(() => {
797+
for (const listener of this.#progressListeners) {
794798
listener(loaded, total);
795799
}
796800
});
@@ -800,23 +804,23 @@ class PDFDataRangeTransport {
800804
* @param {Uint8Array|null} chunk
801805
*/
802806
onDataProgressiveRead(chunk) {
803-
this._readyCapability.promise.then(() => {
804-
for (const listener of this._progressiveReadListeners) {
807+
this.#capability.promise.then(() => {
808+
for (const listener of this.#progressiveReadListeners) {
805809
listener(chunk);
806810
}
807811
});
808812
}
809813

810814
onDataProgressiveDone() {
811-
this._readyCapability.promise.then(() => {
812-
for (const listener of this._progressiveDoneListeners) {
815+
this.#capability.promise.then(() => {
816+
for (const listener of this.#progressiveDoneListeners) {
813817
listener();
814818
}
815819
});
816820
}
817821

818822
transportReady() {
819-
this._readyCapability.resolve();
823+
this.#capability.resolve();
820824
}
821825

822826
/**

0 commit comments

Comments
 (0)