Merge pull request mozilla#3124 from mduan/issue3118-1

yurydelendik · yurydelendik · commit a081c2d0f1a6 · 2013-05-03T16:51:32.000-07:00
Update loading bar during onprogress of range requests
diff --git a/extensions/firefox/components/PdfStreamConverter.js b/extensions/firefox/components/PdfStreamConverter.js
@@ -479,6 +479,12 @@ var RangedChromeActions = (function RangedChromeActionsClosure() {
           begin: args.begin,
           chunk: args.chunk
         }, '*');
+      },
+      onProgress: function RangedChromeActions_onProgress(evt) {
+        domWindow.postMessage({
+          pdfjsLoadAction: 'rangeProgress',
+          loaded: evt.loaded,
+        }, '*');
       }
     });
   };
diff --git a/src/api.js b/src/api.js
@@ -561,13 +561,19 @@ var WorkerTransport = (function WorkerTransportClosure() {
 
       var pdfDataRangeTransport = this.pdfDataRangeTransport;
       if (pdfDataRangeTransport) {
-        pdfDataRangeTransport.addListener(function(begin, chunk) {
+        pdfDataRangeTransport.addRangeListener(function(begin, chunk) {
           messageHandler.send('OnDataRange', {
             begin: begin,
             chunk: chunk
           });
         });
 
+        pdfDataRangeTransport.addProgressListener(function(loaded) {
+          messageHandler.send('OnDataProgress', {
+            loaded: loaded
+          });
+        });
+
         messageHandler.on('RequestDataRange',
           function transportDataRange(data) {
             pdfDataRangeTransport.requestDataRange(data.begin, data.end);
diff --git a/src/chunked_stream.js b/src/chunked_stream.js
@@ -194,6 +194,7 @@ var ChunkedStream = (function ChunkedStreamClosure() {
 var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
 
   function ChunkedStreamManager(length, chunkSize, url, args) {
+    var self = this;
     this.stream = new ChunkedStream(length, chunkSize);
     this.length = length;
     this.chunkSize = chunkSize;
@@ -203,6 +204,7 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
 
     if (args.chunkedViewerLoading) {
       msgHandler.on('OnDataRange', this.onReceiveData.bind(this));
+      msgHandler.on('OnDataProgress', this.onProgress.bind(this));
       this.sendRequest = function ChunkedStreamManager_sendRequest(begin, end) {
         msgHandler.send('RequestDataRange', { begin: begin, end: end });
       };
@@ -219,10 +221,10 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
         getXhr: getXhr,
         httpHeaders: args.httpHeaders
       });
-      var self = this;
       this.sendRequest = function ChunkedStreamManager_sendRequest(begin, end) {
         this.networkManager.requestRange(begin, end, {
           onDone: this.onReceiveData.bind(this),
+          onProgress: this.onProgress.bind(this)
         });
       };
     }
@@ -347,6 +349,15 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
       return groupedChunks;
     },
 
+    onProgress: function ChunkedStreamManager_onProgress(args) {
+      var bytesLoaded = this.stream.numChunksLoaded * this.chunkSize +
+                        args.loaded;
+      this.msgHandler.send('DocProgress', {
+        loaded: bytesLoaded,
+        total: this.length
+      });
+    },
+
     onReceiveData: function ChunkedStreamManager_onReceiveData(args) {
       var chunk = args.chunk;
       var begin = args.begin;
diff --git a/web/viewer.js b/web/viewer.js
@@ -110,6 +110,7 @@ var ProgressBar = (function ProgressBarClosure() {
 
     // Initialize heights
     this.div.style.height = this.height + this.units;
+    this.percent = 0;
   }
 
   ProgressBar.prototype = {
@@ -942,15 +943,30 @@ var PDFView = {
     }
 
     var pdfDataRangeTransport = {
-      listeners: [],
+      rangeListeners: [],
+      progressListeners: [],
 
-      addListener: function PdfDataRangeTransport_addListener(listener) {
-        this.listeners.push(listener);
+      addRangeListener: function PdfDataRangeTransport_addRangeListener(
+                                   listener) {
+        this.rangeListeners.push(listener);
+      },
+
+      addProgressListener: function PdfDataRangeTransport_addProgressListener(
+                                      listener) {
+        this.progressListeners.push(listener);
       },
 
       onDataRange: function PdfDataRangeTransport_onDataRange(begin, chunk) {
-        for (var i = 0, n = this.listeners.length; i < n; ++i) {
-          this.listeners[i](begin, chunk);
+        var listeners = this.rangeListeners;
+        for (var i = 0, n = listeners.length; i < n; ++i) {
+          listeners[i](begin, chunk);
+        }
+      },
+
+      onDataProgress: function PdfDataRangeTransport_onDataProgress(loaded) {
+        var listeners = this.progressListeners;
+        for (var i = 0, n = listeners.length; i < n; ++i) {
+          listeners[i](loaded);
         }
       },
 
@@ -974,6 +990,9 @@ var PDFView = {
         case 'range':
           pdfDataRangeTransport.onDataRange(args.begin, args.chunk);
           break;
+        case 'rangeProgress':
+          pdfDataRangeTransport.onDataProgress(args.loaded);
+          break;
         case 'progress':
           PDFView.progress(args.loaded / args.total);
           break;
@@ -1324,7 +1343,13 @@ var PDFView = {
 
   progress: function pdfViewProgress(level) {
     var percent = Math.round(level * 100);
-    PDFView.loadingBar.percent = percent;
+    // When we transition from full request to range requests, it's possible
+    // that we discard some of the loaded data. This can cause the loading
+    // bar to move backwards. So prevent this by only updating the bar if it
+    // increases.
+    if (percent > PDFView.loadingBar.percent) {
+      PDFView.loadingBar.percent = percent;
+    }
   },
 
   load: function pdfViewLoad(pdfDocument, scale) {
