pdfjs-dist 2.2.228 → 2.3.200

package/lib/display/api.js

@@ -62,7 +62,7 @@ function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArra
 
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance"); }
 
-function _iterableToArrayLimit(arr, i) { var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _iterableToArrayLimit(arr, i) { if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) { return; } var _arr = []; var _n = true; var _d = false; var _e = undefined; try { for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
@@ -83,6 +83,7 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
 
 var DEFAULT_RANGE_CHUNK_SIZE = 65536;
+var RENDERING_CANCELLED_TIMEOUT = 100;
 var isWorkerDisabled = false;
 var fallbackWorkerSrc;
 var fakeWorkerFilesLoader = null;
@@ -178,7 +179,7 @@ function getDocument(src) {
 
   for (var key in source) {
     if (key === 'url' && typeof window !== 'undefined') {
-      params[key] = new _util.URL(source[key], window.location).href;
+      params[key] = new URL(source[key], window.location).href;
       continue;
     } else if (key === 'range') {
       rangeTransport = source[key];
@@ -247,7 +248,6 @@ function getDocument(src) {
 
   if (!worker) {
     var workerParams = {
-      postMessageTransfers: params.postMessageTransfers,
       verbosity: params.verbosity,
       port: _worker_options.GlobalWorkerOptions.workerPort
     };
@@ -311,7 +311,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
 
   return worker.messageHandler.sendWithPromise('GetDocRequest', {
     docId: docId,
-    apiVersion: '2.2.228',
+    apiVersion: '2.3.200',
     source: {
       data: source.data,
       url: source.url,
@@ -784,12 +784,8 @@ function () {
           background = _ref3$background === void 0 ? null : _ref3$background;
       var stats = this._stats;
       stats.time('Overall');
-      this.pendingCleanup = false;
       var renderingIntent = intent === 'print' ? 'print' : 'display';
-      var canvasFactoryInstance = canvasFactory || new _display_utils.DOMCanvasFactory();
-      var webGLContext = new _webgl.WebGLContext({
-        enable: enableWebGL
-      });
+      this.pendingCleanup = false;
 
       if (!this.intentStates[renderingIntent]) {
         this.intentStates[renderingIntent] = Object.create(null);
@@ -797,8 +793,17 @@ function () {
 
       var intentState = this.intentStates[renderingIntent];
 
+      if (intentState.streamReaderCancelTimeout) {
+        clearTimeout(intentState.streamReaderCancelTimeout);
+        intentState.streamReaderCancelTimeout = null;
+      }
+
+      var canvasFactoryInstance = canvasFactory || new _display_utils.DOMCanvasFactory();
+      var webGLContext = new _webgl.WebGLContext({
+        enable: enableWebGL
+      });
+
       if (!intentState.displayReadyCapability) {
-        intentState.receivingOperatorList = true;
         intentState.displayReadyCapability = (0, _util.createPromiseCapability)();
         intentState.operatorList = {
           fnArray: [],
@@ -807,7 +812,7 @@ function () {
         };
         stats.time('Page Request');
 
-        this._transport.messageHandler.send('RenderPageRequest', {
+        this._pumpOperatorList({
           pageIndex: this.pageNumber - 1,
           intent: renderingIntent,
           renderInteractiveForms: renderInteractiveForms === true
@@ -829,6 +834,11 @@ function () {
 
         if (error) {
           internalRenderTask.capability.reject(error);
+
+          _this5._abortOperatorList({
+            intentState: intentState,
+            reason: error
+          });
         } else {
           internalRenderTask.capability.resolve();
         }
@@ -900,7 +910,6 @@ function () {
       if (!intentState.opListReadCapability) {
         opListTask = {};
         opListTask.operatorListChanged = operatorListChanged;
-        intentState.receivingOperatorList = true;
         intentState.opListReadCapability = (0, _util.createPromiseCapability)();
         intentState.renderTasks = [];
         intentState.renderTasks.push(opListTask);
@@ -912,7 +921,7 @@ function () {
 
         this._stats.time('Page Request');
 
-        this._transport.messageHandler.send('RenderPageRequest', {
+        this._pumpOperatorList({
           pageIndex: this.pageIndex,
           intent: renderingIntent
         });
@@ -978,21 +987,30 @@ function () {
   }, {
     key: "_destroy",
     value: function _destroy() {
+      var _this6 = this;
+
       this.destroyed = true;
       this._transport.pageCache[this.pageIndex] = null;
       var waitOn = [];
       Object.keys(this.intentStates).forEach(function (intent) {
+        var intentState = _this6.intentStates[intent];
+
+        _this6._abortOperatorList({
+          intentState: intentState,
+          reason: new Error('Page was destroyed.'),
+          force: true
+        });
+
         if (intent === 'oplist') {
           return;
         }
 
-        var intentState = this.intentStates[intent];
         intentState.renderTasks.forEach(function (renderTask) {
           var renderCompleted = renderTask.capability.promise["catch"](function () {});
           waitOn.push(renderCompleted);
           renderTask.cancel();
         });
-      }, this);
+      });
       this.objs.clear();
       this.annotationsPromise = null;
       this.pendingCleanup = false;
@@ -1009,18 +1027,20 @@ function () {
   }, {
     key: "_tryCleanup",
     value: function _tryCleanup() {
+      var _this7 = this;
+
       var resetStats = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
 
       if (!this.pendingCleanup || Object.keys(this.intentStates).some(function (intent) {
-        var intentState = this.intentStates[intent];
-        return intentState.renderTasks.length !== 0 || intentState.receivingOperatorList;
-      }, this)) {
+        var intentState = _this7.intentStates[intent];
+        return intentState.renderTasks.length !== 0 || !intentState.operatorList.lastChunk;
+      })) {
         return;
       }
 
       Object.keys(this.intentStates).forEach(function (intent) {
-        delete this.intentStates[intent];
-      }, this);
+        delete _this7.intentStates[intent];
+      });
       this.objs.clear();
       this.annotationsPromise = null;
 
@@ -1035,15 +1055,19 @@ function () {
     value: function _startRenderPage(transparency, intent) {
       var intentState = this.intentStates[intent];
 
+      if (!intentState) {
+        return;
+      }
+
+      this._stats.timeEnd('Page Request');
+
       if (intentState.displayReadyCapability) {
         intentState.displayReadyCapability.resolve(transparency);
       }
     }
   }, {
     key: "_renderPageChunk",
-    value: function _renderPageChunk(operatorListChunk, intent) {
-      var intentState = this.intentStates[intent];
-
+    value: function _renderPageChunk(operatorListChunk, intentState) {
       for (var i = 0, ii = operatorListChunk.length; i < ii; i++) {
         intentState.operatorList.fnArray.push(operatorListChunk.fnArray[i]);
         intentState.operatorList.argsArray.push(operatorListChunk.argsArray[i]);
@@ -1056,11 +1080,119 @@ function () {
       }
 
       if (operatorListChunk.lastChunk) {
-        intentState.receivingOperatorList = false;
-
         this._tryCleanup();
       }
     }
+  }, {
+    key: "_pumpOperatorList",
+    value: function _pumpOperatorList(args) {
+      var _this8 = this;
+
+      (0, _util.assert)(args.intent, 'PDFPageProxy._pumpOperatorList: Expected "intent" argument.');
+
+      var readableStream = this._transport.messageHandler.sendWithStream('GetOperatorList', args);
+
+      var reader = readableStream.getReader();
+      var intentState = this.intentStates[args.intent];
+      intentState.streamReader = reader;
+
+      var pump = function pump() {
+        reader.read().then(function (_ref6) {
+          var value = _ref6.value,
+              done = _ref6.done;
+
+          if (done) {
+            intentState.streamReader = null;
+            return;
+          }
+
+          if (_this8._transport.destroyed) {
+            return;
+          }
+
+          _this8._renderPageChunk(value, intentState);
+
+          pump();
+        }, function (reason) {
+          intentState.streamReader = null;
+
+          if (_this8._transport.destroyed) {
+            return;
+          }
+
+          if (intentState.operatorList) {
+            intentState.operatorList.lastChunk = true;
+
+            for (var i = 0; i < intentState.renderTasks.length; i++) {
+              intentState.renderTasks[i].operatorListChanged();
+            }
+
+            _this8._tryCleanup();
+          }
+
+          if (intentState.displayReadyCapability) {
+            intentState.displayReadyCapability.reject(reason);
+          } else if (intentState.opListReadCapability) {
+            intentState.opListReadCapability.reject(reason);
+          } else {
+            throw reason;
+          }
+        });
+      };
+
+      pump();
+    }
+  }, {
+    key: "_abortOperatorList",
+    value: function _abortOperatorList(_ref7) {
+      var _this9 = this;
+
+      var intentState = _ref7.intentState,
+          reason = _ref7.reason,
+          _ref7$force = _ref7.force,
+          force = _ref7$force === void 0 ? false : _ref7$force;
+      (0, _util.assert)(reason instanceof Error, 'PDFPageProxy._abortOperatorList: Expected "reason" argument.');
+
+      if (!intentState.streamReader) {
+        return;
+      }
+
+      if (!force) {
+        if (intentState.renderTasks.length !== 0) {
+          return;
+        }
+
+        if (reason instanceof _display_utils.RenderingCancelledException) {
+          intentState.streamReaderCancelTimeout = setTimeout(function () {
+            _this9._abortOperatorList({
+              intentState: intentState,
+              reason: reason,
+              force: true
+            });
+
+            intentState.streamReaderCancelTimeout = null;
+          }, RENDERING_CANCELLED_TIMEOUT);
+          return;
+        }
+      }
+
+      intentState.streamReader.cancel(new _util.AbortException(reason && reason.message));
+      intentState.streamReader = null;
+
+      if (this._transport.destroyed) {
+        return;
+      }
+
+      Object.keys(this.intentStates).some(function (intent) {
+        if (_this9.intentStates[intent] === intentState) {
+          delete _this9.intentStates[intent];
+          return true;
+        }
+
+        return false;
+      });
+      this.cleanup();
+    }
   }, {
     key: "pageNumber",
     get: function get() {
@@ -1114,7 +1246,7 @@ function () {
   _createClass(LoopbackPort, [{
     key: "postMessage",
     value: function postMessage(obj, transfers) {
-      var _this6 = this;
+      var _this10 = this;
 
       function cloneValue(value) {
         if (_typeof(value) !== 'object' || value === null) {
@@ -1153,7 +1285,15 @@ function () {
             p = Object.getPrototypeOf(p);
           }
 
-          if (typeof desc.value === 'undefined' || typeof desc.value === 'function') {
+          if (typeof desc.value === 'undefined') {
+            continue;
+          }
+
+          if (typeof desc.value === 'function') {
+            if (value.hasOwnProperty && value.hasOwnProperty(i)) {
+              throw new Error("LoopbackPort.postMessage - cannot clone: ".concat(value[i]));
+            }
+
             continue;
           }
 
@@ -1165,10 +1305,10 @@ function () {
 
       if (!this._defer) {
         this._listeners.forEach(function (listener) {
-          listener.call(this, {
+          listener.call(_this10, {
             data: obj
           });
-        }, this);
+        });
 
         return;
       }
@@ -1179,9 +1319,9 @@ function () {
       };
 
       this._deferred.then(function () {
-        _this6._listeners.forEach(function (listener) {
-          listener.call(this, e);
-        }, _this6);
+        _this10._listeners.forEach(function (listener) {
+          listener.call(_this10, e);
+        });
       });
     }
   }, {
@@ -1260,22 +1400,20 @@ var PDFWorker = function PDFWorkerClosure() {
 
   function createCDNWrapper(url) {
     var wrapper = 'importScripts(\'' + url + '\');';
-    return _util.URL.createObjectURL(new Blob([wrapper]));
+    return URL.createObjectURL(new Blob([wrapper]));
   }
 
   var PDFWorker =
   /*#__PURE__*/
   function () {
     function PDFWorker() {
-      var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-          _ref6$name = _ref6.name,
-          name = _ref6$name === void 0 ? null : _ref6$name,
-          _ref6$port = _ref6.port,
-          port = _ref6$port === void 0 ? null : _ref6$port,
-          _ref6$postMessageTran = _ref6.postMessageTransfers,
-          postMessageTransfers = _ref6$postMessageTran === void 0 ? true : _ref6$postMessageTran,
-          _ref6$verbosity = _ref6.verbosity,
-          verbosity = _ref6$verbosity === void 0 ? (0, _util.getVerbosityLevel)() : _ref6$verbosity;
+      var _ref8 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
+          _ref8$name = _ref8.name,
+          name = _ref8$name === void 0 ? null : _ref8$name,
+          _ref8$port = _ref8.port,
+          port = _ref8$port === void 0 ? null : _ref8$port,
+          _ref8$verbosity = _ref8.verbosity,
+          verbosity = _ref8$verbosity === void 0 ? (0, _util.getVerbosityLevel)() : _ref8$verbosity;
 
       _classCallCheck(this, PDFWorker);
 
@@ -1285,7 +1423,7 @@ var PDFWorker = function PDFWorkerClosure() {
 
       this.name = name;
       this.destroyed = false;
-      this.postMessageTransfers = postMessageTransfers !== false;
+      this.postMessageTransfers = true;
       this.verbosity = verbosity;
       this._readyCapability = (0, _util.createPromiseCapability)();
       this._port = null;
@@ -1316,14 +1454,14 @@ var PDFWorker = function PDFWorkerClosure() {
     }, {
       key: "_initialize",
       value: function _initialize() {
-        var _this7 = this;
+        var _this11 = this;
 
         if (typeof Worker !== 'undefined' && !isWorkerDisabled && !getMainThreadWorkerMessageHandler()) {
           var workerSrc = _getWorkerSrc();
 
           try {
             if (!(0, _util.isSameOrigin)(window.location.href, workerSrc)) {
-              workerSrc = createCDNWrapper(new _util.URL(workerSrc, window.location).href);
+              workerSrc = createCDNWrapper(new URL(workerSrc, window.location).href);
             }
 
             var worker = new Worker(workerSrc);
@@ -1334,15 +1472,15 @@ var PDFWorker = function PDFWorkerClosure() {
               messageHandler.destroy();
               worker.terminate();
 
-              if (_this7.destroyed) {
-                _this7._readyCapability.reject(new Error('Worker was destroyed'));
+              if (_this11.destroyed) {
+                _this11._readyCapability.reject(new Error('Worker was destroyed'));
               } else {
-                _this7._setupFakeWorker();
+                _this11._setupFakeWorker();
               }
             };
 
             var onWorkerError = function onWorkerError() {
-              if (!_this7._webWorker) {
+              if (!_this11._webWorker) {
                 terminateEarly();
               }
             };
@@ -1351,27 +1489,27 @@ var PDFWorker = function PDFWorkerClosure() {
             messageHandler.on('test', function (data) {
               worker.removeEventListener('error', onWorkerError);
 
-              if (_this7.destroyed) {
+              if (_this11.destroyed) {
                 terminateEarly();
                 return;
               }
 
-              if (data && data.supportTypedArray) {
-                _this7._messageHandler = messageHandler;
-                _this7._port = worker;
-                _this7._webWorker = worker;
+              if (data) {
+                _this11._messageHandler = messageHandler;
+                _this11._port = worker;
+                _this11._webWorker = worker;
 
                 if (!data.supportTransfers) {
-                  _this7.postMessageTransfers = false;
+                  _this11.postMessageTransfers = false;
                 }
 
-                _this7._readyCapability.resolve();
+                _this11._readyCapability.resolve();
 
                 messageHandler.send('configure', {
-                  verbosity: _this7.verbosity
+                  verbosity: _this11.verbosity
                 });
               } else {
-                _this7._setupFakeWorker();
+                _this11._setupFakeWorker();
 
                 messageHandler.destroy();
                 worker.terminate();
@@ -1380,7 +1518,7 @@ var PDFWorker = function PDFWorkerClosure() {
             messageHandler.on('ready', function (data) {
               worker.removeEventListener('error', onWorkerError);
 
-              if (_this7.destroyed) {
+              if (_this11.destroyed) {
                 terminateEarly();
                 return;
               }
@@ -1388,17 +1526,17 @@ var PDFWorker = function PDFWorkerClosure() {
               try {
                 sendTest();
               } catch (e) {
-                _this7._setupFakeWorker();
+                _this11._setupFakeWorker();
               }
             });
 
             var sendTest = function sendTest() {
-              var testObj = new Uint8Array([_this7.postMessageTransfers ? 255 : 0]);
+              var testObj = new Uint8Array([_this11.postMessageTransfers ? 255 : 0]);
 
               try {
                 messageHandler.send('test', testObj, [testObj.buffer]);
               } catch (ex) {
-                (0, _util.info)('Cannot use postMessage transfers');
+                (0, _util.warn)('Cannot use postMessage transfers.');
                 testObj[0] = 0;
                 messageHandler.send('test', testObj);
               }
@@ -1416,7 +1554,7 @@ var PDFWorker = function PDFWorkerClosure() {
     }, {
       key: "_setupFakeWorker",
       value: function _setupFakeWorker() {
-        var _this8 = this;
+        var _this12 = this;
 
         if (!isWorkerDisabled) {
           (0, _util.warn)('Setting up fake worker.');
@@ -1424,23 +1562,23 @@ var PDFWorker = function PDFWorkerClosure() {
         }
 
         setupFakeWorkerGlobal().then(function (WorkerMessageHandler) {
-          if (_this8.destroyed) {
-            _this8._readyCapability.reject(new Error('Worker was destroyed'));
+          if (_this12.destroyed) {
+            _this12._readyCapability.reject(new Error('Worker was destroyed'));
 
             return;
           }
 
           var port = new LoopbackPort();
-          _this8._port = port;
+          _this12._port = port;
           var id = 'fake' + nextFakeWorkerId++;
           var workerHandler = new _message_handler.MessageHandler(id + '_worker', id, port);
           WorkerMessageHandler.setup(workerHandler, port);
           var messageHandler = new _message_handler.MessageHandler(id, id + '_worker', port);
-          _this8._messageHandler = messageHandler;
+          _this12._messageHandler = messageHandler;
 
-          _this8._readyCapability.resolve();
+          _this12._readyCapability.resolve();
         })["catch"](function (reason) {
-          _this8._readyCapability.reject(new Error("Setting up fake worker failed: \"".concat(reason.message, "\".")));
+          _this12._readyCapability.reject(new Error("Setting up fake worker failed: \"".concat(reason.message, "\".")));
         });
       }
     }, {
@@ -1539,7 +1677,7 @@ function () {
   _createClass(WorkerTransport, [{
     key: "destroy",
     value: function destroy() {
-      var _this9 = this;
+      var _this13 = this;
 
       if (this.destroyCapability) {
         return this.destroyCapability.promise;
@@ -1563,44 +1701,44 @@ function () {
       var terminated = this.messageHandler.sendWithPromise('Terminate', null);
       waitOn.push(terminated);
       Promise.all(waitOn).then(function () {
-        _this9.fontLoader.clear();
+        _this13.fontLoader.clear();
 
-        if (_this9._networkStream) {
-          _this9._networkStream.cancelAllRequests();
+        if (_this13._networkStream) {
+          _this13._networkStream.cancelAllRequests(new _util.AbortException('Worker was terminated.'));
         }
 
-        if (_this9.messageHandler) {
-          _this9.messageHandler.destroy();
+        if (_this13.messageHandler) {
+          _this13.messageHandler.destroy();
 
-          _this9.messageHandler = null;
+          _this13.messageHandler = null;
         }
 
-        _this9.destroyCapability.resolve();
+        _this13.destroyCapability.resolve();
       }, this.destroyCapability.reject);
       return this.destroyCapability.promise;
     }
   }, {
     key: "setupMessageHandler",
     value: function setupMessageHandler() {
+      var _this14 = this;
+
       var messageHandler = this.messageHandler,
           loadingTask = this.loadingTask;
       messageHandler.on('GetReader', function (data, sink) {
-        var _this10 = this;
-
-        (0, _util.assert)(this._networkStream);
-        this._fullReader = this._networkStream.getFullReader();
+        (0, _util.assert)(_this14._networkStream);
+        _this14._fullReader = _this14._networkStream.getFullReader();
 
-        this._fullReader.onProgress = function (evt) {
-          _this10._lastProgress = {
+        _this14._fullReader.onProgress = function (evt) {
+          _this14._lastProgress = {
             loaded: evt.loaded,
             total: evt.total
           };
         };
 
         sink.onPull = function () {
-          _this10._fullReader.read().then(function (_ref7) {
-            var value = _ref7.value,
-                done = _ref7.done;
+          _this14._fullReader.read().then(function (_ref9) {
+            var value = _ref9.value,
+                done = _ref9.done;
 
             if (done) {
               sink.close();
@@ -1615,18 +1753,16 @@ function () {
         };
 
         sink.onCancel = function (reason) {
-          _this10._fullReader.cancel(reason);
+          _this14._fullReader.cancel(reason);
         };
-      }, this);
+      });
       messageHandler.on('ReaderHeadersReady', function (data) {
-        var _this11 = this;
-
         var headersCapability = (0, _util.createPromiseCapability)();
-        var fullReader = this._fullReader;
+        var fullReader = _this14._fullReader;
         fullReader.headersReady.then(function () {
           if (!fullReader.isStreamingSupported || !fullReader.isRangeSupported) {
-            if (_this11._lastProgress && loadingTask.onProgress) {
-              loadingTask.onProgress(_this11._lastProgress);
+            if (_this14._lastProgress && loadingTask.onProgress) {
+              loadingTask.onProgress(_this14._lastProgress);
             }
 
             fullReader.onProgress = function (evt) {
@@ -1646,11 +1782,11 @@ function () {
           });
         }, headersCapability.reject);
         return headersCapability.promise;
-      }, this);
+      });
       messageHandler.on('GetRangeReader', function (data, sink) {
-        (0, _util.assert)(this._networkStream);
+        (0, _util.assert)(_this14._networkStream);
 
-        var rangeReader = this._networkStream.getRangeReader(data.begin, data.end);
+        var rangeReader = _this14._networkStream.getRangeReader(data.begin, data.end);
 
         if (!rangeReader) {
           sink.close();
@@ -1658,9 +1794,9 @@ function () {
         }
 
         sink.onPull = function () {
-          rangeReader.read().then(function (_ref8) {
-            var value = _ref8.value,
-                done = _ref8.done;
+          rangeReader.read().then(function (_ref10) {
+            var value = _ref10.value,
+                done = _ref10.done;
 
             if (done) {
               sink.close();
@@ -1677,21 +1813,19 @@ function () {
         sink.onCancel = function (reason) {
           rangeReader.cancel(reason);
         };
-      }, this);
-      messageHandler.on('GetDoc', function (_ref9) {
-        var pdfInfo = _ref9.pdfInfo;
-        this._numPages = pdfInfo.numPages;
+      });
+      messageHandler.on('GetDoc', function (_ref11) {
+        var pdfInfo = _ref11.pdfInfo;
+        _this14._numPages = pdfInfo.numPages;
 
-        loadingTask._capability.resolve(new PDFDocumentProxy(pdfInfo, this));
-      }, this);
+        loadingTask._capability.resolve(new PDFDocumentProxy(pdfInfo, _this14));
+      });
       messageHandler.on('PasswordRequest', function (exception) {
-        var _this12 = this;
-
-        this._passwordCapability = (0, _util.createPromiseCapability)();
+        _this14._passwordCapability = (0, _util.createPromiseCapability)();
 
         if (loadingTask.onPassword) {
           var updatePassword = function updatePassword(password) {
-            _this12._passwordCapability.resolve({
+            _this14._passwordCapability.resolve({
               password: password
             });
           };
@@ -1699,29 +1833,29 @@ function () {
           try {
             loadingTask.onPassword(updatePassword, exception.code);
           } catch (ex) {
-            this._passwordCapability.reject(ex);
+            _this14._passwordCapability.reject(ex);
           }
         } else {
-          this._passwordCapability.reject(new _util.PasswordException(exception.message, exception.code));
+          _this14._passwordCapability.reject(new _util.PasswordException(exception.message, exception.code));
         }
 
-        return this._passwordCapability.promise;
-      }, this);
+        return _this14._passwordCapability.promise;
+      });
       messageHandler.on('PasswordException', function (exception) {
         loadingTask._capability.reject(new _util.PasswordException(exception.message, exception.code));
-      }, this);
+      });
       messageHandler.on('InvalidPDF', function (exception) {
         loadingTask._capability.reject(new _util.InvalidPDFException(exception.message));
-      }, this);
+      });
       messageHandler.on('MissingPDF', function (exception) {
         loadingTask._capability.reject(new _util.MissingPDFException(exception.message));
-      }, this);
+      });
       messageHandler.on('UnexpectedResponse', function (exception) {
         loadingTask._capability.reject(new _util.UnexpectedResponseException(exception.message, exception.status));
-      }, this);
+      });
       messageHandler.on('UnknownError', function (exception) {
         loadingTask._capability.reject(new _util.UnknownErrorException(exception.message, exception.details));
-      }, this);
+      });
       messageHandler.on('DataLoaded', function (data) {
         if (loadingTask.onProgress) {
           loadingTask.onProgress({
@@ -1730,32 +1864,19 @@ function () {
           });
         }
 
-        this.downloadInfoCapability.resolve(data);
-      }, this);
+        _this14.downloadInfoCapability.resolve(data);
+      });
       messageHandler.on('StartRenderPage', function (data) {
-        if (this.destroyed) {
+        if (_this14.destroyed) {
           return;
         }
 
-        var page = this.pageCache[data.pageIndex];
-
-        page._stats.timeEnd('Page Request');
+        var page = _this14.pageCache[data.pageIndex];
 
         page._startRenderPage(data.transparency, data.intent);
-      }, this);
-      messageHandler.on('RenderPageChunk', function (data) {
-        if (this.destroyed) {
-          return;
-        }
-
-        var page = this.pageCache[data.pageIndex];
-
-        page._renderPageChunk(data.operatorList, data.intent);
-      }, this);
+      });
       messageHandler.on('commonobj', function (data) {
-        var _this13 = this;
-
-        if (this.destroyed) {
+        if (_this14.destroyed) {
           return;
         }
 
@@ -1764,18 +1885,20 @@ function () {
             type = _data[1],
             exportedData = _data[2];
 
-        if (this.commonObjs.has(id)) {
+        if (_this14.commonObjs.has(id)) {
           return;
         }
 
         switch (type) {
           case 'Font':
-            var params = this._params;
+            var params = _this14._params;
 
             if ('error' in exportedData) {
               var exportedError = exportedData.error;
               (0, _util.warn)("Error during font loading: ".concat(exportedError));
-              this.commonObjs.resolve(id, exportedError);
+
+              _this14.commonObjs.resolve(id, exportedError);
+
               break;
             }
 
@@ -1793,31 +1916,34 @@ function () {
               isEvalSupported: params.isEvalSupported,
               disableFontFace: params.disableFontFace,
               ignoreErrors: params.ignoreErrors,
-              onUnsupportedFeature: this._onUnsupportedFeature.bind(this),
+              onUnsupportedFeature: _this14._onUnsupportedFeature.bind(_this14),
               fontRegistry: fontRegistry
             });
-            this.fontLoader.bind(font).then(function () {
-              _this13.commonObjs.resolve(id, font);
+
+            _this14.fontLoader.bind(font).then(function () {
+              _this14.commonObjs.resolve(id, font);
             }, function (reason) {
               messageHandler.sendWithPromise('FontFallback', {
                 id: id
               })["finally"](function () {
-                _this13.commonObjs.resolve(id, font);
+                _this14.commonObjs.resolve(id, font);
               });
             });
+
             break;
 
           case 'FontPath':
           case 'FontType3Res':
-            this.commonObjs.resolve(id, exportedData);
+            _this14.commonObjs.resolve(id, exportedData);
+
             break;
 
           default:
             throw new Error("Got unknown common object type ".concat(type));
         }
-      }, this);
+      });
       messageHandler.on('obj', function (data) {
-        if (this.destroyed) {
+        if (_this14.destroyed) {
           return undefined;
         }
 
@@ -1827,7 +1953,7 @@ function () {
             type = _data2[2],
             imageData = _data2[3];
 
-        var pageProxy = this.pageCache[pageIndex];
+        var pageProxy = _this14.pageCache[pageIndex];
 
         if (pageProxy.objs.has(id)) {
           return undefined;
@@ -1867,9 +1993,9 @@ function () {
         }
 
         return undefined;
-      }, this);
+      });
       messageHandler.on('DocProgress', function (data) {
-        if (this.destroyed) {
+        if (_this14.destroyed) {
           return;
         }
 
@@ -1879,32 +2005,10 @@ function () {
             total: data.total
           });
         }
-      }, this);
-      messageHandler.on('PageError', function (data) {
-        if (this.destroyed) {
-          return;
-        }
-
-        var page = this.pageCache[data.pageIndex];
-        var intentState = page.intentStates[data.intent];
-
-        if (intentState.displayReadyCapability) {
-          intentState.displayReadyCapability.reject(new Error(data.error));
-        } else {
-          throw new Error(data.error);
-        }
-
-        if (intentState.operatorList) {
-          intentState.operatorList.lastChunk = true;
-
-          for (var i = 0; i < intentState.renderTasks.length; i++) {
-            intentState.renderTasks[i].operatorListChanged();
-          }
-        }
-      }, this);
-      messageHandler.on('UnsupportedFeature', this._onUnsupportedFeature, this);
+      });
+      messageHandler.on('UnsupportedFeature', this._onUnsupportedFeature.bind(this));
       messageHandler.on('JpegDecode', function (data) {
-        if (this.destroyed) {
+        if (_this14.destroyed) {
           return Promise.reject(new Error('Worker was destroyed'));
         }
 
@@ -1967,21 +2071,35 @@ function () {
 
           img.src = imageUrl;
         });
-      }, this);
-      messageHandler.on('FetchBuiltInCMap', function (data) {
-        if (this.destroyed) {
-          return Promise.reject(new Error('Worker was destroyed'));
+      });
+      messageHandler.on('FetchBuiltInCMap', function (data, sink) {
+        if (_this14.destroyed) {
+          sink.error(new Error('Worker was destroyed'));
+          return;
         }
 
-        return this.CMapReaderFactory.fetch({
-          name: data.name
-        });
-      }, this);
+        var fetched = false;
+
+        sink.onPull = function () {
+          if (fetched) {
+            sink.close();
+            return;
+          }
+
+          fetched = true;
+
+          _this14.CMapReaderFactory.fetch(data).then(function (builtInCMap) {
+            sink.enqueue(builtInCMap, 1, [builtInCMap.cMapData.buffer]);
+          })["catch"](function (reason) {
+            sink.error(reason);
+          });
+        };
+      });
     }
   }, {
     key: "_onUnsupportedFeature",
-    value: function _onUnsupportedFeature(_ref10) {
-      var featureId = _ref10.featureId;
+    value: function _onUnsupportedFeature(_ref12) {
+      var featureId = _ref12.featureId;
 
       if (this.destroyed) {
         return;
@@ -1999,7 +2117,7 @@ function () {
   }, {
     key: "getPage",
     value: function getPage(pageNumber) {
-      var _this14 = this;
+      var _this15 = this;
 
       if (!Number.isInteger(pageNumber) || pageNumber <= 0 || pageNumber > this._numPages) {
         return Promise.reject(new Error('Invalid page request'));
@@ -2014,12 +2132,12 @@ function () {
       var promise = this.messageHandler.sendWithPromise('GetPage', {
         pageIndex: pageIndex
       }).then(function (pageInfo) {
-        if (_this14.destroyed) {
+        if (_this15.destroyed) {
           throw new Error('Transport destroyed');
         }
 
-        var page = new PDFPageProxy(pageIndex, pageInfo, _this14, _this14._params.pdfBug);
-        _this14.pageCache[pageIndex] = page;
+        var page = new PDFPageProxy(pageIndex, pageInfo, _this15, _this15._params.pdfBug);
+        _this15.pageCache[pageIndex] = page;
         return page;
       });
       this.pagePromises[pageIndex] = promise;
@@ -2106,13 +2224,13 @@ function () {
   }, {
     key: "getMetadata",
     value: function getMetadata() {
-      var _this15 = this;
+      var _this16 = this;
 
       return this.messageHandler.sendWithPromise('GetMetadata', null).then(function (results) {
         return {
           info: results[0],
           metadata: results[1] ? new _metadata.Metadata(results[1]) : null,
-          contentDispositionFilename: _this15._fullReader ? _this15._fullReader.filename : null
+          contentDispositionFilename: _this16._fullReader ? _this16._fullReader.filename : null
         };
       });
     }
@@ -2124,20 +2242,20 @@ function () {
   }, {
     key: "startCleanup",
     value: function startCleanup() {
-      var _this16 = this;
+      var _this17 = this;
 
       this.messageHandler.sendWithPromise('Cleanup', null).then(function () {
-        for (var i = 0, ii = _this16.pageCache.length; i < ii; i++) {
-          var page = _this16.pageCache[i];
+        for (var i = 0, ii = _this17.pageCache.length; i < ii; i++) {
+          var page = _this17.pageCache[i];
 
           if (page) {
             page.cleanup();
           }
         }
 
-        _this16.commonObjs.clear();
+        _this17.commonObjs.clear();
 
-        _this16.fontLoader.clear();
+        _this17.fontLoader.clear();
       });
     }
   }, {
@@ -2267,19 +2385,19 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
   var InternalRenderTask =
   /*#__PURE__*/
   function () {
-    function InternalRenderTask(_ref11) {
-      var callback = _ref11.callback,
-          params = _ref11.params,
-          objs = _ref11.objs,
-          commonObjs = _ref11.commonObjs,
-          operatorList = _ref11.operatorList,
-          pageNumber = _ref11.pageNumber,
-          canvasFactory = _ref11.canvasFactory,
-          webGLContext = _ref11.webGLContext,
-          _ref11$useRequestAnim = _ref11.useRequestAnimationFrame,
-          useRequestAnimationFrame = _ref11$useRequestAnim === void 0 ? false : _ref11$useRequestAnim,
-          _ref11$pdfBug = _ref11.pdfBug,
-          pdfBug = _ref11$pdfBug === void 0 ? false : _ref11$pdfBug;
+    function InternalRenderTask(_ref13) {
+      var callback = _ref13.callback,
+          params = _ref13.params,
+          objs = _ref13.objs,
+          commonObjs = _ref13.commonObjs,
+          operatorList = _ref13.operatorList,
+          pageNumber = _ref13.pageNumber,
+          canvasFactory = _ref13.canvasFactory,
+          webGLContext = _ref13.webGLContext,
+          _ref13$useRequestAnim = _ref13.useRequestAnimationFrame,
+          useRequestAnimationFrame = _ref13$useRequestAnim === void 0 ? false : _ref13$useRequestAnim,
+          _ref13$pdfBug = _ref13.pdfBug,
+          pdfBug = _ref13$pdfBug === void 0 ? false : _ref13$pdfBug;
 
       _classCallCheck(this, InternalRenderTask);
 
@@ -2405,11 +2523,11 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
     }, {
       key: "_scheduleNext",
       value: function _scheduleNext() {
-        var _this17 = this;
+        var _this18 = this;
 
         if (this._useRequestAnimationFrame) {
           window.requestAnimationFrame(function () {
-            _this17._nextBound()["catch"](_this17.cancel.bind(_this17));
+            _this18._nextBound()["catch"](_this18.cancel.bind(_this18));
           });
         } else {
           Promise.resolve().then(this._nextBound)["catch"](this.cancel.bind(this));
@@ -2471,7 +2589,7 @@ var InternalRenderTask = function InternalRenderTaskClosure() {
   return InternalRenderTask;
 }();
 
-var version = '2.2.228';
+var version = '2.3.200';
 exports.version = version;
-var build = 'd7afb74a';
+var build = '4ae3f9fc';
 exports.build = build;