Issue 7613, Parse AcroForm Dictionary

src/core/document.js

@@ -14,11 +14,10 @@
  */
 
 import { Catalog, ObjectLoader, XRef } from './obj';
+import { createPromiseCapability, error, info, isArrayBuffer, isNum,
+  isSpace, isString, MissingDataException, OPS, shadow, stringToBytes,
+  stringToPDFString, Util, warn } from '../shared/util';
 import { Dict, isDict, isName, isStream } from './primitives';
-import {
-  info, isArrayBuffer, isNum, isSpace, isString, MissingDataException, OPS,
-  shadow, stringToBytes, stringToPDFString, Util, warn
-} from '../shared/util';
 import { NullStream, Stream, StreamsSequenceStream } from './stream';
 import { AnnotationFactory } from './annotation';
 import { calculateMD5 } from './crypto';
@@ -241,7 +240,7 @@ var Page = (function PageClosure() {
 
       // Fetch the page's annotations and add their operator lists to the
       // page's operator list to render them.
-      var annotationsPromise = this.pdfManager.ensure(this, 'annotations');
+      var annotationsPromise = this.annotations;
       return Promise.all([pageListPromise, annotationsPromise]).then(
           function ([pageOpList, annotations]) {
         if (annotations.length === 0) {
@@ -255,7 +254,7 @@ var Page = (function PageClosure() {
         for (i = 0, ii = annotations.length; i < ii; i++) {
           if (isAnnotationRenderable(annotations[i], intent)) {
             opListPromises.push(annotations[i].getOperatorList(
-              partialEvaluator, task, renderInteractiveForms));
+              partialEvaluator, task, true));
           }
         }
 
@@ -308,29 +307,112 @@ var Page = (function PageClosure() {
     },
 
     getAnnotationsData: function Page_getAnnotationsData(intent) {
-      var annotations = this.annotations;
-      var annotationsData = [];
-      for (var i = 0, n = annotations.length; i < n; ++i) {
-        if (!intent || isAnnotationRenderable(annotations[i], intent)) {
-          annotationsData.push(annotations[i].data);
+      var annotationsPromise = this.annotations;
+      return annotationsPromise.then(function (annotations) {
+        var annotationsData = [];
+        for (var i = 0, n = annotations.length; i < n; ++i) {
+          if (!intent || isAnnotationRenderable(annotations[i], intent)) {
+            annotationsData.push(annotations[i].data);
+          }
         }
-      }
-      return annotationsData;
+        return annotationsData;
+      });
     },
 
     get annotations() {
-      var annotations = [];
+      var AnnotationWorkerTask = (function AnnotationWorkerTaskClosure() {
+        function AnnotationWorkerTask(name) {
+          this.name = name;
+          this.terminated = false;
+          this.capability = createPromiseCapability();
+        }
+
+        AnnotationWorkerTask.prototype = {
+          get finished() {
+            return this.capability.promise;
+          },
+
+          finish() {
+            this.capability.resolve();
+          },
+
+          terminate() {
+            this.terminated = true;
+          },
+
+          ensureNotTerminated() {
+            if (this.terminated) {
+              throw new Error('Annotation worker task was terminated');
+            }
+          },
+        };
+
+        return AnnotationWorkerTask;
+      })();
+
+      // create a blank annotation fonts array
+      // if it's not initialized yet
+      if (this.pdfManager && this.pdfManager.pdfDocument &&
+          this.pdfManager.pdfDocument.acroForm &&
+          !this.pdfManager.pdfDocument.acroForm.annotationFonts) {
+        this.pdfManager.pdfDocument.acroForm.annotationFonts = [];
+      }
+
+      var task = new AnnotationWorkerTask(
+        'GetAnnotationAppereances: page ' + this.pageIndex);
+
+      var handler = {};
+
+      var self = this;
+
+      handler.send = function (actionname, data) {
+        if (self.pdfManager && self.pdfManager.pdfDocument &&
+            self.pdfManager.pdfDocument.acroForm) {
+          self.pdfManager.pdfDocument.acroForm.annotationFonts.push(data);
+        }
+      };
+
+      var pageNum = this.pageIndex + 1;
+      var start = Date.now();
+
+      var partialEvaluator = new PartialEvaluator({
+        pdfManager: this.pdfManager,
+        xref: this.xref,
+        handler,
+        pageIndex: this.pageIndex,
+        idFactory: this.idFactory,
+        fontCache: this.fontCache,
+        builtInCMapCache: this.builtInCMapCache,
+        options: this.evaluatorOptions,
+      });
+
       var annotationRefs = this.getInheritedPageProp('Annots') || [];
+      var annotationsPromise = [];
       for (var i = 0, n = annotationRefs.length; i < n; ++i) {
         var annotationRef = annotationRefs[i];
-        var annotation = AnnotationFactory.create(this.xref, annotationRef,
-                                                  this.pdfManager,
-                                                  this.idFactory);
-        if (annotation) {
-          annotations.push(annotation);
-        }
+          annotationsPromise.push(AnnotationFactory.create(
+          this.xref,
+          annotationRef,
+          this.pdfManager,
+          this.idFactory,
+          partialEvaluator,
+          task
+        ));
       }
-      return shadow(this, 'annotations', annotations);
+
+      return shadow(this, 'annotations',
+        Promise.all(annotationsPromise)).then(function (annotations) {
+
+        task.finish();
+        info('page=' + pageNum + ' - annotations: time=' +
+          (Date.now() - start) +
+          'ms, len=' + annotations.length);
+
+        return annotations;
+      }, function (reason) {
+        error('page=' + pageNum + 'error: ' + reason);
+        return [];
+      });
     },
   };
 

src/core/worker.js

@@ -725,7 +725,10 @@ var WorkerMessageHandler = {
 
     handler.on('GetAnnotations', function wphSetupGetAnnotations(data) {
       return pdfManager.getPage(data.pageIndex).then(function(page) {
-        return pdfManager.ensure(page, 'getAnnotationsData', [data.intent]);
+        var annotationsDataPromise = page.getAnnotationsData(data.intent);
+        return annotationsDataPromise.then(function (annotationsData) {
+          return annotationsData;
+        });
       });
     });