Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #10714 from Snuffleupagus/firefox-transport-stream-progress

Browse Source 
[Firefox] Ensure that loading progress is reported, and the loadingBar updated, when `disableRange=true` is set
This commit is contained in:
Tim van der Meij 2019-04-06 16:40:40 +02:00 committed by GitHub
commit 2a9d195a43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/display/api.js
View File

@ -515,6 +515,7 @@ const PDFDocumentLoadingTask = (function PDFDocumentLoadingTaskClosure() {
* Abstract class to support range requests file loading. * Abstract class to support range requests file loading.
* @param {number} length * @param {number} length
* @param {Uint8Array} initialData * @param {Uint8Array} initialData
* @param {boolean} progressiveDone
*/ */
class PDFDataRangeTransport { class PDFDataRangeTransport {
constructor(length, initialData, progressiveDone = false) { constructor(length, initialData, progressiveDone = false) {
@ -551,10 +552,10 @@ class PDFDataRangeTransport {
} }
} }
onDataProgress(loaded) { onDataProgress(loaded, total) {
this._readyCapability.promise.then(() => { this._readyCapability.promise.then(() => {
for (const listener of this._progressListeners) { for (const listener of this._progressListeners) {
listener(loaded); listener(loaded, total);
} }
}); });
} }

11
src/display/transport_stream.js
View File

@ -41,8 +41,8 @@ var PDFDataTransportStream = (function PDFDataTransportStreamClosure() {
this._onReceiveData({ begin, chunk, }); this._onReceiveData({ begin, chunk, });
}); });
this._pdfDataRangeTransport.addProgressListener((loaded) => { this._pdfDataRangeTransport.addProgressListener((loaded, total) => {
this._onProgress({ loaded, }); this._onProgress({ loaded, total, });
}); });
this._pdfDataRangeTransport.addProgressiveReadListener((chunk) => { this._pdfDataRangeTransport.addProgressiveReadListener((chunk) => {
@ -77,13 +77,18 @@ var PDFDataTransportStream = (function PDFDataTransportStreamClosure() {
}, },
_onProgress: function PDFDataTransportStream_onDataProgress(evt) { _onProgress: function PDFDataTransportStream_onDataProgress(evt) {
if (this._rangeReaders.length > 0) { if (evt.total === undefined && this._rangeReaders.length > 0) {
// Reporting to first range reader. // Reporting to first range reader.
var firstReader = this._rangeReaders[0]; var firstReader = this._rangeReaders[0];
if (firstReader.onProgress) { if (firstReader.onProgress) {
firstReader.onProgress({ loaded: evt.loaded, }); firstReader.onProgress({ loaded: evt.loaded, });
return;
} }
} }
let fullReader = this._fullRequestReader;
if (fullReader && fullReader.onProgress) {
fullReader.onProgress({ loaded: evt.loaded, total: evt.total, });
}
}, },
_onProgressiveDone() { _onProgressiveDone() {

4
web/firefoxcom.js
View File

@ -269,6 +269,10 @@ PDFViewerApplication.externalServices = {
break; break;
case 'progressiveRead': case 'progressiveRead':
pdfDataRangeTransport.onDataProgressiveRead(args.chunk); pdfDataRangeTransport.onDataProgressiveRead(args.chunk);
// Don't forget to report loading progress as well, since otherwise
// the loadingBar won't update when `disableRange=true` is set.
pdfDataRangeTransport.onDataProgress(args.loaded, args.total);
break; break;
case 'progressiveDone': case 'progressiveDone':
if (pdfDataRangeTransport) { if (pdfDataRangeTransport) {