PDF.js version 1.8.484 - See mozilla/pdf.js@e2ca894fec53893fe7afbefda4a115698e37b4eb

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.8.482",
+  "version": "1.8.484",
   "main": [
     "build/pdf.js",
     "build/pdf.worker.js"

build/pdf.combined.js

@@ -1138,7 +1138,8 @@ MessageHandler.prototype = {
         var startCapability = createPromiseCapability();
         _this2.streamControllers[streamId] = {
           controller: controller,
-          startCall: startCapability
+          startCall: startCapability,
+          isClosed: false
         };
         _this2.postMessage({
           sourceName: sourceName,
@@ -1165,6 +1166,7 @@ MessageHandler.prototype = {
       cancel: function cancel(reason) {
         var cancelCapability = createPromiseCapability();
         _this2.streamControllers[streamId].cancelCall = cancelCapability;
+        _this2.streamControllers[streamId].isClosed = true;
         _this2.postMessage({
           sourceName: sourceName,
           targetName: targetName,
@@ -1310,9 +1312,15 @@ MessageHandler.prototype = {
         });
         break;
       case 'enqueue':
-        this.streamControllers[data.streamId].controller.enqueue(data.chunk);
+        if (!this.streamControllers[data.streamId].isClosed) {
+          this.streamControllers[data.streamId].controller.enqueue(data.chunk);
+        }
         break;
       case 'close':
+        if (this.streamControllers[data.streamId].isClosed) {
+          break;
+        }
+        this.streamControllers[data.streamId].isClosed = true;
         this.streamControllers[data.streamId].controller.close();
         deleteStreamController();
         break;
@@ -1325,6 +1333,9 @@ MessageHandler.prototype = {
         deleteStreamController();
         break;
       case 'cancel':
+        if (!this.streamSinks[data.streamId]) {
+          break;
+        }
         resolveCall(this.streamSinks[data.streamId].onCancel, [data.reason]).then(function () {
           sendStreamResponse({
             stream: 'cancel_complete',
@@ -12209,12 +12220,46 @@ var PDFPageProxy = function PDFPageProxyClosure() {
       }
       return intentState.opListReadCapability.promise;
     },
-    getTextContent: function PDFPageProxy_getTextContent(params) {
+    streamTextContent: function streamTextContent() {
-      params = params || {};
+      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      return this.transport.messageHandler.sendWithPromise('GetTextContent', {
+
+      var TEXT_CONTENT_CHUNK_SIZE = 100;
+      return this.transport.messageHandler.sendWithStream('GetTextContent', {
         pageIndex: this.pageNumber - 1,
         normalizeWhitespace: params.normalizeWhitespace === true,
         combineTextItems: params.disableCombineTextItems !== true
+      }, {
+        highWaterMark: TEXT_CONTENT_CHUNK_SIZE,
+        size: function size(textContent) {
+          return textContent.items.length;
+        }
+      });
+    },
+
+    getTextContent: function PDFPageProxy_getTextContent(params) {
+      params = params || {};
+      var readableStream = this.streamTextContent(params);
+      return new Promise(function (resolve, reject) {
+        function pump() {
+          reader.read().then(function (_ref) {
+            var value = _ref.value,
+                done = _ref.done;
+
+            if (done) {
+              resolve(textContent);
+              return;
+            }
+            _util.Util.extendObj(textContent.styles, value.styles);
+            _util.Util.appendToArray(textContent.items, value.items);
+            pump();
+          }, reject);
+        }
+        var reader = readableStream.getReader();
+        var textContent = {
+          items: [],
+          styles: Object.create(null)
+        };
+        pump();
       });
     },
     _destroy: function PDFPageProxy_destroy() {
@@ -13080,8 +13125,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '1.8.482';
+  exports.version = version = '1.8.484';
-  exports.build = build = 'd1567a94';
+  exports.build = build = 'e2ca894f';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;
@@ -14156,6 +14201,9 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
     }
     task._textDivProperties.set(textDiv, textDivProperties);
+    if (task._textContentStream) {
+      task._layoutText(textDiv);
+    }
     if (task._enhanceTextSelection) {
       var angleCos = 1,
           angleSin = 0;
@@ -14187,7 +14235,6 @@ var renderTextLayer = function renderTextLayerClosure() {
     if (task._canceled) {
       return;
     }
-    var textLayerFrag = task._container;
     var textDivs = task._textDivs;
     var capability = task._capability;
     var textDivsLength = textDivs.length;
@@ -14196,38 +14243,10 @@ var renderTextLayer = function renderTextLayerClosure() {
       capability.resolve();
       return;
     }
-    var canvas = document.createElement('canvas');
+    if (!task._textContentStream) {
-    var ctx = canvas.getContext('2d', { alpha: false });
+      for (var i = 0; i < textDivsLength; i++) {
-    var lastFontSize;
+        task._layoutText(textDivs[i]);
-    var lastFontFamily;
-    for (var i = 0; i < textDivsLength; i++) {
-      var textDiv = textDivs[i];
-      var textDivProperties = task._textDivProperties.get(textDiv);
-      if (textDivProperties.isWhitespace) {
-        continue;
-      }
-      var fontSize = textDiv.style.fontSize;
-      var fontFamily = textDiv.style.fontFamily;
-      if (fontSize !== lastFontSize || fontFamily !== lastFontFamily) {
-        ctx.font = fontSize + ' ' + fontFamily;
-        lastFontSize = fontSize;
-        lastFontFamily = fontFamily;
-      }
-      var width = ctx.measureText(textDiv.textContent).width;
-      textLayerFrag.appendChild(textDiv);
-      var transform = '';
-      if (textDivProperties.canvasWidth !== 0 && width > 0) {
-        textDivProperties.scale = textDivProperties.canvasWidth / width;
-        transform = 'scaleX(' + textDivProperties.scale + ')';
-      }
-      if (textDivProperties.angle !== 0) {
-        transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
       }
-      if (transform !== '') {
-        textDivProperties.originalTransform = transform;
-        _dom_utils.CustomStyle.setProp('transform', textDiv, transform);
-      }
-      task._textDivProperties.set(textDiv, textDivProperties);
     }
     task._renderingDone = true;
     capability.resolve();
@@ -14457,24 +14476,42 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
     });
   }
-  function TextLayerRenderTask(textContent, container, viewport, textDivs, enhanceTextSelection) {
+  function TextLayerRenderTask(_ref) {
+    var textContent = _ref.textContent,
+        textContentStream = _ref.textContentStream,
+        container = _ref.container,
+        viewport = _ref.viewport,
+        textDivs = _ref.textDivs,
+        textContentItemsStr = _ref.textContentItemsStr,
+        enhanceTextSelection = _ref.enhanceTextSelection;
+
     this._textContent = textContent;
+    this._textContentStream = textContentStream;
     this._container = container;
     this._viewport = viewport;
     this._textDivs = textDivs || [];
+    this._textContentItemsStr = textContentItemsStr || [];
+    this._enhanceTextSelection = !!enhanceTextSelection;
+    this._reader = null;
+    this._layoutTextLastFontSize = null;
+    this._layoutTextLastFontFamily = null;
+    this._layoutTextCtx = null;
     this._textDivProperties = new WeakMap();
     this._renderingDone = false;
     this._canceled = false;
     this._capability = (0, _util.createPromiseCapability)();
     this._renderTimer = null;
     this._bounds = [];
-    this._enhanceTextSelection = !!enhanceTextSelection;
   }
   TextLayerRenderTask.prototype = {
     get promise() {
       return this._capability.promise;
     },
     cancel: function TextLayer_cancel() {
+      if (this._reader) {
+        this._reader.cancel();
+        this._reader = null;
+      }
       this._canceled = true;
       if (this._renderTimer !== null) {
         clearTimeout(this._renderTimer);
@@ -14482,22 +14519,85 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
       this._capability.reject('canceled');
     },
+    _processItems: function _processItems(items, styleCache) {
+      for (var i = 0, len = items.length; i < len; i++) {
+        this._textContentItemsStr.push(items[i].str);
+        appendText(this, items[i], styleCache);
+      }
+    },
+    _layoutText: function _layoutText(textDiv) {
+      var textLayerFrag = this._container;
+      var textDivProperties = this._textDivProperties.get(textDiv);
+      if (textDivProperties.isWhitespace) {
+        return;
+      }
+      var fontSize = textDiv.style.fontSize;
+      var fontFamily = textDiv.style.fontFamily;
+      if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
+        this._layoutTextCtx.font = fontSize + ' ' + fontFamily;
+        this._lastFontSize = fontSize;
+        this._lastFontFamily = fontFamily;
+      }
+      var width = this._layoutTextCtx.measureText(textDiv.textContent).width;
+      var transform = '';
+      if (textDivProperties.canvasWidth !== 0 && width > 0) {
+        textDivProperties.scale = textDivProperties.canvasWidth / width;
+        transform = 'scaleX(' + textDivProperties.scale + ')';
+      }
+      if (textDivProperties.angle !== 0) {
+        transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
+      }
+      if (transform !== '') {
+        textDivProperties.originalTransform = transform;
+        _dom_utils.CustomStyle.setProp('transform', textDiv, transform);
+      }
+      this._textDivProperties.set(textDiv, textDivProperties);
+      textLayerFrag.appendChild(textDiv);
+    },
+
     _render: function TextLayer_render(timeout) {
       var _this = this;
 
-      var textItems = this._textContent.items;
+      var capability = (0, _util.createPromiseCapability)();
-      var textStyles = this._textContent.styles;
+      var styleCache = Object.create(null);
-      for (var i = 0, len = textItems.length; i < len; i++) {
+      var canvas = document.createElement('canvas');
-        appendText(this, textItems[i], textStyles);
+      this._layoutTextCtx = canvas.getContext('2d', { alpha: false });
-      }
+      if (this._textContent) {
-      if (!timeout) {
+        var textItems = this._textContent.items;
-        render(this);
+        var textStyles = this._textContent.styles;
+        this._processItems(textItems, textStyles);
+        capability.resolve();
+      } else if (this._textContentStream) {
+        var pump = function pump() {
+          _this._reader.read().then(function (_ref2) {
+            var value = _ref2.value,
+                done = _ref2.done;
+
+            if (done) {
+              capability.resolve();
+              return;
+            }
+            _util.Util.extendObj(styleCache, value.styles);
+            _this._processItems(value.items, styleCache);
+            pump();
+          }, capability.reject);
+        };
+        this._reader = this._textContentStream.getReader();
+        pump();
       } else {
-        this._renderTimer = setTimeout(function () {
+        throw new Error('Neither "textContent" nor "textContentStream"' + ' parameters specified.');
-          render(_this);
-          _this._renderTimer = null;
-        }, timeout);
       }
+      capability.promise.then(function () {
+        styleCache = null;
+        if (!timeout) {
+          render(_this);
+        } else {
+          _this._renderTimer = setTimeout(function () {
+            render(_this);
+            _this._renderTimer = null;
+          }, timeout);
+        }
+      }, this._capability.reject);
     },
     expandTextDivs: function TextLayer_expandTextDivs(expandDivs) {
       if (!this._enhanceTextSelection || !this._renderingDone) {
@@ -14550,7 +14650,15 @@ var renderTextLayer = function renderTextLayerClosure() {
     }
   };
   function renderTextLayer(renderParameters) {
-    var task = new TextLayerRenderTask(renderParameters.textContent, renderParameters.container, renderParameters.viewport, renderParameters.textDivs, renderParameters.enhanceTextSelection);
+    var task = new TextLayerRenderTask({
+      textContent: renderParameters.textContent,
+      textContentStream: renderParameters.textContentStream,
+      container: renderParameters.container,
+      viewport: renderParameters.viewport,
+      textDivs: renderParameters.textDivs,
+      textContentItemsStr: renderParameters.textContentItemsStr,
+      enhanceTextSelection: renderParameters.enhanceTextSelection
+    });
     task._render(renderParameters.timeout);
     return task;
   }
@@ -18392,6 +18500,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PartialEvaluator = exports.OperatorList = undefined;
 
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var _util = __w_pdfjs_require__(0);
 
 var _cmap = __w_pdfjs_require__(31);
@@ -19350,7 +19460,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           _ref3$normalizeWhites = _ref3.normalizeWhitespace,
           normalizeWhitespace = _ref3$normalizeWhites === undefined ? false : _ref3$normalizeWhites,
           _ref3$combineTextItem = _ref3.combineTextItems,
-          combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem;
+          combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem,
+          sink = _ref3.sink,
+          _ref3$seenStyles = _ref3.seenStyles,
+          seenStyles = _ref3$seenStyles === undefined ? Object.create(null) : _ref3$seenStyles;
 
       resources = resources || _primitives.Dict.empty;
       stateManager = stateManager || new StateManager(new TextState());
@@ -19382,7 +19495,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var self = this;
       var xref = this.xref;
       var xobjs = null;
-      var xobjsCache = Object.create(null);
+      var skipEmptyXObjs = Object.create(null);
       var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
       var textState;
       function ensureTextContentItem() {
@@ -19390,7 +19503,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           return textContentItem;
         }
         var font = textState.font;
-        if (!(font.loadedName in textContent.styles)) {
+        if (!(font.loadedName in seenStyles)) {
+          seenStyles[font.loadedName] = true;
           textContent.styles[font.loadedName] = {
             fontFamily: font.fallbackName,
             ascent: font.ascent,
@@ -19545,10 +19659,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         textContentItem.initialized = false;
         textContentItem.str.length = 0;
       }
+      function enqueueChunk() {
+        var length = textContent.items.length;
+        if (length > 0) {
+          sink.enqueue(textContent, length);
+          textContent.items = [];
+          textContent.styles = Object.create(null);
+        }
+      }
       var timeSlotManager = new TimeSlotManager();
       return new Promise(function promiseBody(resolve, reject) {
         var next = function next(promise) {
-          promise.then(function () {
+          enqueueChunk();
+          Promise.all([promise, sink.ready]).then(function () {
             try {
               promiseBody(resolve, reject);
             } catch (ex) {
@@ -19571,196 +19694,248 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           var fn = operation.fn;
           args = operation.args;
           var advance, diff;
-          switch (fn | 0) {
+          var fontNameArg, fontSizeArg;
-            case _util.OPS.setFont:
+          var isSameTextLine;
-              var fontNameArg = args[0].name,
+          var items;
-                  fontSizeArg = args[1];
+          var offset;
-              if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
+          var j, jj;
+          var breakTextRun;
+          var name;
+          var xobj;
+          var type;
+          var currentState;
+          var xObjStateManager;
+          var matrix;
+          var dictName;
+          var extGState;
+          var gState;
+          var gStateFont;
+
+          var _ret2 = function () {
+            switch (fn | 0) {
+              case _util.OPS.setFont:
+                fontNameArg = args[0].name;
+                fontSizeArg = args[1];
+
+                if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
+                  break;
+                }
+                flushTextContentItem();
+                textState.fontName = fontNameArg;
+                textState.fontSize = fontSizeArg;
+                next(handleSetFont(fontNameArg, null));
+                return {
+                  v: void 0
+                };
+              case _util.OPS.setTextRise:
+                flushTextContentItem();
+                textState.textRise = args[0];
                 break;
-              }
+              case _util.OPS.setHScale:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.fontName = fontNameArg;
+                textState.textHScale = args[0] / 100;
-              textState.fontSize = fontSizeArg;
+                break;
-              next(handleSetFont(fontNameArg, null));
+              case _util.OPS.setLeading:
-              return;
+                flushTextContentItem();
-            case _util.OPS.setTextRise:
+                textState.leading = args[0];
-              flushTextContentItem();
+                break;
-              textState.textRise = args[0];
+              case _util.OPS.moveText:
-              break;
+                isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
-            case _util.OPS.setHScale:
+
-              flushTextContentItem();
+                advance = args[0] - args[1];
-              textState.textHScale = args[0] / 100;
+                if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
-              break;
+                  textState.translateTextLineMatrix(args[0], args[1]);
-            case _util.OPS.setLeading:
+                  textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
-              flushTextContentItem();
+                  textContentItem.height += args[1] - textContentItem.lastAdvanceHeight;
-              textState.leading = args[0];
+                  diff = args[0] - textContentItem.lastAdvanceWidth - (args[1] - textContentItem.lastAdvanceHeight);
-              break;
+                  addFakeSpaces(diff, textContentItem.str);
-            case _util.OPS.moveText:
+                  break;
-              var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
+                }
-              advance = args[0] - args[1];
+                flushTextContentItem();
-              if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
                 textState.translateTextLineMatrix(args[0], args[1]);
-                textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
+                textState.textMatrix = textState.textLineMatrix.slice();
-                textContentItem.height += args[1] - textContentItem.lastAdvanceHeight;
-                diff = args[0] - textContentItem.lastAdvanceWidth - (args[1] - textContentItem.lastAdvanceHeight);
-                addFakeSpaces(diff, textContentItem.str);
                 break;
-              }
+              case _util.OPS.setLeadingMoveText:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.translateTextLineMatrix(args[0], args[1]);
+                textState.leading = -args[1];
-              textState.textMatrix = textState.textLineMatrix.slice();
+                textState.translateTextLineMatrix(args[0], args[1]);
-              break;
+                textState.textMatrix = textState.textLineMatrix.slice();
-            case _util.OPS.setLeadingMoveText:
-              flushTextContentItem();
-              textState.leading = -args[1];
-              textState.translateTextLineMatrix(args[0], args[1]);
-              textState.textMatrix = textState.textLineMatrix.slice();
-              break;
-            case _util.OPS.nextLine:
-              flushTextContentItem();
-              textState.carriageReturn();
-              break;
-            case _util.OPS.setTextMatrix:
-              advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
-              if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
-                textState.translateTextLineMatrix(advance.width, advance.height);
-                textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
-                textContentItem.height += advance.height - textContentItem.lastAdvanceHeight;
-                diff = advance.width - textContentItem.lastAdvanceWidth - (advance.height - textContentItem.lastAdvanceHeight);
-                addFakeSpaces(diff, textContentItem.str);
                 break;
-              }
+              case _util.OPS.nextLine:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
+                textState.carriageReturn();
-              textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
+                break;
-              break;
+              case _util.OPS.setTextMatrix:
-            case _util.OPS.setCharSpacing:
+                advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
-              textState.charSpacing = args[0];
+                if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
-              break;
+                  textState.translateTextLineMatrix(advance.width, advance.height);
-            case _util.OPS.setWordSpacing:
+                  textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
-              textState.wordSpacing = args[0];
+                  textContentItem.height += advance.height - textContentItem.lastAdvanceHeight;
-              break;
+                  diff = advance.width - textContentItem.lastAdvanceWidth - (advance.height - textContentItem.lastAdvanceHeight);
-            case _util.OPS.beginText:
+                  addFakeSpaces(diff, textContentItem.str);
-              flushTextContentItem();
+                  break;
-              textState.textMatrix = _util.IDENTITY_MATRIX.slice();
+                }
-              textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
+                flushTextContentItem();
-              break;
+                textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
-            case _util.OPS.showSpacedText:
+                textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
-              var items = args[0];
+                break;
-              var offset;
+              case _util.OPS.setCharSpacing:
-              for (var j = 0, jj = items.length; j < jj; j++) {
+                textState.charSpacing = args[0];
-                if (typeof items[j] === 'string') {
+                break;
-                  buildTextContentItem(items[j]);
+              case _util.OPS.setWordSpacing:
-                } else if ((0, _util.isNum)(items[j])) {
+                textState.wordSpacing = args[0];
-                  ensureTextContentItem();
+                break;
-                  advance = items[j] * textState.fontSize / 1000;
+              case _util.OPS.beginText:
-                  var breakTextRun = false;
+                flushTextContentItem();
-                  if (textState.font.vertical) {
+                textState.textMatrix = _util.IDENTITY_MATRIX.slice();
-                    offset = advance;
+                textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
-                    textState.translateTextMatrix(0, offset);
+                break;
-                    breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+              case _util.OPS.showSpacedText:
-                    if (!breakTextRun) {
+                items = args[0];
-                      textContentItem.height += offset;
+
+                for (j = 0, jj = items.length; j < jj; j++) {
+                  if (typeof items[j] === 'string') {
+                    buildTextContentItem(items[j]);
+                  } else if ((0, _util.isNum)(items[j])) {
+                    ensureTextContentItem();
+                    advance = items[j] * textState.fontSize / 1000;
+                    breakTextRun = false;
+
+                    if (textState.font.vertical) {
+                      offset = advance;
+                      textState.translateTextMatrix(0, offset);
+                      breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+                      if (!breakTextRun) {
+                        textContentItem.height += offset;
+                      }
+                    } else {
+                      advance = -advance;
+                      offset = advance * textState.textHScale;
+                      textState.translateTextMatrix(offset, 0);
+                      breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+                      if (!breakTextRun) {
+                        textContentItem.width += offset;
+                      }
                     }
-                  } else {
+                    if (breakTextRun) {
-                    advance = -advance;
+                      flushTextContentItem();
-                    offset = advance * textState.textHScale;
+                    } else if (advance > 0) {
-                    textState.translateTextMatrix(offset, 0);
+                      addFakeSpaces(advance, textContentItem.str);
-                    breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
-                    if (!breakTextRun) {
-                      textContentItem.width += offset;
                     }
                   }
-                  if (breakTextRun) {
-                    flushTextContentItem();
-                  } else if (advance > 0) {
-                    addFakeSpaces(advance, textContentItem.str);
-                  }
                 }
-              }
-              break;
-            case _util.OPS.showText:
-              buildTextContentItem(args[0]);
-              break;
-            case _util.OPS.nextLineShowText:
-              flushTextContentItem();
-              textState.carriageReturn();
-              buildTextContentItem(args[0]);
-              break;
-            case _util.OPS.nextLineSetSpacingShowText:
-              flushTextContentItem();
-              textState.wordSpacing = args[0];
-              textState.charSpacing = args[1];
-              textState.carriageReturn();
-              buildTextContentItem(args[2]);
-              break;
-            case _util.OPS.paintXObject:
-              flushTextContentItem();
-              if (args[0].code) {
                 break;
-              }
+              case _util.OPS.showText:
-              if (!xobjs) {
+                buildTextContentItem(args[0]);
-                xobjs = resources.get('XObject') || _primitives.Dict.empty;
-              }
-              var name = args[0].name;
-              if (xobjsCache.key === name) {
-                if (xobjsCache.texts) {
-                  _util.Util.appendToArray(textContent.items, xobjsCache.texts.items);
-                  _util.Util.extendObj(textContent.styles, xobjsCache.texts.styles);
-                }
                 break;
-              }
+              case _util.OPS.nextLineShowText:
-              var xobj = xobjs.get(name);
+                flushTextContentItem();
-              if (!xobj) {
+                textState.carriageReturn();
+                buildTextContentItem(args[0]);
                 break;
-              }
+              case _util.OPS.nextLineSetSpacingShowText:
-              (0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
+                flushTextContentItem();
-              var type = xobj.dict.get('Subtype');
+                textState.wordSpacing = args[0];
-              (0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
+                textState.charSpacing = args[1];
-              if (type.name !== 'Form') {
+                textState.carriageReturn();
-                xobjsCache.key = name;
+                buildTextContentItem(args[2]);
-                xobjsCache.texts = null;
                 break;
-              }
+              case _util.OPS.paintXObject:
-              var currentState = stateManager.state.clone();
+                flushTextContentItem();
-              var xObjStateManager = new StateManager(currentState);
+                if (args[0].code) {
-              var matrix = xobj.dict.getArray('Matrix');
+                  break;
-              if ((0, _util.isArray)(matrix) && matrix.length === 6) {
+                }
-                xObjStateManager.transform(matrix);
+                if (!xobjs) {
-              }
+                  xobjs = resources.get('XObject') || _primitives.Dict.empty;
-              next(self.getTextContent({
+                }
-                stream: xobj,
+                name = args[0].name;
-                task: task,
+
-                resources: xobj.dict.get('Resources') || resources,
+                if (name in skipEmptyXObjs) {
-                stateManager: xObjStateManager,
+                  break;
-                normalizeWhitespace: normalizeWhitespace,
+                }
-                combineTextItems: combineTextItems
+                xobj = xobjs.get(name);
-              }).then(function (formTextContent) {
+
-                _util.Util.appendToArray(textContent.items, formTextContent.items);
+                if (!xobj) {
-                _util.Util.extendObj(textContent.styles, formTextContent.styles);
+                  break;
-                xobjsCache.key = name;
+                }
-                xobjsCache.texts = formTextContent;
+                (0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
-              }));
+                type = xobj.dict.get('Subtype');
-              return;
+
-            case _util.OPS.setGState:
+                (0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
-              flushTextContentItem();
+                if (type.name !== 'Form') {
-              var dictName = args[0];
+                  skipEmptyXObjs[name] = true;
-              var extGState = resources.get('ExtGState');
+                  break;
-              if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
+                }
-                break;
+                currentState = stateManager.state.clone();
-              }
+                xObjStateManager = new StateManager(currentState);
-              var gState = extGState.get(dictName.name);
+                matrix = xobj.dict.getArray('Matrix');
-              if (!(0, _primitives.isDict)(gState)) {
+
+                if ((0, _util.isArray)(matrix) && matrix.length === 6) {
+                  xObjStateManager.transform(matrix);
+                }
+                enqueueChunk();
+                var sinkWrapper = {
+                  enqueueInvoked: false,
+                  enqueue: function enqueue(chunk, size) {
+                    this.enqueueInvoked = true;
+                    sink.enqueue(chunk, size);
+                  },
+
+                  get desiredSize() {
+                    return sink.desiredSize;
+                  },
+                  get ready() {
+                    return sink.ready;
+                  }
+                };
+                next(self.getTextContent({
+                  stream: xobj,
+                  task: task,
+                  resources: xobj.dict.get('Resources') || resources,
+                  stateManager: xObjStateManager,
+                  normalizeWhitespace: normalizeWhitespace,
+                  combineTextItems: combineTextItems,
+                  sink: sinkWrapper,
+                  seenStyles: seenStyles
+                }).then(function () {
+                  if (!sinkWrapper.enqueueInvoked) {
+                    skipEmptyXObjs[name] = true;
+                  }
+                }));
+                return {
+                  v: void 0
+                };
+              case _util.OPS.setGState:
+                flushTextContentItem();
+                dictName = args[0];
+                extGState = resources.get('ExtGState');
+
+                if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
+                  break;
+                }
+                gState = extGState.get(dictName.name);
+
+                if (!(0, _primitives.isDict)(gState)) {
+                  break;
+                }
+                gStateFont = gState.get('Font');
+
+                if (gStateFont) {
+                  textState.fontName = null;
+                  textState.fontSize = gStateFont[1];
+                  next(handleSetFont(null, gStateFont[0]));
+                  return {
+                    v: void 0
+                  };
+                }
                 break;
-              }
+            }
-              var gStateFont = gState.get('Font');
+          }();
-              if (gStateFont) {
+
-                textState.fontName = null;
+          if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
-                textState.fontSize = gStateFont[1];
+          if (textContent.items.length >= sink.desiredSize) {
-                next(handleSetFont(null, gStateFont[0]));
+            stop = true;
-                return;
+            break;
-              }
-              break;
           }
         }
         if (stop) {
@@ -19768,12 +19943,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           return;
         }
         flushTextContentItem();
-        resolve(textContent);
+        enqueueChunk();
+        resolve();
       }).catch(function (reason) {
         if (_this9.options.ignoreErrors) {
           (0, _util.warn)('getTextContent - ignoring errors during task: ' + task.name);
           flushTextContentItem();
-          return textContent;
+          enqueueChunk();
+          return;
         }
         throw reason;
       });
@@ -27884,27 +28061,31 @@ var WorkerMessageHandler = {
         });
       });
     }, this);
-    handler.on('GetTextContent', function wphExtractText(data) {
+    handler.on('GetTextContent', function wphExtractText(data, sink) {
       var pageIndex = data.pageIndex;
-      return pdfManager.getPage(pageIndex).then(function (page) {
+      sink.onPull = function (desiredSize) {};
+      sink.onCancel = function (reason) {};
+      pdfManager.getPage(pageIndex).then(function (page) {
         var task = new WorkerTask('GetTextContent: page ' + pageIndex);
         startWorkerTask(task);
         var pageNum = pageIndex + 1;
         var start = Date.now();
-        return page.extractTextContent({
+        page.extractTextContent({
           handler: handler,
           task: task,
+          sink: sink,
           normalizeWhitespace: data.normalizeWhitespace,
           combineTextItems: data.combineTextItems
-        }).then(function (textContent) {
+        }).then(function () {
           finishWorkerTask(task);
           (0, _util.info)('text indexing: page=' + pageNum + ' - time=' + (Date.now() - start) + 'ms');
-          return textContent;
+          sink.close();
         }, function (reason) {
           finishWorkerTask(task);
           if (task.terminated) {
             return;
           }
+          sink.error(reason);
           throw reason;
         });
       });
@@ -28436,8 +28617,8 @@ if (!_util.globalScope.PDFJS) {
 }
 var PDFJS = _util.globalScope.PDFJS;
 {
-  PDFJS.version = '1.8.482';
+  PDFJS.version = '1.8.484';
-  PDFJS.build = 'd1567a94';
+  PDFJS.build = 'e2ca894f';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {
@@ -33423,6 +33604,7 @@ var Page = function PageClosure() {
       var handler = _ref6.handler,
           task = _ref6.task,
           normalizeWhitespace = _ref6.normalizeWhitespace,
+          sink = _ref6.sink,
           combineTextItems = _ref6.combineTextItems;
 
       var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
@@ -33447,7 +33629,8 @@ var Page = function PageClosure() {
           task: task,
           resources: _this3.resources,
           normalizeWhitespace: normalizeWhitespace,
-          combineTextItems: combineTextItems
+          combineTextItems: combineTextItems,
+          sink: sink
         });
       });
     },
@@ -47054,8 +47237,8 @@ exports.TilingPattern = TilingPattern;
 "use strict";
 
 
-var pdfjsVersion = '1.8.482';
+var pdfjsVersion = '1.8.484';
-var pdfjsBuild = 'd1567a94';
+var pdfjsBuild = 'e2ca894f';
 var pdfjsSharedUtil = __w_pdfjs_require__(0);
 var pdfjsDisplayGlobal = __w_pdfjs_require__(26);
 var pdfjsDisplayAPI = __w_pdfjs_require__(10);

build/pdf.js

@@ -1138,7 +1138,8 @@ MessageHandler.prototype = {
         var startCapability = createPromiseCapability();
         _this2.streamControllers[streamId] = {
           controller: controller,
-          startCall: startCapability
+          startCall: startCapability,
+          isClosed: false
         };
         _this2.postMessage({
           sourceName: sourceName,
@@ -1165,6 +1166,7 @@ MessageHandler.prototype = {
       cancel: function cancel(reason) {
         var cancelCapability = createPromiseCapability();
         _this2.streamControllers[streamId].cancelCall = cancelCapability;
+        _this2.streamControllers[streamId].isClosed = true;
         _this2.postMessage({
           sourceName: sourceName,
           targetName: targetName,
@@ -1310,9 +1312,15 @@ MessageHandler.prototype = {
         });
         break;
       case 'enqueue':
-        this.streamControllers[data.streamId].controller.enqueue(data.chunk);
+        if (!this.streamControllers[data.streamId].isClosed) {
+          this.streamControllers[data.streamId].controller.enqueue(data.chunk);
+        }
         break;
       case 'close':
+        if (this.streamControllers[data.streamId].isClosed) {
+          break;
+        }
+        this.streamControllers[data.streamId].isClosed = true;
         this.streamControllers[data.streamId].controller.close();
         deleteStreamController();
         break;
@@ -1325,6 +1333,9 @@ MessageHandler.prototype = {
         deleteStreamController();
         break;
       case 'cancel':
+        if (!this.streamSinks[data.streamId]) {
+          break;
+        }
         resolveCall(this.streamSinks[data.streamId].onCancel, [data.reason]).then(function () {
           sendStreamResponse({
             stream: 'cancel_complete',
@@ -2853,12 +2864,46 @@ var PDFPageProxy = function PDFPageProxyClosure() {
       }
       return intentState.opListReadCapability.promise;
     },
-    getTextContent: function PDFPageProxy_getTextContent(params) {
+    streamTextContent: function streamTextContent() {
-      params = params || {};
+      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      return this.transport.messageHandler.sendWithPromise('GetTextContent', {
+
+      var TEXT_CONTENT_CHUNK_SIZE = 100;
+      return this.transport.messageHandler.sendWithStream('GetTextContent', {
         pageIndex: this.pageNumber - 1,
         normalizeWhitespace: params.normalizeWhitespace === true,
         combineTextItems: params.disableCombineTextItems !== true
+      }, {
+        highWaterMark: TEXT_CONTENT_CHUNK_SIZE,
+        size: function size(textContent) {
+          return textContent.items.length;
+        }
+      });
+    },
+
+    getTextContent: function PDFPageProxy_getTextContent(params) {
+      params = params || {};
+      var readableStream = this.streamTextContent(params);
+      return new Promise(function (resolve, reject) {
+        function pump() {
+          reader.read().then(function (_ref) {
+            var value = _ref.value,
+                done = _ref.done;
+
+            if (done) {
+              resolve(textContent);
+              return;
+            }
+            _util.Util.extendObj(textContent.styles, value.styles);
+            _util.Util.appendToArray(textContent.items, value.items);
+            pump();
+          }, reject);
+        }
+        var reader = readableStream.getReader();
+        var textContent = {
+          items: [],
+          styles: Object.create(null)
+        };
+        pump();
       });
     },
     _destroy: function PDFPageProxy_destroy() {
@@ -3809,8 +3854,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '1.8.482';
+  exports.version = version = '1.8.484';
-  exports.build = build = 'd1567a94';
+  exports.build = build = 'e2ca894f';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;
@@ -4885,6 +4930,9 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
     }
     task._textDivProperties.set(textDiv, textDivProperties);
+    if (task._textContentStream) {
+      task._layoutText(textDiv);
+    }
     if (task._enhanceTextSelection) {
       var angleCos = 1,
           angleSin = 0;
@@ -4916,7 +4964,6 @@ var renderTextLayer = function renderTextLayerClosure() {
     if (task._canceled) {
       return;
     }
-    var textLayerFrag = task._container;
     var textDivs = task._textDivs;
     var capability = task._capability;
     var textDivsLength = textDivs.length;
@@ -4925,39 +4972,10 @@ var renderTextLayer = function renderTextLayerClosure() {
       capability.resolve();
       return;
     }
-    var canvas = document.createElement('canvas');
+    if (!task._textContentStream) {
-    canvas.mozOpaque = true;
+      for (var i = 0; i < textDivsLength; i++) {
-    var ctx = canvas.getContext('2d', { alpha: false });
+        task._layoutText(textDivs[i]);
-    var lastFontSize;
-    var lastFontFamily;
-    for (var i = 0; i < textDivsLength; i++) {
-      var textDiv = textDivs[i];
-      var textDivProperties = task._textDivProperties.get(textDiv);
-      if (textDivProperties.isWhitespace) {
-        continue;
-      }
-      var fontSize = textDiv.style.fontSize;
-      var fontFamily = textDiv.style.fontFamily;
-      if (fontSize !== lastFontSize || fontFamily !== lastFontFamily) {
-        ctx.font = fontSize + ' ' + fontFamily;
-        lastFontSize = fontSize;
-        lastFontFamily = fontFamily;
-      }
-      var width = ctx.measureText(textDiv.textContent).width;
-      textLayerFrag.appendChild(textDiv);
-      var transform = '';
-      if (textDivProperties.canvasWidth !== 0 && width > 0) {
-        textDivProperties.scale = textDivProperties.canvasWidth / width;
-        transform = 'scaleX(' + textDivProperties.scale + ')';
-      }
-      if (textDivProperties.angle !== 0) {
-        transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
-      }
-      if (transform !== '') {
-        textDivProperties.originalTransform = transform;
-        _dom_utils.CustomStyle.setProp('transform', textDiv, transform);
       }
-      task._textDivProperties.set(textDiv, textDivProperties);
     }
     task._renderingDone = true;
     capability.resolve();
@@ -5187,24 +5205,42 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
     });
   }
-  function TextLayerRenderTask(textContent, container, viewport, textDivs, enhanceTextSelection) {
+  function TextLayerRenderTask(_ref) {
+    var textContent = _ref.textContent,
+        textContentStream = _ref.textContentStream,
+        container = _ref.container,
+        viewport = _ref.viewport,
+        textDivs = _ref.textDivs,
+        textContentItemsStr = _ref.textContentItemsStr,
+        enhanceTextSelection = _ref.enhanceTextSelection;
+
     this._textContent = textContent;
+    this._textContentStream = textContentStream;
     this._container = container;
     this._viewport = viewport;
     this._textDivs = textDivs || [];
+    this._textContentItemsStr = textContentItemsStr || [];
+    this._enhanceTextSelection = !!enhanceTextSelection;
+    this._reader = null;
+    this._layoutTextLastFontSize = null;
+    this._layoutTextLastFontFamily = null;
+    this._layoutTextCtx = null;
     this._textDivProperties = new WeakMap();
     this._renderingDone = false;
     this._canceled = false;
     this._capability = (0, _util.createPromiseCapability)();
     this._renderTimer = null;
     this._bounds = [];
-    this._enhanceTextSelection = !!enhanceTextSelection;
   }
   TextLayerRenderTask.prototype = {
     get promise() {
       return this._capability.promise;
     },
     cancel: function TextLayer_cancel() {
+      if (this._reader) {
+        this._reader.cancel();
+        this._reader = null;
+      }
       this._canceled = true;
       if (this._renderTimer !== null) {
         clearTimeout(this._renderTimer);
@@ -5212,22 +5248,86 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
       this._capability.reject('canceled');
     },
+    _processItems: function _processItems(items, styleCache) {
+      for (var i = 0, len = items.length; i < len; i++) {
+        this._textContentItemsStr.push(items[i].str);
+        appendText(this, items[i], styleCache);
+      }
+    },
+    _layoutText: function _layoutText(textDiv) {
+      var textLayerFrag = this._container;
+      var textDivProperties = this._textDivProperties.get(textDiv);
+      if (textDivProperties.isWhitespace) {
+        return;
+      }
+      var fontSize = textDiv.style.fontSize;
+      var fontFamily = textDiv.style.fontFamily;
+      if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
+        this._layoutTextCtx.font = fontSize + ' ' + fontFamily;
+        this._lastFontSize = fontSize;
+        this._lastFontFamily = fontFamily;
+      }
+      var width = this._layoutTextCtx.measureText(textDiv.textContent).width;
+      var transform = '';
+      if (textDivProperties.canvasWidth !== 0 && width > 0) {
+        textDivProperties.scale = textDivProperties.canvasWidth / width;
+        transform = 'scaleX(' + textDivProperties.scale + ')';
+      }
+      if (textDivProperties.angle !== 0) {
+        transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
+      }
+      if (transform !== '') {
+        textDivProperties.originalTransform = transform;
+        _dom_utils.CustomStyle.setProp('transform', textDiv, transform);
+      }
+      this._textDivProperties.set(textDiv, textDivProperties);
+      textLayerFrag.appendChild(textDiv);
+    },
+
     _render: function TextLayer_render(timeout) {
       var _this = this;
 
-      var textItems = this._textContent.items;
+      var capability = (0, _util.createPromiseCapability)();
-      var textStyles = this._textContent.styles;
+      var styleCache = Object.create(null);
-      for (var i = 0, len = textItems.length; i < len; i++) {
+      var canvas = document.createElement('canvas');
-        appendText(this, textItems[i], textStyles);
+      canvas.mozOpaque = true;
-      }
+      this._layoutTextCtx = canvas.getContext('2d', { alpha: false });
-      if (!timeout) {
+      if (this._textContent) {
-        render(this);
+        var textItems = this._textContent.items;
+        var textStyles = this._textContent.styles;
+        this._processItems(textItems, textStyles);
+        capability.resolve();
+      } else if (this._textContentStream) {
+        var pump = function pump() {
+          _this._reader.read().then(function (_ref2) {
+            var value = _ref2.value,
+                done = _ref2.done;
+
+            if (done) {
+              capability.resolve();
+              return;
+            }
+            _util.Util.extendObj(styleCache, value.styles);
+            _this._processItems(value.items, styleCache);
+            pump();
+          }, capability.reject);
+        };
+        this._reader = this._textContentStream.getReader();
+        pump();
       } else {
-        this._renderTimer = setTimeout(function () {
+        throw new Error('Neither "textContent" nor "textContentStream"' + ' parameters specified.');
-          render(_this);
-          _this._renderTimer = null;
-        }, timeout);
       }
+      capability.promise.then(function () {
+        styleCache = null;
+        if (!timeout) {
+          render(_this);
+        } else {
+          _this._renderTimer = setTimeout(function () {
+            render(_this);
+            _this._renderTimer = null;
+          }, timeout);
+        }
+      }, this._capability.reject);
     },
     expandTextDivs: function TextLayer_expandTextDivs(expandDivs) {
       if (!this._enhanceTextSelection || !this._renderingDone) {
@@ -5280,7 +5380,15 @@ var renderTextLayer = function renderTextLayerClosure() {
     }
   };
   function renderTextLayer(renderParameters) {
-    var task = new TextLayerRenderTask(renderParameters.textContent, renderParameters.container, renderParameters.viewport, renderParameters.textDivs, renderParameters.enhanceTextSelection);
+    var task = new TextLayerRenderTask({
+      textContent: renderParameters.textContent,
+      textContentStream: renderParameters.textContentStream,
+      container: renderParameters.container,
+      viewport: renderParameters.viewport,
+      textDivs: renderParameters.textDivs,
+      textContentItemsStr: renderParameters.textContentItemsStr,
+      enhanceTextSelection: renderParameters.enhanceTextSelection
+    });
     task._render(renderParameters.timeout);
     return task;
   }
@@ -5791,8 +5899,8 @@ if (!_util.globalScope.PDFJS) {
 }
 var PDFJS = _util.globalScope.PDFJS;
 {
-  PDFJS.version = '1.8.482';
+  PDFJS.version = '1.8.484';
-  PDFJS.build = 'd1567a94';
+  PDFJS.build = 'e2ca894f';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {
@@ -11331,8 +11439,8 @@ exports.TilingPattern = TilingPattern;
 "use strict";
 
 
-var pdfjsVersion = '1.8.482';
+var pdfjsVersion = '1.8.484';
-var pdfjsBuild = 'd1567a94';
+var pdfjsBuild = 'e2ca894f';
 var pdfjsSharedUtil = __w_pdfjs_require__(0);
 var pdfjsDisplayGlobal = __w_pdfjs_require__(9);
 var pdfjsDisplayAPI = __w_pdfjs_require__(3);

build/pdf.worker.js

@@ -1138,7 +1138,8 @@ MessageHandler.prototype = {
         var startCapability = createPromiseCapability();
         _this2.streamControllers[streamId] = {
           controller: controller,
-          startCall: startCapability
+          startCall: startCapability,
+          isClosed: false
         };
         _this2.postMessage({
           sourceName: sourceName,
@@ -1165,6 +1166,7 @@ MessageHandler.prototype = {
       cancel: function cancel(reason) {
         var cancelCapability = createPromiseCapability();
         _this2.streamControllers[streamId].cancelCall = cancelCapability;
+        _this2.streamControllers[streamId].isClosed = true;
         _this2.postMessage({
           sourceName: sourceName,
           targetName: targetName,
@@ -1310,9 +1312,15 @@ MessageHandler.prototype = {
         });
         break;
       case 'enqueue':
-        this.streamControllers[data.streamId].controller.enqueue(data.chunk);
+        if (!this.streamControllers[data.streamId].isClosed) {
+          this.streamControllers[data.streamId].controller.enqueue(data.chunk);
+        }
         break;
       case 'close':
+        if (this.streamControllers[data.streamId].isClosed) {
+          break;
+        }
+        this.streamControllers[data.streamId].isClosed = true;
         this.streamControllers[data.streamId].controller.close();
         deleteStreamController();
         break;
@@ -1325,6 +1333,9 @@ MessageHandler.prototype = {
         deleteStreamController();
         break;
       case 'cancel':
+        if (!this.streamSinks[data.streamId]) {
+          break;
+        }
         resolveCall(this.streamSinks[data.streamId].onCancel, [data.reason]).then(function () {
           sendStreamResponse({
             stream: 'cancel_complete',
@@ -11430,27 +11441,31 @@ var WorkerMessageHandler = {
         });
       });
     }, this);
-    handler.on('GetTextContent', function wphExtractText(data) {
+    handler.on('GetTextContent', function wphExtractText(data, sink) {
       var pageIndex = data.pageIndex;
-      return pdfManager.getPage(pageIndex).then(function (page) {
+      sink.onPull = function (desiredSize) {};
+      sink.onCancel = function (reason) {};
+      pdfManager.getPage(pageIndex).then(function (page) {
         var task = new WorkerTask('GetTextContent: page ' + pageIndex);
         startWorkerTask(task);
         var pageNum = pageIndex + 1;
         var start = Date.now();
-        return page.extractTextContent({
+        page.extractTextContent({
           handler: handler,
           task: task,
+          sink: sink,
           normalizeWhitespace: data.normalizeWhitespace,
           combineTextItems: data.combineTextItems
-        }).then(function (textContent) {
+        }).then(function () {
           finishWorkerTask(task);
           (0, _util.info)('text indexing: page=' + pageNum + ' - time=' + (Date.now() - start) + 'ms');
-          return textContent;
+          sink.close();
         }, function (reason) {
           finishWorkerTask(task);
           if (task.terminated) {
             return;
           }
+          sink.error(reason);
           throw reason;
         });
       });
@@ -15333,6 +15348,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PartialEvaluator = exports.OperatorList = undefined;
 
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var _util = __w_pdfjs_require__(0);
 
 var _cmap = __w_pdfjs_require__(24);
@@ -16291,7 +16308,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           _ref3$normalizeWhites = _ref3.normalizeWhitespace,
           normalizeWhitespace = _ref3$normalizeWhites === undefined ? false : _ref3$normalizeWhites,
           _ref3$combineTextItem = _ref3.combineTextItems,
-          combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem;
+          combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem,
+          sink = _ref3.sink,
+          _ref3$seenStyles = _ref3.seenStyles,
+          seenStyles = _ref3$seenStyles === undefined ? Object.create(null) : _ref3$seenStyles;
 
       resources = resources || _primitives.Dict.empty;
       stateManager = stateManager || new StateManager(new TextState());
@@ -16323,7 +16343,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var self = this;
       var xref = this.xref;
       var xobjs = null;
-      var xobjsCache = Object.create(null);
+      var skipEmptyXObjs = Object.create(null);
       var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
       var textState;
       function ensureTextContentItem() {
@@ -16331,7 +16351,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           return textContentItem;
         }
         var font = textState.font;
-        if (!(font.loadedName in textContent.styles)) {
+        if (!(font.loadedName in seenStyles)) {
+          seenStyles[font.loadedName] = true;
           textContent.styles[font.loadedName] = {
             fontFamily: font.fallbackName,
             ascent: font.ascent,
@@ -16486,10 +16507,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         textContentItem.initialized = false;
         textContentItem.str.length = 0;
       }
+      function enqueueChunk() {
+        var length = textContent.items.length;
+        if (length > 0) {
+          sink.enqueue(textContent, length);
+          textContent.items = [];
+          textContent.styles = Object.create(null);
+        }
+      }
       var timeSlotManager = new TimeSlotManager();
       return new Promise(function promiseBody(resolve, reject) {
         var next = function next(promise) {
-          promise.then(function () {
+          enqueueChunk();
+          Promise.all([promise, sink.ready]).then(function () {
             try {
               promiseBody(resolve, reject);
             } catch (ex) {
@@ -16512,196 +16542,248 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           var fn = operation.fn;
           args = operation.args;
           var advance, diff;
-          switch (fn | 0) {
+          var fontNameArg, fontSizeArg;
-            case _util.OPS.setFont:
+          var isSameTextLine;
-              var fontNameArg = args[0].name,
+          var items;
-                  fontSizeArg = args[1];
+          var offset;
-              if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
+          var j, jj;
+          var breakTextRun;
+          var name;
+          var xobj;
+          var type;
+          var currentState;
+          var xObjStateManager;
+          var matrix;
+          var dictName;
+          var extGState;
+          var gState;
+          var gStateFont;
+
+          var _ret2 = function () {
+            switch (fn | 0) {
+              case _util.OPS.setFont:
+                fontNameArg = args[0].name;
+                fontSizeArg = args[1];
+
+                if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
+                  break;
+                }
+                flushTextContentItem();
+                textState.fontName = fontNameArg;
+                textState.fontSize = fontSizeArg;
+                next(handleSetFont(fontNameArg, null));
+                return {
+                  v: void 0
+                };
+              case _util.OPS.setTextRise:
+                flushTextContentItem();
+                textState.textRise = args[0];
                 break;
-              }
+              case _util.OPS.setHScale:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.fontName = fontNameArg;
+                textState.textHScale = args[0] / 100;
-              textState.fontSize = fontSizeArg;
+                break;
-              next(handleSetFont(fontNameArg, null));
+              case _util.OPS.setLeading:
-              return;
+                flushTextContentItem();
-            case _util.OPS.setTextRise:
+                textState.leading = args[0];
-              flushTextContentItem();
+                break;
-              textState.textRise = args[0];
+              case _util.OPS.moveText:
-              break;
+                isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
-            case _util.OPS.setHScale:
+
-              flushTextContentItem();
+                advance = args[0] - args[1];
-              textState.textHScale = args[0] / 100;
+                if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
-              break;
+                  textState.translateTextLineMatrix(args[0], args[1]);
-            case _util.OPS.setLeading:
+                  textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
-              flushTextContentItem();
+                  textContentItem.height += args[1] - textContentItem.lastAdvanceHeight;
-              textState.leading = args[0];
+                  diff = args[0] - textContentItem.lastAdvanceWidth - (args[1] - textContentItem.lastAdvanceHeight);
-              break;
+                  addFakeSpaces(diff, textContentItem.str);
-            case _util.OPS.moveText:
+                  break;
-              var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
+                }
-              advance = args[0] - args[1];
+                flushTextContentItem();
-              if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
                 textState.translateTextLineMatrix(args[0], args[1]);
-                textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
+                textState.textMatrix = textState.textLineMatrix.slice();
-                textContentItem.height += args[1] - textContentItem.lastAdvanceHeight;
-                diff = args[0] - textContentItem.lastAdvanceWidth - (args[1] - textContentItem.lastAdvanceHeight);
-                addFakeSpaces(diff, textContentItem.str);
                 break;
-              }
+              case _util.OPS.setLeadingMoveText:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.translateTextLineMatrix(args[0], args[1]);
+                textState.leading = -args[1];
-              textState.textMatrix = textState.textLineMatrix.slice();
+                textState.translateTextLineMatrix(args[0], args[1]);
-              break;
+                textState.textMatrix = textState.textLineMatrix.slice();
-            case _util.OPS.setLeadingMoveText:
-              flushTextContentItem();
-              textState.leading = -args[1];
-              textState.translateTextLineMatrix(args[0], args[1]);
-              textState.textMatrix = textState.textLineMatrix.slice();
-              break;
-            case _util.OPS.nextLine:
-              flushTextContentItem();
-              textState.carriageReturn();
-              break;
-            case _util.OPS.setTextMatrix:
-              advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
-              if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
-                textState.translateTextLineMatrix(advance.width, advance.height);
-                textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
-                textContentItem.height += advance.height - textContentItem.lastAdvanceHeight;
-                diff = advance.width - textContentItem.lastAdvanceWidth - (advance.height - textContentItem.lastAdvanceHeight);
-                addFakeSpaces(diff, textContentItem.str);
                 break;
-              }
+              case _util.OPS.nextLine:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
+                textState.carriageReturn();
-              textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
+                break;
-              break;
+              case _util.OPS.setTextMatrix:
-            case _util.OPS.setCharSpacing:
+                advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
-              textState.charSpacing = args[0];
+                if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
-              break;
+                  textState.translateTextLineMatrix(advance.width, advance.height);
-            case _util.OPS.setWordSpacing:
+                  textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
-              textState.wordSpacing = args[0];
+                  textContentItem.height += advance.height - textContentItem.lastAdvanceHeight;
-              break;
+                  diff = advance.width - textContentItem.lastAdvanceWidth - (advance.height - textContentItem.lastAdvanceHeight);
-            case _util.OPS.beginText:
+                  addFakeSpaces(diff, textContentItem.str);
-              flushTextContentItem();
+                  break;
-              textState.textMatrix = _util.IDENTITY_MATRIX.slice();
+                }
-              textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
+                flushTextContentItem();
-              break;
+                textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
-            case _util.OPS.showSpacedText:
+                textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
-              var items = args[0];
+                break;
-              var offset;
+              case _util.OPS.setCharSpacing:
-              for (var j = 0, jj = items.length; j < jj; j++) {
+                textState.charSpacing = args[0];
-                if (typeof items[j] === 'string') {
+                break;
-                  buildTextContentItem(items[j]);
+              case _util.OPS.setWordSpacing:
-                } else if ((0, _util.isNum)(items[j])) {
+                textState.wordSpacing = args[0];
-                  ensureTextContentItem();
+                break;
-                  advance = items[j] * textState.fontSize / 1000;
+              case _util.OPS.beginText:
-                  var breakTextRun = false;
+                flushTextContentItem();
-                  if (textState.font.vertical) {
+                textState.textMatrix = _util.IDENTITY_MATRIX.slice();
-                    offset = advance;
+                textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
-                    textState.translateTextMatrix(0, offset);
+                break;
-                    breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+              case _util.OPS.showSpacedText:
-                    if (!breakTextRun) {
+                items = args[0];
-                      textContentItem.height += offset;
+
+                for (j = 0, jj = items.length; j < jj; j++) {
+                  if (typeof items[j] === 'string') {
+                    buildTextContentItem(items[j]);
+                  } else if ((0, _util.isNum)(items[j])) {
+                    ensureTextContentItem();
+                    advance = items[j] * textState.fontSize / 1000;
+                    breakTextRun = false;
+
+                    if (textState.font.vertical) {
+                      offset = advance;
+                      textState.translateTextMatrix(0, offset);
+                      breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+                      if (!breakTextRun) {
+                        textContentItem.height += offset;
+                      }
+                    } else {
+                      advance = -advance;
+                      offset = advance * textState.textHScale;
+                      textState.translateTextMatrix(offset, 0);
+                      breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+                      if (!breakTextRun) {
+                        textContentItem.width += offset;
+                      }
                     }
-                  } else {
+                    if (breakTextRun) {
-                    advance = -advance;
+                      flushTextContentItem();
-                    offset = advance * textState.textHScale;
+                    } else if (advance > 0) {
-                    textState.translateTextMatrix(offset, 0);
+                      addFakeSpaces(advance, textContentItem.str);
-                    breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
-                    if (!breakTextRun) {
-                      textContentItem.width += offset;
                     }
                   }
-                  if (breakTextRun) {
-                    flushTextContentItem();
-                  } else if (advance > 0) {
-                    addFakeSpaces(advance, textContentItem.str);
-                  }
                 }
-              }
-              break;
-            case _util.OPS.showText:
-              buildTextContentItem(args[0]);
-              break;
-            case _util.OPS.nextLineShowText:
-              flushTextContentItem();
-              textState.carriageReturn();
-              buildTextContentItem(args[0]);
-              break;
-            case _util.OPS.nextLineSetSpacingShowText:
-              flushTextContentItem();
-              textState.wordSpacing = args[0];
-              textState.charSpacing = args[1];
-              textState.carriageReturn();
-              buildTextContentItem(args[2]);
-              break;
-            case _util.OPS.paintXObject:
-              flushTextContentItem();
-              if (args[0].code) {
                 break;
-              }
+              case _util.OPS.showText:
-              if (!xobjs) {
+                buildTextContentItem(args[0]);
-                xobjs = resources.get('XObject') || _primitives.Dict.empty;
-              }
-              var name = args[0].name;
-              if (xobjsCache.key === name) {
-                if (xobjsCache.texts) {
-                  _util.Util.appendToArray(textContent.items, xobjsCache.texts.items);
-                  _util.Util.extendObj(textContent.styles, xobjsCache.texts.styles);
-                }
-                break;
-              }
-              var xobj = xobjs.get(name);
-              if (!xobj) {
                 break;
-              }
+              case _util.OPS.nextLineShowText:
-              (0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
+                flushTextContentItem();
-              var type = xobj.dict.get('Subtype');
+                textState.carriageReturn();
-              (0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
+                buildTextContentItem(args[0]);
-              if (type.name !== 'Form') {
-                xobjsCache.key = name;
-                xobjsCache.texts = null;
                 break;
-              }
+              case _util.OPS.nextLineSetSpacingShowText:
-              var currentState = stateManager.state.clone();
+                flushTextContentItem();
-              var xObjStateManager = new StateManager(currentState);
+                textState.wordSpacing = args[0];
-              var matrix = xobj.dict.getArray('Matrix');
+                textState.charSpacing = args[1];
-              if ((0, _util.isArray)(matrix) && matrix.length === 6) {
+                textState.carriageReturn();
-                xObjStateManager.transform(matrix);
+                buildTextContentItem(args[2]);
-              }
-              next(self.getTextContent({
-                stream: xobj,
-                task: task,
-                resources: xobj.dict.get('Resources') || resources,
-                stateManager: xObjStateManager,
-                normalizeWhitespace: normalizeWhitespace,
-                combineTextItems: combineTextItems
-              }).then(function (formTextContent) {
-                _util.Util.appendToArray(textContent.items, formTextContent.items);
-                _util.Util.extendObj(textContent.styles, formTextContent.styles);
-                xobjsCache.key = name;
-                xobjsCache.texts = formTextContent;
-              }));
-              return;
-            case _util.OPS.setGState:
-              flushTextContentItem();
-              var dictName = args[0];
-              var extGState = resources.get('ExtGState');
-              if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
                 break;
-              }
+              case _util.OPS.paintXObject:
-              var gState = extGState.get(dictName.name);
+                flushTextContentItem();
-              if (!(0, _primitives.isDict)(gState)) {
+                if (args[0].code) {
+                  break;
+                }
+                if (!xobjs) {
+                  xobjs = resources.get('XObject') || _primitives.Dict.empty;
+                }
+                name = args[0].name;
+
+                if (name in skipEmptyXObjs) {
+                  break;
+                }
+                xobj = xobjs.get(name);
+
+                if (!xobj) {
+                  break;
+                }
+                (0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
+                type = xobj.dict.get('Subtype');
+
+                (0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
+                if (type.name !== 'Form') {
+                  skipEmptyXObjs[name] = true;
+                  break;
+                }
+                currentState = stateManager.state.clone();
+                xObjStateManager = new StateManager(currentState);
+                matrix = xobj.dict.getArray('Matrix');
+
+                if ((0, _util.isArray)(matrix) && matrix.length === 6) {
+                  xObjStateManager.transform(matrix);
+                }
+                enqueueChunk();
+                var sinkWrapper = {
+                  enqueueInvoked: false,
+                  enqueue: function enqueue(chunk, size) {
+                    this.enqueueInvoked = true;
+                    sink.enqueue(chunk, size);
+                  },
+
+                  get desiredSize() {
+                    return sink.desiredSize;
+                  },
+                  get ready() {
+                    return sink.ready;
+                  }
+                };
+                next(self.getTextContent({
+                  stream: xobj,
+                  task: task,
+                  resources: xobj.dict.get('Resources') || resources,
+                  stateManager: xObjStateManager,
+                  normalizeWhitespace: normalizeWhitespace,
+                  combineTextItems: combineTextItems,
+                  sink: sinkWrapper,
+                  seenStyles: seenStyles
+                }).then(function () {
+                  if (!sinkWrapper.enqueueInvoked) {
+                    skipEmptyXObjs[name] = true;
+                  }
+                }));
+                return {
+                  v: void 0
+                };
+              case _util.OPS.setGState:
+                flushTextContentItem();
+                dictName = args[0];
+                extGState = resources.get('ExtGState');
+
+                if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
+                  break;
+                }
+                gState = extGState.get(dictName.name);
+
+                if (!(0, _primitives.isDict)(gState)) {
+                  break;
+                }
+                gStateFont = gState.get('Font');
+
+                if (gStateFont) {
+                  textState.fontName = null;
+                  textState.fontSize = gStateFont[1];
+                  next(handleSetFont(null, gStateFont[0]));
+                  return {
+                    v: void 0
+                  };
+                }
                 break;
-              }
+            }
-              var gStateFont = gState.get('Font');
+          }();
-              if (gStateFont) {
+
-                textState.fontName = null;
+          if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
-                textState.fontSize = gStateFont[1];
+          if (textContent.items.length >= sink.desiredSize) {
-                next(handleSetFont(null, gStateFont[0]));
+            stop = true;
-                return;
+            break;
-              }
-              break;
           }
         }
         if (stop) {
@@ -16709,12 +16791,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           return;
         }
         flushTextContentItem();
-        resolve(textContent);
+        enqueueChunk();
+        resolve();
       }).catch(function (reason) {
         if (_this9.options.ignoreErrors) {
           (0, _util.warn)('getTextContent - ignoring errors during task: ' + task.name);
           flushTextContentItem();
-          return textContent;
+          enqueueChunk();
+          return;
         }
         throw reason;
       });
@@ -29588,6 +29672,7 @@ var Page = function PageClosure() {
       var handler = _ref6.handler,
           task = _ref6.task,
           normalizeWhitespace = _ref6.normalizeWhitespace,
+          sink = _ref6.sink,
           combineTextItems = _ref6.combineTextItems;
 
       var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
@@ -29612,7 +29697,8 @@ var Page = function PageClosure() {
           task: task,
           resources: _this3.resources,
           normalizeWhitespace: normalizeWhitespace,
-          combineTextItems: combineTextItems
+          combineTextItems: combineTextItems,
+          sink: sink
         });
       });
     },
@@ -40317,8 +40403,8 @@ exports.Type1Parser = Type1Parser;
 "use strict";
 
 
-var pdfjsVersion = '1.8.482';
+var pdfjsVersion = '1.8.484';
-var pdfjsBuild = 'd1567a94';
+var pdfjsBuild = 'e2ca894f';
 var pdfjsCoreWorker = __w_pdfjs_require__(8);
 {
   __w_pdfjs_require__(19);

lib/core/document.js

@@ -245,6 +245,7 @@ var Page = function PageClosure() {
       var handler = _ref6.handler,
           task = _ref6.task,
           normalizeWhitespace = _ref6.normalizeWhitespace,
+          sink = _ref6.sink,
           combineTextItems = _ref6.combineTextItems;
 
       var contentStreamPromise = this.pdfManager.ensure(this, 'getContentStream');
@@ -269,7 +270,8 @@ var Page = function PageClosure() {
           task: task,
           resources: _this3.resources,
           normalizeWhitespace: normalizeWhitespace,
-          combineTextItems: combineTextItems
+          combineTextItems: combineTextItems,
+          sink: sink
         });
       });
     },

lib/core/evaluator.js

@@ -19,6 +19,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.PartialEvaluator = exports.OperatorList = undefined;
 
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var _util = require('../shared/util');
 
 var _cmap = require('./cmap');
@@ -977,7 +979,10 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           _ref3$normalizeWhites = _ref3.normalizeWhitespace,
           normalizeWhitespace = _ref3$normalizeWhites === undefined ? false : _ref3$normalizeWhites,
           _ref3$combineTextItem = _ref3.combineTextItems,
-          combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem;
+          combineTextItems = _ref3$combineTextItem === undefined ? false : _ref3$combineTextItem,
+          sink = _ref3.sink,
+          _ref3$seenStyles = _ref3.seenStyles,
+          seenStyles = _ref3$seenStyles === undefined ? Object.create(null) : _ref3$seenStyles;
 
       resources = resources || _primitives.Dict.empty;
       stateManager = stateManager || new StateManager(new TextState());
@@ -1009,7 +1014,7 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
       var self = this;
       var xref = this.xref;
       var xobjs = null;
-      var xobjsCache = Object.create(null);
+      var skipEmptyXObjs = Object.create(null);
       var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
       var textState;
       function ensureTextContentItem() {
@@ -1017,7 +1022,8 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           return textContentItem;
         }
         var font = textState.font;
-        if (!(font.loadedName in textContent.styles)) {
+        if (!(font.loadedName in seenStyles)) {
+          seenStyles[font.loadedName] = true;
           textContent.styles[font.loadedName] = {
             fontFamily: font.fallbackName,
             ascent: font.ascent,
@@ -1172,10 +1178,19 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
         textContentItem.initialized = false;
         textContentItem.str.length = 0;
       }
+      function enqueueChunk() {
+        var length = textContent.items.length;
+        if (length > 0) {
+          sink.enqueue(textContent, length);
+          textContent.items = [];
+          textContent.styles = Object.create(null);
+        }
+      }
       var timeSlotManager = new TimeSlotManager();
       return new Promise(function promiseBody(resolve, reject) {
         var next = function next(promise) {
-          promise.then(function () {
+          enqueueChunk();
+          Promise.all([promise, sink.ready]).then(function () {
             try {
               promiseBody(resolve, reject);
             } catch (ex) {
@@ -1198,196 +1213,248 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           var fn = operation.fn;
           args = operation.args;
           var advance, diff;
-          switch (fn | 0) {
+          var fontNameArg, fontSizeArg;
-            case _util.OPS.setFont:
+          var isSameTextLine;
-              var fontNameArg = args[0].name,
+          var items;
-                  fontSizeArg = args[1];
+          var offset;
-              if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
+          var j, jj;
+          var breakTextRun;
+          var name;
+          var xobj;
+          var type;
+          var currentState;
+          var xObjStateManager;
+          var matrix;
+          var dictName;
+          var extGState;
+          var gState;
+          var gStateFont;
+
+          var _ret2 = function () {
+            switch (fn | 0) {
+              case _util.OPS.setFont:
+                fontNameArg = args[0].name;
+                fontSizeArg = args[1];
+
+                if (textState.font && fontNameArg === textState.fontName && fontSizeArg === textState.fontSize) {
+                  break;
+                }
+                flushTextContentItem();
+                textState.fontName = fontNameArg;
+                textState.fontSize = fontSizeArg;
+                next(handleSetFont(fontNameArg, null));
+                return {
+                  v: void 0
+                };
+              case _util.OPS.setTextRise:
+                flushTextContentItem();
+                textState.textRise = args[0];
                 break;
-              }
+              case _util.OPS.setHScale:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.fontName = fontNameArg;
+                textState.textHScale = args[0] / 100;
-              textState.fontSize = fontSizeArg;
+                break;
-              next(handleSetFont(fontNameArg, null));
+              case _util.OPS.setLeading:
-              return;
+                flushTextContentItem();
-            case _util.OPS.setTextRise:
+                textState.leading = args[0];
-              flushTextContentItem();
+                break;
-              textState.textRise = args[0];
+              case _util.OPS.moveText:
-              break;
+                isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
-            case _util.OPS.setHScale:
+
-              flushTextContentItem();
+                advance = args[0] - args[1];
-              textState.textHScale = args[0] / 100;
+                if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
-              break;
+                  textState.translateTextLineMatrix(args[0], args[1]);
-            case _util.OPS.setLeading:
+                  textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
-              flushTextContentItem();
+                  textContentItem.height += args[1] - textContentItem.lastAdvanceHeight;
-              textState.leading = args[0];
+                  diff = args[0] - textContentItem.lastAdvanceWidth - (args[1] - textContentItem.lastAdvanceHeight);
-              break;
+                  addFakeSpaces(diff, textContentItem.str);
-            case _util.OPS.moveText:
+                  break;
-              var isSameTextLine = !textState.font ? false : (textState.font.vertical ? args[0] : args[1]) === 0;
+                }
-              advance = args[0] - args[1];
+                flushTextContentItem();
-              if (combineTextItems && isSameTextLine && textContentItem.initialized && advance > 0 && advance <= textContentItem.fakeMultiSpaceMax) {
                 textState.translateTextLineMatrix(args[0], args[1]);
-                textContentItem.width += args[0] - textContentItem.lastAdvanceWidth;
+                textState.textMatrix = textState.textLineMatrix.slice();
-                textContentItem.height += args[1] - textContentItem.lastAdvanceHeight;
-                diff = args[0] - textContentItem.lastAdvanceWidth - (args[1] - textContentItem.lastAdvanceHeight);
-                addFakeSpaces(diff, textContentItem.str);
                 break;
-              }
+              case _util.OPS.setLeadingMoveText:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.translateTextLineMatrix(args[0], args[1]);
+                textState.leading = -args[1];
-              textState.textMatrix = textState.textLineMatrix.slice();
+                textState.translateTextLineMatrix(args[0], args[1]);
-              break;
+                textState.textMatrix = textState.textLineMatrix.slice();
-            case _util.OPS.setLeadingMoveText:
-              flushTextContentItem();
-              textState.leading = -args[1];
-              textState.translateTextLineMatrix(args[0], args[1]);
-              textState.textMatrix = textState.textLineMatrix.slice();
-              break;
-            case _util.OPS.nextLine:
-              flushTextContentItem();
-              textState.carriageReturn();
-              break;
-            case _util.OPS.setTextMatrix:
-              advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
-              if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
-                textState.translateTextLineMatrix(advance.width, advance.height);
-                textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
-                textContentItem.height += advance.height - textContentItem.lastAdvanceHeight;
-                diff = advance.width - textContentItem.lastAdvanceWidth - (advance.height - textContentItem.lastAdvanceHeight);
-                addFakeSpaces(diff, textContentItem.str);
                 break;
-              }
+              case _util.OPS.nextLine:
-              flushTextContentItem();
+                flushTextContentItem();
-              textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
+                textState.carriageReturn();
-              textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
+                break;
-              break;
+              case _util.OPS.setTextMatrix:
-            case _util.OPS.setCharSpacing:
+                advance = textState.calcTextLineMatrixAdvance(args[0], args[1], args[2], args[3], args[4], args[5]);
-              textState.charSpacing = args[0];
+                if (combineTextItems && advance !== null && textContentItem.initialized && advance.value > 0 && advance.value <= textContentItem.fakeMultiSpaceMax) {
-              break;
+                  textState.translateTextLineMatrix(advance.width, advance.height);
-            case _util.OPS.setWordSpacing:
+                  textContentItem.width += advance.width - textContentItem.lastAdvanceWidth;
-              textState.wordSpacing = args[0];
+                  textContentItem.height += advance.height - textContentItem.lastAdvanceHeight;
-              break;
+                  diff = advance.width - textContentItem.lastAdvanceWidth - (advance.height - textContentItem.lastAdvanceHeight);
-            case _util.OPS.beginText:
+                  addFakeSpaces(diff, textContentItem.str);
-              flushTextContentItem();
+                  break;
-              textState.textMatrix = _util.IDENTITY_MATRIX.slice();
+                }
-              textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
+                flushTextContentItem();
-              break;
+                textState.setTextMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
-            case _util.OPS.showSpacedText:
+                textState.setTextLineMatrix(args[0], args[1], args[2], args[3], args[4], args[5]);
-              var items = args[0];
+                break;
-              var offset;
+              case _util.OPS.setCharSpacing:
-              for (var j = 0, jj = items.length; j < jj; j++) {
+                textState.charSpacing = args[0];
-                if (typeof items[j] === 'string') {
+                break;
-                  buildTextContentItem(items[j]);
+              case _util.OPS.setWordSpacing:
-                } else if ((0, _util.isNum)(items[j])) {
+                textState.wordSpacing = args[0];
-                  ensureTextContentItem();
+                break;
-                  advance = items[j] * textState.fontSize / 1000;
+              case _util.OPS.beginText:
-                  var breakTextRun = false;
+                flushTextContentItem();
-                  if (textState.font.vertical) {
+                textState.textMatrix = _util.IDENTITY_MATRIX.slice();
-                    offset = advance;
+                textState.textLineMatrix = _util.IDENTITY_MATRIX.slice();
-                    textState.translateTextMatrix(0, offset);
+                break;
-                    breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+              case _util.OPS.showSpacedText:
-                    if (!breakTextRun) {
+                items = args[0];
-                      textContentItem.height += offset;
+
+                for (j = 0, jj = items.length; j < jj; j++) {
+                  if (typeof items[j] === 'string') {
+                    buildTextContentItem(items[j]);
+                  } else if ((0, _util.isNum)(items[j])) {
+                    ensureTextContentItem();
+                    advance = items[j] * textState.fontSize / 1000;
+                    breakTextRun = false;
+
+                    if (textState.font.vertical) {
+                      offset = advance;
+                      textState.translateTextMatrix(0, offset);
+                      breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+                      if (!breakTextRun) {
+                        textContentItem.height += offset;
+                      }
+                    } else {
+                      advance = -advance;
+                      offset = advance * textState.textHScale;
+                      textState.translateTextMatrix(offset, 0);
+                      breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
+                      if (!breakTextRun) {
+                        textContentItem.width += offset;
+                      }
                     }
-                  } else {
+                    if (breakTextRun) {
-                    advance = -advance;
+                      flushTextContentItem();
-                    offset = advance * textState.textHScale;
+                    } else if (advance > 0) {
-                    textState.translateTextMatrix(offset, 0);
+                      addFakeSpaces(advance, textContentItem.str);
-                    breakTextRun = textContentItem.textRunBreakAllowed && advance > textContentItem.fakeMultiSpaceMax;
-                    if (!breakTextRun) {
-                      textContentItem.width += offset;
                     }
                   }
-                  if (breakTextRun) {
-                    flushTextContentItem();
-                  } else if (advance > 0) {
-                    addFakeSpaces(advance, textContentItem.str);
-                  }
                 }
-              }
-              break;
-            case _util.OPS.showText:
-              buildTextContentItem(args[0]);
-              break;
-            case _util.OPS.nextLineShowText:
-              flushTextContentItem();
-              textState.carriageReturn();
-              buildTextContentItem(args[0]);
-              break;
-            case _util.OPS.nextLineSetSpacingShowText:
-              flushTextContentItem();
-              textState.wordSpacing = args[0];
-              textState.charSpacing = args[1];
-              textState.carriageReturn();
-              buildTextContentItem(args[2]);
-              break;
-            case _util.OPS.paintXObject:
-              flushTextContentItem();
-              if (args[0].code) {
                 break;
-              }
+              case _util.OPS.showText:
-              if (!xobjs) {
+                buildTextContentItem(args[0]);
-                xobjs = resources.get('XObject') || _primitives.Dict.empty;
-              }
-              var name = args[0].name;
-              if (xobjsCache.key === name) {
-                if (xobjsCache.texts) {
-                  _util.Util.appendToArray(textContent.items, xobjsCache.texts.items);
-                  _util.Util.extendObj(textContent.styles, xobjsCache.texts.styles);
-                }
-                break;
-              }
-              var xobj = xobjs.get(name);
-              if (!xobj) {
                 break;
-              }
+              case _util.OPS.nextLineShowText:
-              (0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
+                flushTextContentItem();
-              var type = xobj.dict.get('Subtype');
+                textState.carriageReturn();
-              (0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
+                buildTextContentItem(args[0]);
-              if (type.name !== 'Form') {
-                xobjsCache.key = name;
-                xobjsCache.texts = null;
                 break;
-              }
+              case _util.OPS.nextLineSetSpacingShowText:
-              var currentState = stateManager.state.clone();
+                flushTextContentItem();
-              var xObjStateManager = new StateManager(currentState);
+                textState.wordSpacing = args[0];
-              var matrix = xobj.dict.getArray('Matrix');
+                textState.charSpacing = args[1];
-              if ((0, _util.isArray)(matrix) && matrix.length === 6) {
+                textState.carriageReturn();
-                xObjStateManager.transform(matrix);
+                buildTextContentItem(args[2]);
-              }
-              next(self.getTextContent({
-                stream: xobj,
-                task: task,
-                resources: xobj.dict.get('Resources') || resources,
-                stateManager: xObjStateManager,
-                normalizeWhitespace: normalizeWhitespace,
-                combineTextItems: combineTextItems
-              }).then(function (formTextContent) {
-                _util.Util.appendToArray(textContent.items, formTextContent.items);
-                _util.Util.extendObj(textContent.styles, formTextContent.styles);
-                xobjsCache.key = name;
-                xobjsCache.texts = formTextContent;
-              }));
-              return;
-            case _util.OPS.setGState:
-              flushTextContentItem();
-              var dictName = args[0];
-              var extGState = resources.get('ExtGState');
-              if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
                 break;
-              }
+              case _util.OPS.paintXObject:
-              var gState = extGState.get(dictName.name);
+                flushTextContentItem();
-              if (!(0, _primitives.isDict)(gState)) {
+                if (args[0].code) {
+                  break;
+                }
+                if (!xobjs) {
+                  xobjs = resources.get('XObject') || _primitives.Dict.empty;
+                }
+                name = args[0].name;
+
+                if (name in skipEmptyXObjs) {
+                  break;
+                }
+                xobj = xobjs.get(name);
+
+                if (!xobj) {
+                  break;
+                }
+                (0, _util.assert)((0, _primitives.isStream)(xobj), 'XObject should be a stream');
+                type = xobj.dict.get('Subtype');
+
+                (0, _util.assert)((0, _primitives.isName)(type), 'XObject should have a Name subtype');
+                if (type.name !== 'Form') {
+                  skipEmptyXObjs[name] = true;
+                  break;
+                }
+                currentState = stateManager.state.clone();
+                xObjStateManager = new StateManager(currentState);
+                matrix = xobj.dict.getArray('Matrix');
+
+                if ((0, _util.isArray)(matrix) && matrix.length === 6) {
+                  xObjStateManager.transform(matrix);
+                }
+                enqueueChunk();
+                var sinkWrapper = {
+                  enqueueInvoked: false,
+                  enqueue: function enqueue(chunk, size) {
+                    this.enqueueInvoked = true;
+                    sink.enqueue(chunk, size);
+                  },
+
+                  get desiredSize() {
+                    return sink.desiredSize;
+                  },
+                  get ready() {
+                    return sink.ready;
+                  }
+                };
+                next(self.getTextContent({
+                  stream: xobj,
+                  task: task,
+                  resources: xobj.dict.get('Resources') || resources,
+                  stateManager: xObjStateManager,
+                  normalizeWhitespace: normalizeWhitespace,
+                  combineTextItems: combineTextItems,
+                  sink: sinkWrapper,
+                  seenStyles: seenStyles
+                }).then(function () {
+                  if (!sinkWrapper.enqueueInvoked) {
+                    skipEmptyXObjs[name] = true;
+                  }
+                }));
+                return {
+                  v: void 0
+                };
+              case _util.OPS.setGState:
+                flushTextContentItem();
+                dictName = args[0];
+                extGState = resources.get('ExtGState');
+
+                if (!(0, _primitives.isDict)(extGState) || !(0, _primitives.isName)(dictName)) {
+                  break;
+                }
+                gState = extGState.get(dictName.name);
+
+                if (!(0, _primitives.isDict)(gState)) {
+                  break;
+                }
+                gStateFont = gState.get('Font');
+
+                if (gStateFont) {
+                  textState.fontName = null;
+                  textState.fontSize = gStateFont[1];
+                  next(handleSetFont(null, gStateFont[0]));
+                  return {
+                    v: void 0
+                  };
+                }
                 break;
-              }
+            }
-              var gStateFont = gState.get('Font');
+          }();
-              if (gStateFont) {
+
-                textState.fontName = null;
+          if ((typeof _ret2 === 'undefined' ? 'undefined' : _typeof(_ret2)) === "object") return _ret2.v;
-                textState.fontSize = gStateFont[1];
+          if (textContent.items.length >= sink.desiredSize) {
-                next(handleSetFont(null, gStateFont[0]));
+            stop = true;
-                return;
+            break;
-              }
-              break;
           }
         }
         if (stop) {
@@ -1395,12 +1462,14 @@ var PartialEvaluator = function PartialEvaluatorClosure() {
           return;
         }
         flushTextContentItem();
-        resolve(textContent);
+        enqueueChunk();
+        resolve();
       }).catch(function (reason) {
         if (_this9.options.ignoreErrors) {
           (0, _util.warn)('getTextContent - ignoring errors during task: ' + task.name);
           flushTextContentItem();
-          return textContent;
+          enqueueChunk();
+          return;
         }
         throw reason;
       });

lib/core/worker.js

@@ -620,27 +620,31 @@ var WorkerMessageHandler = {
         });
       });
     }, this);
-    handler.on('GetTextContent', function wphExtractText(data) {
+    handler.on('GetTextContent', function wphExtractText(data, sink) {
       var pageIndex = data.pageIndex;
-      return pdfManager.getPage(pageIndex).then(function (page) {
+      sink.onPull = function (desiredSize) {};
+      sink.onCancel = function (reason) {};
+      pdfManager.getPage(pageIndex).then(function (page) {
         var task = new WorkerTask('GetTextContent: page ' + pageIndex);
         startWorkerTask(task);
         var pageNum = pageIndex + 1;
         var start = Date.now();
-        return page.extractTextContent({
+        page.extractTextContent({
           handler: handler,
           task: task,
+          sink: sink,
           normalizeWhitespace: data.normalizeWhitespace,
           combineTextItems: data.combineTextItems
-        }).then(function (textContent) {
+        }).then(function () {
           finishWorkerTask(task);
           (0, _util.info)('text indexing: page=' + pageNum + ' - time=' + (Date.now() - start) + 'ms');
-          return textContent;
+          sink.close();
         }, function (reason) {
           finishWorkerTask(task);
           if (task.terminated) {
             return;
           }
+          sink.error(reason);
           throw reason;
         });
       });

lib/display/api.js

@@ -490,12 +490,46 @@ var PDFPageProxy = function PDFPageProxyClosure() {
       }
       return intentState.opListReadCapability.promise;
     },
-    getTextContent: function PDFPageProxy_getTextContent(params) {
+    streamTextContent: function streamTextContent() {
-      params = params || {};
+      var params = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-      return this.transport.messageHandler.sendWithPromise('GetTextContent', {
+
+      var TEXT_CONTENT_CHUNK_SIZE = 100;
+      return this.transport.messageHandler.sendWithStream('GetTextContent', {
         pageIndex: this.pageNumber - 1,
         normalizeWhitespace: params.normalizeWhitespace === true,
         combineTextItems: params.disableCombineTextItems !== true
+      }, {
+        highWaterMark: TEXT_CONTENT_CHUNK_SIZE,
+        size: function size(textContent) {
+          return textContent.items.length;
+        }
+      });
+    },
+
+    getTextContent: function PDFPageProxy_getTextContent(params) {
+      params = params || {};
+      var readableStream = this.streamTextContent(params);
+      return new Promise(function (resolve, reject) {
+        function pump() {
+          reader.read().then(function (_ref) {
+            var value = _ref.value,
+                done = _ref.done;
+
+            if (done) {
+              resolve(textContent);
+              return;
+            }
+            _util.Util.extendObj(textContent.styles, value.styles);
+            _util.Util.appendToArray(textContent.items, value.items);
+            pump();
+          }, reject);
+        }
+        var reader = readableStream.getReader();
+        var textContent = {
+          items: [],
+          styles: Object.create(null)
+        };
+        pump();
       });
     },
     _destroy: function PDFPageProxy_destroy() {
@@ -1446,8 +1480,8 @@ var _UnsupportedManager = function UnsupportedManagerClosure() {
 }();
 var version, build;
 {
-  exports.version = version = '1.8.482';
+  exports.version = version = '1.8.484';
-  exports.build = build = 'd1567a94';
+  exports.build = build = 'e2ca894f';
 }
 exports.getDocument = getDocument;
 exports.LoopbackPort = LoopbackPort;

lib/display/global.js

@@ -39,8 +39,8 @@ if (!_util.globalScope.PDFJS) {
 }
 var PDFJS = _util.globalScope.PDFJS;
 {
-  PDFJS.version = '1.8.482';
+  PDFJS.version = '1.8.484';
-  PDFJS.build = 'd1567a94';
+  PDFJS.build = 'e2ca894f';
 }
 PDFJS.pdfBug = false;
 if (PDFJS.verbosity !== undefined) {

lib/display/text_layer.js

@@ -93,6 +93,9 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
     }
     task._textDivProperties.set(textDiv, textDivProperties);
+    if (task._textContentStream) {
+      task._layoutText(textDiv);
+    }
     if (task._enhanceTextSelection) {
       var angleCos = 1,
           angleSin = 0;
@@ -124,7 +127,6 @@ var renderTextLayer = function renderTextLayerClosure() {
     if (task._canceled) {
       return;
     }
-    var textLayerFrag = task._container;
     var textDivs = task._textDivs;
     var capability = task._capability;
     var textDivsLength = textDivs.length;
@@ -133,39 +135,10 @@ var renderTextLayer = function renderTextLayerClosure() {
       capability.resolve();
       return;
     }
-    var canvas = document.createElement('canvas');
+    if (!task._textContentStream) {
-    canvas.mozOpaque = true;
+      for (var i = 0; i < textDivsLength; i++) {
-    var ctx = canvas.getContext('2d', { alpha: false });
+        task._layoutText(textDivs[i]);
-    var lastFontSize;
-    var lastFontFamily;
-    for (var i = 0; i < textDivsLength; i++) {
-      var textDiv = textDivs[i];
-      var textDivProperties = task._textDivProperties.get(textDiv);
-      if (textDivProperties.isWhitespace) {
-        continue;
-      }
-      var fontSize = textDiv.style.fontSize;
-      var fontFamily = textDiv.style.fontFamily;
-      if (fontSize !== lastFontSize || fontFamily !== lastFontFamily) {
-        ctx.font = fontSize + ' ' + fontFamily;
-        lastFontSize = fontSize;
-        lastFontFamily = fontFamily;
-      }
-      var width = ctx.measureText(textDiv.textContent).width;
-      textLayerFrag.appendChild(textDiv);
-      var transform = '';
-      if (textDivProperties.canvasWidth !== 0 && width > 0) {
-        textDivProperties.scale = textDivProperties.canvasWidth / width;
-        transform = 'scaleX(' + textDivProperties.scale + ')';
-      }
-      if (textDivProperties.angle !== 0) {
-        transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
       }
-      if (transform !== '') {
-        textDivProperties.originalTransform = transform;
-        _dom_utils.CustomStyle.setProp('transform', textDiv, transform);
-      }
-      task._textDivProperties.set(textDiv, textDivProperties);
     }
     task._renderingDone = true;
     capability.resolve();
@@ -395,24 +368,42 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
     });
   }
-  function TextLayerRenderTask(textContent, container, viewport, textDivs, enhanceTextSelection) {
+  function TextLayerRenderTask(_ref) {
+    var textContent = _ref.textContent,
+        textContentStream = _ref.textContentStream,
+        container = _ref.container,
+        viewport = _ref.viewport,
+        textDivs = _ref.textDivs,
+        textContentItemsStr = _ref.textContentItemsStr,
+        enhanceTextSelection = _ref.enhanceTextSelection;
+
     this._textContent = textContent;
+    this._textContentStream = textContentStream;
     this._container = container;
     this._viewport = viewport;
     this._textDivs = textDivs || [];
+    this._textContentItemsStr = textContentItemsStr || [];
+    this._enhanceTextSelection = !!enhanceTextSelection;
+    this._reader = null;
+    this._layoutTextLastFontSize = null;
+    this._layoutTextLastFontFamily = null;
+    this._layoutTextCtx = null;
     this._textDivProperties = new WeakMap();
     this._renderingDone = false;
     this._canceled = false;
     this._capability = (0, _util.createPromiseCapability)();
     this._renderTimer = null;
     this._bounds = [];
-    this._enhanceTextSelection = !!enhanceTextSelection;
   }
   TextLayerRenderTask.prototype = {
     get promise() {
       return this._capability.promise;
     },
     cancel: function TextLayer_cancel() {
+      if (this._reader) {
+        this._reader.cancel();
+        this._reader = null;
+      }
       this._canceled = true;
       if (this._renderTimer !== null) {
         clearTimeout(this._renderTimer);
@@ -420,22 +411,86 @@ var renderTextLayer = function renderTextLayerClosure() {
       }
       this._capability.reject('canceled');
     },
+    _processItems: function _processItems(items, styleCache) {
+      for (var i = 0, len = items.length; i < len; i++) {
+        this._textContentItemsStr.push(items[i].str);
+        appendText(this, items[i], styleCache);
+      }
+    },
+    _layoutText: function _layoutText(textDiv) {
+      var textLayerFrag = this._container;
+      var textDivProperties = this._textDivProperties.get(textDiv);
+      if (textDivProperties.isWhitespace) {
+        return;
+      }
+      var fontSize = textDiv.style.fontSize;
+      var fontFamily = textDiv.style.fontFamily;
+      if (fontSize !== this._layoutTextLastFontSize || fontFamily !== this._layoutTextLastFontFamily) {
+        this._layoutTextCtx.font = fontSize + ' ' + fontFamily;
+        this._lastFontSize = fontSize;
+        this._lastFontFamily = fontFamily;
+      }
+      var width = this._layoutTextCtx.measureText(textDiv.textContent).width;
+      var transform = '';
+      if (textDivProperties.canvasWidth !== 0 && width > 0) {
+        textDivProperties.scale = textDivProperties.canvasWidth / width;
+        transform = 'scaleX(' + textDivProperties.scale + ')';
+      }
+      if (textDivProperties.angle !== 0) {
+        transform = 'rotate(' + textDivProperties.angle + 'deg) ' + transform;
+      }
+      if (transform !== '') {
+        textDivProperties.originalTransform = transform;
+        _dom_utils.CustomStyle.setProp('transform', textDiv, transform);
+      }
+      this._textDivProperties.set(textDiv, textDivProperties);
+      textLayerFrag.appendChild(textDiv);
+    },
+
     _render: function TextLayer_render(timeout) {
       var _this = this;
 
-      var textItems = this._textContent.items;
+      var capability = (0, _util.createPromiseCapability)();
-      var textStyles = this._textContent.styles;
+      var styleCache = Object.create(null);
-      for (var i = 0, len = textItems.length; i < len; i++) {
+      var canvas = document.createElement('canvas');
-        appendText(this, textItems[i], textStyles);
+      canvas.mozOpaque = true;
-      }
+      this._layoutTextCtx = canvas.getContext('2d', { alpha: false });
-      if (!timeout) {
+      if (this._textContent) {
-        render(this);
+        var textItems = this._textContent.items;
+        var textStyles = this._textContent.styles;
+        this._processItems(textItems, textStyles);
+        capability.resolve();
+      } else if (this._textContentStream) {
+        var pump = function pump() {
+          _this._reader.read().then(function (_ref2) {
+            var value = _ref2.value,
+                done = _ref2.done;
+
+            if (done) {
+              capability.resolve();
+              return;
+            }
+            _util.Util.extendObj(styleCache, value.styles);
+            _this._processItems(value.items, styleCache);
+            pump();
+          }, capability.reject);
+        };
+        this._reader = this._textContentStream.getReader();
+        pump();
       } else {
-        this._renderTimer = setTimeout(function () {
+        throw new Error('Neither "textContent" nor "textContentStream"' + ' parameters specified.');
-          render(_this);
-          _this._renderTimer = null;
-        }, timeout);
       }
+      capability.promise.then(function () {
+        styleCache = null;
+        if (!timeout) {
+          render(_this);
+        } else {
+          _this._renderTimer = setTimeout(function () {
+            render(_this);
+            _this._renderTimer = null;
+          }, timeout);
+        }
+      }, this._capability.reject);
     },
     expandTextDivs: function TextLayer_expandTextDivs(expandDivs) {
       if (!this._enhanceTextSelection || !this._renderingDone) {
@@ -488,7 +543,15 @@ var renderTextLayer = function renderTextLayerClosure() {
     }
   };
   function renderTextLayer(renderParameters) {
-    var task = new TextLayerRenderTask(renderParameters.textContent, renderParameters.container, renderParameters.viewport, renderParameters.textDivs, renderParameters.enhanceTextSelection);
+    var task = new TextLayerRenderTask({
+      textContent: renderParameters.textContent,
+      textContentStream: renderParameters.textContentStream,
+      container: renderParameters.container,
+      viewport: renderParameters.viewport,
+      textDivs: renderParameters.textDivs,
+      textContentItemsStr: renderParameters.textContentItemsStr,
+      enhanceTextSelection: renderParameters.enhanceTextSelection
+    });
     task._render(renderParameters.timeout);
     return task;
   }

lib/pdf.js

@@ -14,8 +14,8 @@
  */
 'use strict';
 
-var pdfjsVersion = '1.8.482';
+var pdfjsVersion = '1.8.484';
-var pdfjsBuild = 'd1567a94';
+var pdfjsBuild = 'e2ca894f';
 var pdfjsSharedUtil = require('./shared/util.js');
 var pdfjsDisplayGlobal = require('./display/global.js');
 var pdfjsDisplayAPI = require('./display/api.js');

lib/pdf.worker.js

@@ -14,8 +14,8 @@
  */
 'use strict';
 
-var pdfjsVersion = '1.8.482';
+var pdfjsVersion = '1.8.484';
-var pdfjsBuild = 'd1567a94';
+var pdfjsBuild = 'e2ca894f';
 var pdfjsCoreWorker = require('./core/worker.js');
 {
   require('./core/network.js');

lib/shared/util.js

@@ -1054,7 +1054,8 @@ MessageHandler.prototype = {
         var startCapability = createPromiseCapability();
         _this2.streamControllers[streamId] = {
           controller: controller,
-          startCall: startCapability
+          startCall: startCapability,
+          isClosed: false
         };
         _this2.postMessage({
           sourceName: sourceName,
@@ -1081,6 +1082,7 @@ MessageHandler.prototype = {
       cancel: function cancel(reason) {
         var cancelCapability = createPromiseCapability();
         _this2.streamControllers[streamId].cancelCall = cancelCapability;
+        _this2.streamControllers[streamId].isClosed = true;
         _this2.postMessage({
           sourceName: sourceName,
           targetName: targetName,
@@ -1226,9 +1228,15 @@ MessageHandler.prototype = {
         });
         break;
       case 'enqueue':
-        this.streamControllers[data.streamId].controller.enqueue(data.chunk);
+        if (!this.streamControllers[data.streamId].isClosed) {
+          this.streamControllers[data.streamId].controller.enqueue(data.chunk);
+        }
         break;
       case 'close':
+        if (this.streamControllers[data.streamId].isClosed) {
+          break;
+        }
+        this.streamControllers[data.streamId].isClosed = true;
         this.streamControllers[data.streamId].controller.close();
         deleteStreamController();
         break;
@@ -1241,6 +1249,9 @@ MessageHandler.prototype = {
         deleteStreamController();
         break;
       case 'cancel':
+        if (!this.streamSinks[data.streamId]) {
+          break;
+        }
         resolveCall(this.streamSinks[data.streamId].onCancel, [data.reason]).then(function () {
           sendStreamResponse({
             stream: 'cancel_complete',

lib/web/pdf_page_view.js

@@ -31,8 +31,6 @@ var _pdf_rendering_queue = require('./pdf_rendering_queue');
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var TEXT_LAYER_RENDER_DELAY = 200;
-
 var PDFPageView = function () {
   function PDFPageView(options) {
     _classCallCheck(this, PDFPageView);
@@ -361,10 +359,9 @@ var PDFPageView = function () {
       var resultPromise = paintTask.promise.then(function () {
         return finishPaintTask(null).then(function () {
           if (textLayer) {
-            pdfPage.getTextContent({ normalizeWhitespace: true }).then(function textContentResolved(textContent) {
+            var readableStream = pdfPage.streamTextContent({ normalizeWhitespace: true });
-              textLayer.setTextContent(textContent);
+            textLayer.setTextContentStream(readableStream);
-              textLayer.render(TEXT_LAYER_RENDER_DELAY);
+            textLayer.render();
-            });
           }
         });
       }, function (reason) {

lib/web/text_layer_builder.js

@@ -29,6 +29,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
     this.textLayerDiv = options.textLayerDiv;
     this.eventBus = options.eventBus || (0, _dom_events.getGlobalEventBus)();
     this.textContent = null;
+    this.textContentItemsStr = [];
+    this.textContentStream = null;
     this.renderingDone = false;
     this.pageIdx = options.pageIndex;
     this.pageNumber = this.pageIdx + 1;
@@ -57,7 +59,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
     render: function TextLayerBuilder_render(timeout) {
       var _this = this;
 
-      if (!this.textContent || this.renderingDone) {
+      if (!(this.textContent || this.textContentStream) || this.renderingDone) {
         return;
       }
       this.cancel();
@@ -65,9 +67,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       var textLayerFrag = document.createDocumentFragment();
       this.textLayerRenderTask = (0, _pdf.renderTextLayer)({
         textContent: this.textContent,
+        textContentStream: this.textContentStream,
         container: textLayerFrag,
         viewport: this.viewport,
         textDivs: this.textDivs,
+        textContentItemsStr: this.textContentItemsStr,
         timeout: timeout,
         enhanceTextSelection: this.enhanceTextSelection
       });
@@ -83,6 +87,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
         this.textLayerRenderTask = null;
       }
     },
+    setTextContentStream: function setTextContentStream(readableStream) {
+      this.cancel();
+      this.textContentStream = readableStream;
+    },
+
     setTextContent: function TextLayerBuilder_setTextContent(textContent) {
       this.cancel();
       this.textContent = textContent;
@@ -90,8 +99,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
     convertMatches: function TextLayerBuilder_convertMatches(matches, matchesLength) {
       var i = 0;
       var iIndex = 0;
-      var bidiTexts = this.textContent.items;
+      var textContentItemsStr = this.textContentItemsStr;
-      var end = bidiTexts.length - 1;
+      var end = textContentItemsStr.length - 1;
       var queryLen = this.findController === null ? 0 : this.findController.state.query.length;
       var ret = [];
       if (!matches) {
@@ -99,11 +108,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       }
       for (var m = 0, len = matches.length; m < len; m++) {
         var matchIdx = matches[m];
-        while (i !== end && matchIdx >= iIndex + bidiTexts[i].str.length) {
+        while (i !== end && matchIdx >= iIndex + textContentItemsStr[i].length) {
-          iIndex += bidiTexts[i].str.length;
+          iIndex += textContentItemsStr[i].length;
           i++;
         }
-        if (i === bidiTexts.length) {
+        if (i === textContentItemsStr.length) {
           console.error('Could not find a matching mapping');
         }
         var match = {
@@ -117,8 +126,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
         } else {
           matchIdx += queryLen;
         }
-        while (i !== end && matchIdx > iIndex + bidiTexts[i].str.length) {
+        while (i !== end && matchIdx > iIndex + textContentItemsStr[i].length) {
-          iIndex += bidiTexts[i].str.length;
+          iIndex += textContentItemsStr[i].length;
           i++;
         }
         match.end = {
@@ -133,7 +142,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       if (matches.length === 0) {
         return;
       }
-      var bidiTexts = this.textContent.items;
+      var textContentItemsStr = this.textContentItemsStr;
       var textDivs = this.textDivs;
       var prevEnd = null;
       var pageIdx = this.pageIdx;
@@ -151,7 +160,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       }
       function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
         var div = textDivs[divIdx];
-        var content = bidiTexts[divIdx].str.substring(fromOffset, toOffset);
+        var content = textContentItemsStr[divIdx].substring(fromOffset, toOffset);
         var node = document.createTextNode(content);
         if (className) {
           var span = document.createElement('span');
@@ -208,14 +217,14 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       }
       var matches = this.matches;
       var textDivs = this.textDivs;
-      var bidiTexts = this.textContent.items;
+      var textContentItemsStr = this.textContentItemsStr;
       var clearedUntilDivIdx = -1;
       for (var i = 0, len = matches.length; i < len; i++) {
         var match = matches[i];
         var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx);
         for (var n = begin, end = match.end.divIdx; n <= end; n++) {
           var div = textDivs[n];
-          div.textContent = bidiTexts[n].str;
+          div.textContent = textContentItemsStr[n];
           div.className = '';
         }
         clearedUntilDivIdx = match.end.divIdx + 1;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pdfjs-dist",
-  "version": "1.8.482",
+  "version": "1.8.484",
   "main": "build/pdf.js",
   "description": "Generic build of Mozilla's PDF.js library.",
   "keywords": [

web/pdf_viewer.js

@@ -1141,8 +1141,6 @@ var _pdf_rendering_queue = __w_pdfjs_require__(7);
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
-var TEXT_LAYER_RENDER_DELAY = 200;
-
 var PDFPageView = function () {
   function PDFPageView(options) {
     _classCallCheck(this, PDFPageView);
@@ -1471,10 +1469,9 @@ var PDFPageView = function () {
       var resultPromise = paintTask.promise.then(function () {
         return finishPaintTask(null).then(function () {
           if (textLayer) {
-            pdfPage.getTextContent({ normalizeWhitespace: true }).then(function textContentResolved(textContent) {
+            var readableStream = pdfPage.streamTextContent({ normalizeWhitespace: true });
-              textLayer.setTextContent(textContent);
+            textLayer.setTextContentStream(readableStream);
-              textLayer.render(TEXT_LAYER_RENDER_DELAY);
+            textLayer.render();
-            });
           }
         });
       }, function (reason) {
@@ -1661,6 +1658,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
     this.textLayerDiv = options.textLayerDiv;
     this.eventBus = options.eventBus || (0, _dom_events.getGlobalEventBus)();
     this.textContent = null;
+    this.textContentItemsStr = [];
+    this.textContentStream = null;
     this.renderingDone = false;
     this.pageIdx = options.pageIndex;
     this.pageNumber = this.pageIdx + 1;
@@ -1689,7 +1688,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
     render: function TextLayerBuilder_render(timeout) {
       var _this = this;
 
-      if (!this.textContent || this.renderingDone) {
+      if (!(this.textContent || this.textContentStream) || this.renderingDone) {
         return;
       }
       this.cancel();
@@ -1697,9 +1696,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       var textLayerFrag = document.createDocumentFragment();
       this.textLayerRenderTask = (0, _pdfjsLib.renderTextLayer)({
         textContent: this.textContent,
+        textContentStream: this.textContentStream,
         container: textLayerFrag,
         viewport: this.viewport,
         textDivs: this.textDivs,
+        textContentItemsStr: this.textContentItemsStr,
         timeout: timeout,
         enhanceTextSelection: this.enhanceTextSelection
       });
@@ -1715,6 +1716,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
         this.textLayerRenderTask = null;
       }
     },
+    setTextContentStream: function setTextContentStream(readableStream) {
+      this.cancel();
+      this.textContentStream = readableStream;
+    },
+
     setTextContent: function TextLayerBuilder_setTextContent(textContent) {
       this.cancel();
       this.textContent = textContent;
@@ -1722,8 +1728,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
     convertMatches: function TextLayerBuilder_convertMatches(matches, matchesLength) {
       var i = 0;
       var iIndex = 0;
-      var bidiTexts = this.textContent.items;
+      var textContentItemsStr = this.textContentItemsStr;
-      var end = bidiTexts.length - 1;
+      var end = textContentItemsStr.length - 1;
       var queryLen = this.findController === null ? 0 : this.findController.state.query.length;
       var ret = [];
       if (!matches) {
@@ -1731,11 +1737,11 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       }
       for (var m = 0, len = matches.length; m < len; m++) {
         var matchIdx = matches[m];
-        while (i !== end && matchIdx >= iIndex + bidiTexts[i].str.length) {
+        while (i !== end && matchIdx >= iIndex + textContentItemsStr[i].length) {
-          iIndex += bidiTexts[i].str.length;
+          iIndex += textContentItemsStr[i].length;
           i++;
         }
-        if (i === bidiTexts.length) {
+        if (i === textContentItemsStr.length) {
           console.error('Could not find a matching mapping');
         }
         var match = {
@@ -1749,8 +1755,8 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
         } else {
           matchIdx += queryLen;
         }
-        while (i !== end && matchIdx > iIndex + bidiTexts[i].str.length) {
+        while (i !== end && matchIdx > iIndex + textContentItemsStr[i].length) {
-          iIndex += bidiTexts[i].str.length;
+          iIndex += textContentItemsStr[i].length;
           i++;
         }
         match.end = {
@@ -1765,7 +1771,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       if (matches.length === 0) {
         return;
       }
-      var bidiTexts = this.textContent.items;
+      var textContentItemsStr = this.textContentItemsStr;
       var textDivs = this.textDivs;
       var prevEnd = null;
       var pageIdx = this.pageIdx;
@@ -1783,7 +1789,7 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       }
       function appendTextToDiv(divIdx, fromOffset, toOffset, className) {
         var div = textDivs[divIdx];
-        var content = bidiTexts[divIdx].str.substring(fromOffset, toOffset);
+        var content = textContentItemsStr[divIdx].substring(fromOffset, toOffset);
         var node = document.createTextNode(content);
         if (className) {
           var span = document.createElement('span');
@@ -1840,14 +1846,14 @@ var TextLayerBuilder = function TextLayerBuilderClosure() {
       }
       var matches = this.matches;
       var textDivs = this.textDivs;
-      var bidiTexts = this.textContent.items;
+      var textContentItemsStr = this.textContentItemsStr;
       var clearedUntilDivIdx = -1;
       for (var i = 0, len = matches.length; i < len; i++) {
         var match = matches[i];
         var begin = Math.max(clearedUntilDivIdx, match.begin.divIdx);
         for (var n = begin, end = match.end.divIdx; n <= end; n++) {
           var div = textDivs[n];
-          div.textContent = bidiTexts[n].str;
+          div.textContent = textContentItemsStr[n];
           div.className = '';
         }
         clearedUntilDivIdx = match.end.divIdx + 1;