[Pkg-javascript-commits] [pdf.js] 130/157: Refactor annotation code to use a factory
David Prévot
taffit at moszumanska.debian.org
Tue Aug 11 06:46:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch master
in repository pdf.js.
commit 4f920ad1000be0fdd96038e5663ce318164081c6
Author: Tim van der Meij <timvandermeij at gmail.com>
Date: Sun Jul 26 16:47:28 2015 +0200
Refactor annotation code to use a factory
Currently, `src/core/core.js` uses the `fromRef` method on an `Annotation` object to obtain the right annotation type object (such as `LinkAnnotation` or `TextAnnotation`). That method in turn uses a method `getConstructor` to find out which annotation type object must be returned.
Aside from the fact that there is currently a lot of code to achieve this, these methods should not be part of the base `Annotation` class at all. Creation of annotation object should be done by a factory (as also recommended by @yurydelendik at https://github.com/mozilla/pdf.js/pull/5218#issuecomment-52779659) that handles finding out the correct annotation type object and returning it. This patch implements this separation of concerns.
Doing this allows us to also simplify the code quite a bit and to make it more readable. Additionally, we are now able to get rid of the hardcoded array of supported annotation types. The factory takes care of checking the annotation types and falls back to returning the base annotation type (and issuing a warning, which the current code also does not do well) when an annotation type is unsupported.
I have manually tested this commit with 20 test PDFs with different annotation types, such as /Link, /Text, /Widget, /FileAttachment and /FreeText. All render identically before and after the patch, and unsupported annotation types are now properly indicated with a warning in the console.
---
src/core/annotation.js | 123 ++++++++++++++++++++-----------------------------
src/core/core.js | 9 ++--
2 files changed, 57 insertions(+), 75 deletions(-)
diff --git a/src/core/annotation.js b/src/core/annotation.js
index d5ad2e9..5844f2e 100644
--- a/src/core/annotation.js
+++ b/src/core/annotation.js
@@ -22,7 +22,54 @@
'use strict';
var DEFAULT_ICON_SIZE = 22; // px
-var SUPPORTED_TYPES = ['Link', 'Text', 'Widget'];
+
+/**
+ * @constructor
+ */
+function AnnotationFactory() {}
+AnnotationFactory.prototype = {
+ /**
+ * @param {XRef} xref
+ * @param {Object} ref
+ * @returns {Annotation}
+ */
+ create: function AnnotationFactory_create(xref, ref) {
+ var dict = xref.fetchIfRef(ref);
+ if (!isDict(dict)) {
+ return;
+ }
+
+ // Determine the annotation's subtype.
+ var subtype = dict.get('Subtype');
+ subtype = isName(subtype) ? subtype.name : '';
+
+ // Return the right annotation object based on the subtype and field type.
+ var parameters = {
+ dict: dict,
+ ref: ref
+ };
+
+ switch (subtype) {
+ case 'Link':
+ return new LinkAnnotation(parameters);
+
+ case 'Text':
+ return new TextAnnotation(parameters);
+
+ case 'Widget':
+ var fieldType = Util.getInheritableProperty(dict, 'FT');
+ if (isName(fieldType) && fieldType.name === 'Tx') {
+ return new TextWidgetAnnotation(parameters);
+ }
+ return new WidgetAnnotation(parameters);
+
+ default:
+ warn('Unimplemented annotation type "' + subtype + '", ' +
+ 'falling back to base annotation');
+ return new Annotation(parameters);
+ }
+ }
+};
var Annotation = (function AnnotationClosure() {
// 12.5.5: Algorithm: Appearance streams
@@ -193,13 +240,9 @@ var Annotation = (function AnnotationClosure() {
isInvisible: function Annotation_isInvisible() {
var data = this.data;
- if (data && SUPPORTED_TYPES.indexOf(data.subtype) !== -1) {
- return false;
- } else {
- return !!(data &&
- data.annotationFlags && // Default: not invisible
- data.annotationFlags & 0x1); // Invisible
- }
+ return !!(data &&
+ data.annotationFlags && // Default: not invisible
+ data.annotationFlags & 0x1); // Invisible
},
isViewable: function Annotation_isViewable() {
@@ -275,70 +318,6 @@ var Annotation = (function AnnotationClosure() {
}
};
- Annotation.getConstructor =
- function Annotation_getConstructor(subtype, fieldType) {
-
- if (!subtype) {
- return;
- }
-
- // TODO(mack): Implement FreeText annotations
- if (subtype === 'Link') {
- return LinkAnnotation;
- } else if (subtype === 'Text') {
- return TextAnnotation;
- } else if (subtype === 'Widget') {
- if (!fieldType) {
- return;
- }
-
- if (fieldType === 'Tx') {
- return TextWidgetAnnotation;
- } else {
- return WidgetAnnotation;
- }
- } else {
- return Annotation;
- }
- };
-
- Annotation.fromRef = function Annotation_fromRef(xref, ref) {
-
- var dict = xref.fetchIfRef(ref);
- if (!isDict(dict)) {
- return;
- }
-
- var subtype = dict.get('Subtype');
- subtype = isName(subtype) ? subtype.name : '';
- if (!subtype) {
- return;
- }
-
- var fieldType = Util.getInheritableProperty(dict, 'FT');
- fieldType = isName(fieldType) ? fieldType.name : '';
-
- var Constructor = Annotation.getConstructor(subtype, fieldType);
- if (!Constructor) {
- return;
- }
-
- var params = {
- dict: dict,
- ref: ref,
- };
-
- var annotation = new Constructor(params);
-
- if (annotation.isViewable() || annotation.isPrintable()) {
- return annotation;
- } else {
- if (SUPPORTED_TYPES.indexOf(subtype) === -1) {
- warn('unimplemented annotation type: ' + subtype);
- }
- }
- };
-
Annotation.appendToOperatorList = function Annotation_appendToOperatorList(
annotations, opList, pdfManager, partialEvaluator, intent) {
diff --git a/src/core/core.js b/src/core/core.js
index 83ab42d..21cb727 100644
--- a/src/core/core.js
+++ b/src/core/core.js
@@ -18,7 +18,8 @@
isStream, NullStream, ObjectLoader, PartialEvaluator, Promise,
OperatorList, Annotation, error, assert, XRef, isArrayBuffer, Stream,
isString, isName, info, Linearization, MissingDataException, Lexer,
- Catalog, stringToPDFString, stringToBytes, calculateMD5 */
+ Catalog, stringToPDFString, stringToBytes, calculateMD5,
+ AnnotationFactory */
'use strict';
@@ -264,10 +265,12 @@ var Page = (function PageClosure() {
get annotations() {
var annotations = [];
var annotationRefs = this.getInheritedPageProp('Annots') || [];
+ var annotationFactory = new AnnotationFactory();
for (var i = 0, n = annotationRefs.length; i < n; ++i) {
var annotationRef = annotationRefs[i];
- var annotation = Annotation.fromRef(this.xref, annotationRef);
- if (annotation) {
+ var annotation = annotationFactory.create(this.xref, annotationRef);
+ if (annotation &&
+ (annotation.isViewable() || annotation.isPrintable())) {
annotations.push(annotation);
}
}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/pdf.js.git
More information about the Pkg-javascript-commits
mailing list