akira
/
pdfjs-dist
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #4770 from yurydelendik/promise-operationlist 

Adds Promises to getOperatorList
Jonas Jenwald 11 years ago
parent
09b24d5231 88aa396aca
commit
7079992d89
6 changed files with 600 additions and 479 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 33
      src/core/core.js
  2. 237
      src/core/evaluator.js
  3. 12
      src/core/obj.js
  4. 3
      src/core/worker.js
  5. 26
      src/shared/annotation.js
  6. 64
      test/unit/evaluator_spec.js

33
src/core/core.js
Unescape View File

@ -156,13 +156,6 @@ var Page = (function PageClosure() {
getOperatorList: function Page_getOperatorList(handler, intent) { getOperatorList: function Page_getOperatorList(handler, intent) {
var self = this; var self = this;
var capability = createPromiseCapability();
function reject(e) {
capability.reject(e);
}
var pageListCapability = createPromiseCapability();
var pdfManager = this.pdfManager; var pdfManager = this.pdfManager;
var contentStreamPromise = pdfManager.ensure(this, 'getContentStream', var contentStreamPromise = pdfManager.ensure(this, 'getContentStream',
@ -184,9 +177,8 @@ var Page = (function PageClosure() {
this.idCounters, this.idCounters,
this.fontCache); this.fontCache);
var dataPromises = Promise.all([contentStreamPromise, resourcesPromise], var dataPromises = Promise.all([contentStreamPromise, resourcesPromise]);
reject); var pageListPromise = dataPromises.then(function(data) {
dataPromises.then(function(data) {
var contentStream = data[0]; var contentStream = data[0];
var opList = new OperatorList(intent, handler, self.pageIndex); var opList = new OperatorList(intent, handler, self.pageIndex);
@ -195,31 +187,30 @@ var Page = (function PageClosure() {
pageIndex: self.pageIndex, pageIndex: self.pageIndex,
intent: intent intent: intent
}); });
partialEvaluator.getOperatorList(contentStream, self.resources, opList); return partialEvaluator.getOperatorList(contentStream, self.resources,
pageListCapability.resolve(opList); opList).then(function () {
return opList;
});
}); });
var annotationsPromise = pdfManager.ensure(this, 'annotations'); var annotationsPromise = pdfManager.ensure(this, 'annotations');
Promise.all([pageListCapability.promise, annotationsPromise]).then( return Promise.all([pageListPromise, annotationsPromise]).then(
function(datas) { function(datas) {
var pageOpList = datas[0]; var pageOpList = datas[0];
var annotations = datas[1]; var annotations = datas[1];
if (annotations.length === 0) { if (annotations.length === 0) {
pageOpList.flush(true); pageOpList.flush(true);
capability.resolve(pageOpList); return pageOpList;
return;
} }
var annotationsReadyPromise = Annotation.appendToOperatorList( var annotationsReadyPromise = Annotation.appendToOperatorList(
annotations, pageOpList, pdfManager, partialEvaluator, intent); annotations, pageOpList, pdfManager, partialEvaluator, intent);
annotationsReadyPromise.then(function () { return annotationsReadyPromise.then(function () {
pageOpList.flush(true); pageOpList.flush(true);
capability.resolve(pageOpList); return pageOpList;
}, reject); });
}, reject); });
return capability.promise;
}, },
extractTextContent: function Page_extractTextContent() { extractTextContent: function Page_extractTextContent() {

237
src/core/evaluator.js
Unescape View File

@ -22,7 +22,7 @@
stdFontMap, symbolsFonts, getTilingPatternIR, warn, Util, Promise, stdFontMap, symbolsFonts, getTilingPatternIR, warn, Util, Promise,
RefSetCache, isRef, TextRenderingMode, CMapFactory, OPS, RefSetCache, isRef, TextRenderingMode, CMapFactory, OPS,
UNSUPPORTED_FEATURES, UnsupportedManager, NormalizedUnicodes, UNSUPPORTED_FEATURES, UnsupportedManager, NormalizedUnicodes,
IDENTITY_MATRIX, reverseIfRtl */ IDENTITY_MATRIX, reverseIfRtl, createPromiseCapability */
'use strict'; 'use strict';
@ -38,6 +38,28 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
this.fontCache = fontCache; this.fontCache = fontCache;
} }
// Trying to minimize Date.now() usage and check every 100 time
var TIME_SLOT_DURATION_MS = 20;
var CHECK_TIME_EVERY = 100;
function TimeSlotManager() {
this.reset();
}
TimeSlotManager.prototype = {
check: function TimeSlotManager_check() {
if (++this.checked < CHECK_TIME_EVERY) {
return false;
}
this.checked = 0;
return this.endTime <= Date.now();
},
reset: function TimeSlotManager_reset() {
this.endTime = Date.now() + TIME_SLOT_DURATION_MS;
this.checked = 0;
}
};
var deferred = Promise.resolve();
var TILING_PATTERN = 1, SHADING_PATTERN = 2; var TILING_PATTERN = 1, SHADING_PATTERN = 2;
PartialEvaluator.prototype = { PartialEvaluator.prototype = {
@ -121,13 +143,15 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
operatorList.addOp(OPS.paintFormXObjectBegin, [matrix, bbox]); operatorList.addOp(OPS.paintFormXObjectBegin, [matrix, bbox]);
this.getOperatorList(xobj, (xobj.dict.get('Resources') || resources), return this.getOperatorList(xobj,
operatorList, initialState); (xobj.dict.get('Resources') || resources), operatorList, initialState).
then(function () {
operatorList.addOp(OPS.paintFormXObjectEnd, []); operatorList.addOp(OPS.paintFormXObjectEnd, []);
if (group) { if (group) {
operatorList.addOp(OPS.endGroup, [groupOptions]); operatorList.addOp(OPS.endGroup, [groupOptions]);
} }
});
}, },
buildPaintImageXObject: buildPaintImageXObject:
@ -236,7 +260,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
subtype: smask.get('S').name, subtype: smask.get('S').name,
backdrop: smask.get('BC') backdrop: smask.get('BC')
}; };
this.buildFormXObject(resources, smaskContent, smaskOptions, return this.buildFormXObject(resources, smaskContent, smaskOptions,
operatorList, stateManager.state.clone()); operatorList, stateManager.state.clone());
}, },
@ -245,15 +269,18 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
pattern, patternDict, pattern, patternDict,
operatorList) { operatorList) {
// Create an IR of the pattern code. // Create an IR of the pattern code.
var tilingOpList = this.getOperatorList(pattern, var tilingOpList = new OperatorList();
(patternDict.get('Resources') || resources)); return this.getOperatorList(pattern,
// Add the dependencies to the parent operator list so they are resolved (patternDict.get('Resources') || resources), tilingOpList).
// before sub operator list is executed synchronously. then(function () {
// Add the dependencies to the parent operator list so they are
// resolved before sub operator list is executed synchronously.
operatorList.addDependencies(tilingOpList.dependencies); operatorList.addDependencies(tilingOpList.dependencies);
operatorList.addOp(fn, getTilingPatternIR({ operatorList.addOp(fn, getTilingPatternIR({
fnArray: tilingOpList.fnArray, fnArray: tilingOpList.fnArray,
argsArray: tilingOpList.argsArray argsArray: tilingOpList.argsArray
}, patternDict, args)); }, patternDict, args));
});
}, },
handleSetFont: handleSetFont:
@ -266,8 +293,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
fontName = fontArgs[0].name; fontName = fontArgs[0].name;
} }
var self = this; var self = this;
var font = this.loadFont(fontName, fontRef, this.xref, resources, return this.loadFont(fontName, fontRef, this.xref, resources,
operatorList); operatorList).then(function (font) {
state.font = font; state.font = font;
var loadedName = font.loadedName; var loadedName = font.loadedName;
if (!font.sent) { if (!font.sent) {
@ -282,6 +309,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
return loadedName; return loadedName;
});
}, },
handleText: function PartialEvaluator_handleText(chars, state) { handleText: function PartialEvaluator_handleText(chars, state) {
@ -324,7 +352,6 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
operatorList, xref, operatorList, xref,
stateManager) { stateManager) {
var self = this;
// TODO(mack): This should be rewritten so that this function returns // TODO(mack): This should be rewritten so that this function returns
// what should be added to the queue during each iteration // what should be added to the queue during each iteration
function setGStateForKey(gStateObj, key, value) { function setGStateForKey(gStateObj, key, value) {
@ -343,11 +370,14 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
gStateObj.push([key, value]); gStateObj.push([key, value]);
break; break;
case 'Font': case 'Font':
var loadedName = self.handleSetFont(resources, null, value[0], promise = promise.then(function () {
operatorList, return self.handleSetFont(resources, null, value[0],
stateManager.state); operatorList, stateManager.state).
then(function (loadedName) {
operatorList.addDependency(loadedName); operatorList.addDependency(loadedName);
gStateObj.push([key, [loadedName, value[1]]]); gStateObj.push([key, [loadedName, value[1]]]);
});
});
break; break;
case 'BM': case 'BM':
gStateObj.push([key, value]); gStateObj.push([key, value]);
@ -359,7 +389,10 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
var dict = xref.fetchIfRef(value); var dict = xref.fetchIfRef(value);
if (isDict(dict)) { if (isDict(dict)) {
self.handleSMask(dict, resources, operatorList, stateManager); promise = promise.then(function () {
return self.handleSMask(dict, resources, operatorList,
stateManager);
});
gStateObj.push([key, true]); gStateObj.push([key, true]);
} else { } else {
warn('Unsupported SMask type'); warn('Unsupported SMask type');
@ -394,12 +427,15 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
// This array holds the converted/processed state data. // This array holds the converted/processed state data.
var gStateObj = []; var gStateObj = [];
var gStateMap = gState.map; var gStateMap = gState.map;
var self = this;
var promise = Promise.resolve();
for (var key in gStateMap) { for (var key in gStateMap) {
var value = gStateMap[key]; var value = gStateMap[key];
setGStateForKey(gStateObj, key, value); setGStateForKey(gStateObj, key, value);
} }
return promise.then(function () {
operatorList.addOp(OPS.setGState, [gStateObj]); operatorList.addOp(OPS.setGState, [gStateObj]);
});
}, },
loadFont: function PartialEvaluator_loadFont(fontName, font, xref, loadFont: function PartialEvaluator_loadFont(fontName, font, xref,
@ -407,10 +443,10 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
parentOperatorList) { parentOperatorList) {
function errorFont() { function errorFont() {
return { return Promise.resolve({
translated: new ErrorFont('Font ' + fontName + ' is not available'), translated: new ErrorFont('Font ' + fontName + ' is not available'),
loadedName: 'g_font_error' loadedName: 'g_font_error'
}; });
} }
var fontRef; var fontRef;
@ -435,6 +471,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
return errorFont(); return errorFont();
} }
var fontCapability = createPromiseCapability();
var preEvaluatedFont = this.preEvaluateFont(font, xref); var preEvaluatedFont = this.preEvaluateFont(font, xref);
var descriptor = preEvaluatedFont.descriptor; var descriptor = preEvaluatedFont.descriptor;
var fontID = fontRef.num + '_' + fontRef.gen; var fontID = fontRef.num + '_' + fontRef.gen;
@ -471,7 +509,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
// fontName in font.loadedName below. // fontName in font.loadedName below.
var fontRefIsDict = isDict(fontRef); var fontRefIsDict = isDict(fontRef);
if (!fontRefIsDict) { if (!fontRefIsDict) {
this.fontCache.put(fontRef, font); this.fontCache.put(fontRef, fontCapability.promise);
} }
// Keep track of each font we translated so the caller can // Keep track of each font we translated so the caller can
@ -490,27 +528,38 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
font.translated = translated; font.translated = translated;
} }
var loadCharProcsPromise = Promise.resolve();
if (font.translated.loadCharProcs) { if (font.translated.loadCharProcs) {
var charProcs = font.get('CharProcs').getAll(); var charProcs = font.get('CharProcs').getAll();
var fontResources = (font.get('Resources') || resources); var fontResources = (font.get('Resources') || resources);
var charProcKeys = Object.keys(charProcs); var charProcKeys = Object.keys(charProcs);
var charProcOperatorList = {}; var charProcOperatorList = {};
for (var i = 0, n = charProcKeys.length; i < n; ++i) { for (var i = 0, n = charProcKeys.length; i < n; ++i) {
var key = charProcKeys[i]; loadCharProcsPromise = loadCharProcsPromise.then(function (key) {
var glyphStream = charProcs[key]; var glyphStream = charProcs[key];
var operatorList = this.getOperatorList(glyphStream, fontResources); var operatorList = new OperatorList();
return this.getOperatorList(glyphStream, fontResources,
operatorList).
then(function () {
charProcOperatorList[key] = operatorList.getIR(); charProcOperatorList[key] = operatorList.getIR();
if (!parentOperatorList) {
continue;
}
// Add the dependencies to the parent operator list so they are // Add the dependencies to the parent operator list so they are
// resolved before sub operator list is executed synchronously. // resolved before sub operator list is executed synchronously.
parentOperatorList.addDependencies(charProcOperatorList.dependencies); if (parentOperatorList) {
parentOperatorList.addDependencies(operatorList.dependencies);
}
});
}.bind(this, charProcKeys[i]));
} }
loadCharProcsPromise = loadCharProcsPromise.then(function () {
font.translated.charProcOperatorList = charProcOperatorList; font.translated.charProcOperatorList = charProcOperatorList;
});
} }
return loadCharProcsPromise.then(function () {
font.loaded = true; font.loaded = true;
return font; fontCapability.resolve(font);
return fontCapability.promise;
}, fontCapability.reject);
}, },
buildPath: function PartialEvaluator_buildPath(operatorList, fn, args) { buildPath: function PartialEvaluator_buildPath(operatorList, fn, args) {
@ -534,19 +583,23 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var xref = this.xref; var xref = this.xref;
var imageCache = {}; var imageCache = {};
operatorList = (operatorList || new OperatorList()); assert(operatorList);
resources = (resources || Dict.empty); resources = (resources || Dict.empty);
var xobjs = (resources.get('XObject') || Dict.empty); var xobjs = (resources.get('XObject') || Dict.empty);
var patterns = (resources.get('Pattern') || Dict.empty); var patterns = (resources.get('Pattern') || Dict.empty);
var stateManager = new StateManager(initialState || new EvalState()); var stateManager = new StateManager(initialState || new EvalState());
var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager); var preprocessor = new EvaluatorPreprocessor(stream, xref, stateManager);
var shading;
var timeSlotManager = new TimeSlotManager();
var operation, i, ii; return new Promise(function next(resolve, reject) {
while ((operation = preprocessor.read())) { timeSlotManager.reset();
var stop, operation, i, ii;
while (!(stop = timeSlotManager.check()) &&
(operation = preprocessor.read())) {
var args = operation.args; var args = operation.args;
var fn = operation.fn; var fn = operation.fn;
var shading;
switch (fn | 0) { switch (fn | 0) {
case OPS.setStrokeColorN: case OPS.setStrokeColorN:
@ -564,10 +617,11 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var typeNum = dict.get('PatternType'); var typeNum = dict.get('PatternType');
if (typeNum == TILING_PATTERN) { if (typeNum == TILING_PATTERN) {
self.handleTilingType(fn, args, resources, pattern, dict, return self.handleTilingType(fn, args, resources, pattern,
operatorList); dict, operatorList).then(
args = []; function() {
continue; next(resolve, reject);
}, reject);
} else if (typeNum == SHADING_PATTERN) { } else if (typeNum == SHADING_PATTERN) {
shading = dict.get('Shading'); shading = dict.get('Shading');
var matrix = dict.get('Matrix'); var matrix = dict.get('Matrix');
@ -575,7 +629,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
resources); resources);
args = pattern.getIR(); args = pattern.getIR();
} else { } else {
error('Unkown PatternType ' + typeNum); error('Unknown PatternType ' + typeNum);
} }
} }
break; break;
@ -601,11 +655,13 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
if ('Form' == type.name) { if ('Form' == type.name) {
stateManager.save(); stateManager.save();
self.buildFormXObject(resources, xobj, null, operatorList, return self.buildFormXObject(resources, xobj, null,
stateManager.state.clone()); operatorList,
args = []; stateManager.state.clone()).
then(function () {
stateManager.restore(); stateManager.restore();
continue; next(resolve, reject);
}, reject);
} else if ('Image' == type.name) { } else if ('Image' == type.name) {
self.buildPaintImageXObject(resources, xobj, false, self.buildPaintImageXObject(resources, xobj, false,
operatorList, name, imageCache); operatorList, name, imageCache);
@ -617,13 +673,15 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
break; break;
case OPS.setFont: case OPS.setFont:
var fontSize = args[1];
// eagerly collect all fonts // eagerly collect all fonts
var loadedName = self.handleSetFont(resources, args, null, return self.handleSetFont(resources, args, null,
operatorList, operatorList, stateManager.state).
stateManager.state); then(function (loadedName) {
operatorList.addDependency(loadedName); operatorList.addDependency(loadedName);
args[0] = loadedName; operatorList.addOp(OPS.setFont, [loadedName, fontSize]);
break; next(resolve, reject);
}, reject);
case OPS.endInlineImage: case OPS.endInlineImage:
var cacheKey = args[0].cacheKey; var cacheKey = args[0].cacheKey;
if (cacheKey && imageCache.key === cacheKey) { if (cacheKey && imageCache.key === cacheKey) {
@ -636,22 +694,22 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
args = []; args = [];
continue; continue;
case OPS.showText: case OPS.showText:
args[0] = this.handleText(args[0], stateManager.state); args[0] = self.handleText(args[0], stateManager.state);
break; break;
case OPS.showSpacedText: case OPS.showSpacedText:
var arr = args[0]; var arr = args[0];
var arrLength = arr.length; var arrLength = arr.length;
for (i = 0; i < arrLength; ++i) { for (i = 0; i < arrLength; ++i) {
if (isString(arr[i])) { if (isString(arr[i])) {
arr[i] = this.handleText(arr[i], stateManager.state); arr[i] = self.handleText(arr[i], stateManager.state);
} }
} }
break; break;
case OPS.nextLineShowText: case OPS.nextLineShowText:
args[0] = this.handleText(args[0], stateManager.state); args[0] = self.handleText(args[0], stateManager.state);
break; break;
case OPS.nextLineSetSpacingShowText: case OPS.nextLineSetSpacingShowText:
args[2] = this.handleText(args[2], stateManager.state); args[2] = self.handleText(args[2], stateManager.state);
break; break;
case OPS.setTextRenderingMode: case OPS.setTextRenderingMode:
stateManager.state.textRenderingMode = args[0]; stateManager.state.textRenderingMode = args[0];
@ -687,10 +745,10 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
var gState = extGState.get(dictName.name); var gState = extGState.get(dictName.name);
self.setGState(resources, gState, operatorList, xref, return self.setGState(resources, gState, operatorList, xref,
stateManager); stateManager).then(function() {
args = []; next(resolve, reject);
continue; }, reject);
case OPS.moveTo: case OPS.moveTo:
case OPS.lineTo: case OPS.lineTo:
case OPS.curveTo: case OPS.curveTo:
@ -702,14 +760,19 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
operatorList.addOp(fn, args); operatorList.addOp(fn, args);
} }
if (stop) {
deferred.then(function () {
next(resolve, reject);
});
return;
}
// Some PDFs don't close all restores inside object/form. // Some PDFs don't close all restores inside object/form.
// Closing those for them. // Closing those for them.
for (i = 0, ii = preprocessor.savedStatesDepth; i < ii; i++) { for (i = 0, ii = preprocessor.savedStatesDepth; i < ii; i++) {
operatorList.addOp(OPS.restore, []); operatorList.addOp(OPS.restore, []);
} }
resolve();
return operatorList; });
}, },
getTextContent: function PartialEvaluator_getTextContent(stream, resources, getTextContent: function PartialEvaluator_getTextContent(stream, resources,
@ -767,10 +830,13 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
function handleSetFont(fontName, fontRef) { function handleSetFont(fontName, fontRef) {
var font = textState.font = self.loadFont(fontName, fontRef, xref, return self.loadFont(fontName, fontRef, xref, resources, null).
resources, null).translated; then(function (font) {
textState.fontMatrix = font.fontMatrix ? font.fontMatrix : var fontTranslated = textState.font = font.translated;
textState.fontMatrix = fontTranslated.fontMatrix ?
fontTranslated.fontMatrix :
FONT_IDENTITY_MATRIX; FONT_IDENTITY_MATRIX;
});
} }
function buildTextGeometry(chars, textChunk) { function buildTextGeometry(chars, textChunk) {
@ -865,15 +931,22 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
return textChunk; return textChunk;
} }
while ((operation = preprocessor.read())) { var timeSlotManager = new TimeSlotManager();
return new Promise(function next(resolve, reject) {
timeSlotManager.reset();
var stop;
while (!(stop = timeSlotManager.check()) &&
(operation = preprocessor.read())) {
textState = stateManager.state; textState = stateManager.state;
var fn = operation.fn; var fn = operation.fn;
var args = operation.args; var args = operation.args;
switch (fn | 0) { switch (fn | 0) {
case OPS.setFont: case OPS.setFont:
handleSetFont(args[0].name);
textState.fontSize = args[1]; textState.fontSize = args[1];
break; return handleSetFont(args[0].name).then(function() {
next(resolve, reject);
}, reject);
case OPS.setTextRise: case OPS.setTextRise:
textState.textRise = args[0]; textState.textRise = args[0];
break; break;
@ -926,7 +999,8 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
textState.translateTextMatrix(offset, 0); textState.translateTextMatrix(offset, 0);
textChunk.width += offset; textChunk.width += offset;
} else { } else {
offset = -val * textState.fontSize * textState.textMatrix[3]; offset = -val * textState.fontSize *
textState.textMatrix[3];
textState.translateTextMatrix(0, offset); textState.translateTextMatrix(0, offset);
textChunk.height += offset; textChunk.height += offset;
} }
@ -998,18 +1072,18 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
stateManager.transform(matrix); stateManager.transform(matrix);
} }
var formTextContent = this.getTextContent( return self.getTextContent(xobj,
xobj, xobj.dict.get('Resources') || resources, stateManager).
xobj.dict.get('Resources') || resources, then(function (formTextContent) {
stateManager
);
Util.concatenateToArray(bidiTexts, formTextContent.items); Util.concatenateToArray(bidiTexts, formTextContent.items);
Util.extendObj(textContent.styles, formTextContent.styles); Util.extendObj(textContent.styles, formTextContent.styles);
stateManager.restore(); stateManager.restore();
xobjsCache.key = name; xobjsCache.key = name;
xobjsCache.texts = formTextContent; xobjsCache.texts = formTextContent;
break;
next(resolve, reject);
}, reject);
case OPS.setGState: case OPS.setGState:
var dictName = args[0]; var dictName = args[0];
var extGState = resources.get('ExtGState'); var extGState = resources.get('ExtGState');
@ -1018,18 +1092,31 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
break; break;
} }
var gsState = extGState.get(dictName.name); var gsStateMap = extGState.get(dictName.name);
var gsStateFont = null;
for (var i = 0; i < gsState.length; i++) { for (var key in gsStateMap) {
if (gsState[i] === 'Font') { if (key === 'Font') {
handleSetFont(args[0].name); assert(!gsStateFont);
gsStateFont = gsStateMap[key];
}
} }
if (gsStateFont) {
textState.fontSize = gsStateFont[1];
return handleSetFont(gsStateFont[0]).then(function() {
next(resolve, reject);
}, reject);
} }
break; break;
} // switch } // switch
} // while } // while
if (stop) {
return textContent; deferred.then(function () {
next(resolve, reject);
});
return;
}
resolve(textContent);
});
}, },
extractDataStructures: function extractDataStructures: function

12
src/core/obj.js
Unescape View File

@ -507,11 +507,17 @@ var Catalog = (function CatalogClosure() {
}, },
cleanup: function Catalog_cleanup() { cleanup: function Catalog_cleanup() {
this.fontCache.forEach(function (font) { var promises = [];
delete font.sent; this.fontCache.forEach(function (promise) {
delete font.translated; promises.push(promise);
}); });
return Promise.all(promises).then(function (fonts) {
for (var i = 0, ii = fonts.length; i < ii; i++) {
delete fonts[i].sent;
delete fonts[i].translated;
}
this.fontCache.clear(); this.fontCache.clear();
}.bind(this));
}, },
getPage: function Catalog_getPage(pageIndex) { getPage: function Catalog_getPage(pageIndex) {

3
src/core/worker.js
Unescape View File

@ -387,8 +387,7 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
}); });
handler.on('Cleanup', function wphCleanup(data) { handler.on('Cleanup', function wphCleanup(data) {
pdfManager.cleanup(); return pdfManager.cleanup();
return true;
}); });
handler.on('Terminate', function wphTerminate(data) { handler.on('Terminate', function wphTerminate(data) {

26
src/shared/annotation.js
Unescape View File

@ -219,11 +219,9 @@ var Annotation = (function AnnotationClosure() {
}, },
getOperatorList: function Annotation_getOperatorList(evaluator) { getOperatorList: function Annotation_getOperatorList(evaluator) {
var capability = createPromiseCapability();
if (!this.appearance) { if (!this.appearance) {
capability.resolve(new OperatorList()); return Promise.resolve(new OperatorList());
return capability.promise;
} }
var data = this.data; var data = this.data;
@ -242,18 +240,18 @@ var Annotation = (function AnnotationClosure() {
var bbox = appearanceDict.get('BBox') || [0, 0, 1, 1]; var bbox = appearanceDict.get('BBox') || [0, 0, 1, 1];
var matrix = appearanceDict.get('Matrix') || [1, 0, 0, 1, 0 ,0]; var matrix = appearanceDict.get('Matrix') || [1, 0, 0, 1, 0 ,0];
var transform = getTransformMatrix(data.rect, bbox, matrix); var transform = getTransformMatrix(data.rect, bbox, matrix);
var self = this;
resourcesPromise.then(function(resources) { return resourcesPromise.then(function(resources) {
var opList = new OperatorList(); var opList = new OperatorList();
opList.addOp(OPS.beginAnnotation, [data.rect, transform, matrix]); opList.addOp(OPS.beginAnnotation, [data.rect, transform, matrix]);
evaluator.getOperatorList(this.appearance, resources, opList); return evaluator.getOperatorList(self.appearance, resources, opList).
then(function () {
opList.addOp(OPS.endAnnotation, []); opList.addOp(OPS.endAnnotation, []);
capability.resolve(opList); self.appearance.reset();
return opList;
this.appearance.reset(); });
}.bind(this), capability.reject); });
return capability.promise;
} }
}; };
@ -512,8 +510,10 @@ var TextWidgetAnnotation = (function TextWidgetAnnotationClosure() {
} }
var stream = new Stream(stringToBytes(data.defaultAppearance)); var stream = new Stream(stringToBytes(data.defaultAppearance));
evaluator.getOperatorList(stream, this.fieldResources, opList); return evaluator.getOperatorList(stream, this.fieldResources, opList).
return Promise.resolve(opList); then(function () {
return opList;
});
} }
}); });

64
test/unit/evaluator_spec.js
Unescape View File

@ -1,6 +1,7 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */ /* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
/* globals expect, it, describe, PartialEvaluator, StringStream, OPS */ /* globals expect, it, describe, PartialEvaluator, StringStream, OPS,
OperatorList, waitsFor, runs */
'use strict'; 'use strict';
@ -30,29 +31,48 @@ describe('evaluator', function() {
function PdfManagerMock() { } function PdfManagerMock() { }
function runOperatorListCheck(evaluator, stream, resources, check) {
var done = false;
runs(function () {
var result = new OperatorList();
evaluator.getOperatorList(stream, resources, result).then(function () {
check(result);
done = true;
});
});
waitsFor(function () {
return done;
});
}
describe('splitCombinedOperations', function() { describe('splitCombinedOperations', function() {
it('should reject unknown operations', function() { it('should reject unknown operations', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('fTT'); var stream = new StringStream('fTT');
var result = evaluator.getOperatorList(stream, new ResourcesMock());
runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function(result) {
expect(!!result.fnArray && !!result.argsArray).toEqual(true); expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(1); expect(result.fnArray.length).toEqual(1);
expect(result.fnArray[0]).toEqual(OPS.fill); expect(result.fnArray[0]).toEqual(OPS.fill);
expect(result.argsArray[0].length).toEqual(0); expect(result.argsArray[0].length).toEqual(0);
}); });
});
it('should handle one operations', function() { it('should handle one operations', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('Q'); var stream = new StringStream('Q');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function(result) {
expect(!!result.fnArray && !!result.argsArray).toEqual(true); expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(1); expect(result.fnArray.length).toEqual(1);
expect(result.fnArray[0]).toEqual(OPS.restore); expect(result.fnArray[0]).toEqual(OPS.restore);
}); });
});
it('should handle two glued operations', function() { it('should handle two glued operations', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
@ -61,25 +81,28 @@ describe('evaluator', function() {
var resources = new ResourcesMock(); var resources = new ResourcesMock();
resources.Res1 = {}; resources.Res1 = {};
var stream = new StringStream('/Res1 DoQ'); var stream = new StringStream('/Res1 DoQ');
var result = evaluator.getOperatorList(stream, resources); runOperatorListCheck(evaluator, stream, resources, function (result) {
expect(!!result.fnArray && !!result.argsArray).toEqual(true); expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(2); expect(result.fnArray.length).toEqual(2);
expect(result.fnArray[0]).toEqual(OPS.paintXObject); expect(result.fnArray[0]).toEqual(OPS.paintXObject);
expect(result.fnArray[1]).toEqual(OPS.restore); expect(result.fnArray[1]).toEqual(OPS.restore);
}); });
});
it('should handle tree glued operations', function() { it('should handle tree glued operations', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('fff'); var stream = new StringStream('fff');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function (result) {
expect(!!result.fnArray && !!result.argsArray).toEqual(true); expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(3); expect(result.fnArray.length).toEqual(3);
expect(result.fnArray[0]).toEqual(OPS.fill); expect(result.fnArray[0]).toEqual(OPS.fill);
expect(result.fnArray[1]).toEqual(OPS.fill); expect(result.fnArray[1]).toEqual(OPS.fill);
expect(result.fnArray[2]).toEqual(OPS.fill); expect(result.fnArray[2]).toEqual(OPS.fill);
}); });
});
it('should handle three glued operations #2', function() { it('should handle three glued operations #2', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
@ -88,20 +111,22 @@ describe('evaluator', function() {
var resources = new ResourcesMock(); var resources = new ResourcesMock();
resources.Res1 = {}; resources.Res1 = {};
var stream = new StringStream('B*Bf*'); var stream = new StringStream('B*Bf*');
var result = evaluator.getOperatorList(stream, resources); runOperatorListCheck(evaluator, stream, resources, function (result) {
expect(!!result.fnArray && !!result.argsArray).toEqual(true); expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(3); expect(result.fnArray.length).toEqual(3);
expect(result.fnArray[0]).toEqual(OPS.eoFillStroke); expect(result.fnArray[0]).toEqual(OPS.eoFillStroke);
expect(result.fnArray[1]).toEqual(OPS.fillStroke); expect(result.fnArray[1]).toEqual(OPS.fillStroke);
expect(result.fnArray[2]).toEqual(OPS.eoFill); expect(result.fnArray[2]).toEqual(OPS.eoFill);
}); });
});
it('should handle glued operations and operands', function() { it('should handle glued operations and operands', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('f5 Ts'); var stream = new StringStream('f5 Ts');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function (result) {
expect(!!result.fnArray && !!result.argsArray).toEqual(true); expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(2); expect(result.fnArray.length).toEqual(2);
expect(result.fnArray[0]).toEqual(OPS.fill); expect(result.fnArray[0]).toEqual(OPS.fill);
@ -110,13 +135,15 @@ describe('evaluator', function() {
expect(result.argsArray[1].length).toEqual(1); expect(result.argsArray[1].length).toEqual(1);
expect(result.argsArray[1][0]).toEqual(5); expect(result.argsArray[1][0]).toEqual(5);
}); });
});
it('should handle glued operations and literals', function() { it('should handle glued operations and literals', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('trueifalserinulln'); var stream = new StringStream('trueifalserinulln');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function (result) {
expect(!!result.fnArray && !!result.argsArray).toEqual(true); expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(3); expect(result.fnArray.length).toEqual(3);
expect(result.fnArray[0]).toEqual(OPS.setFlatness); expect(result.fnArray[0]).toEqual(OPS.setFlatness);
@ -130,6 +157,7 @@ describe('evaluator', function() {
expect(result.argsArray[2].length).toEqual(0); expect(result.argsArray[2].length).toEqual(0);
}); });
}); });
});
describe('validateNumberOfArgs', function() { describe('validateNumberOfArgs', function() {
it('should execute if correct number of arguments', function() { it('should execute if correct number of arguments', function() {
@ -138,27 +166,32 @@ describe('evaluator', function() {
'prefix'); 'prefix');
var stream = new StringStream('5 1 d0'); var stream = new StringStream('5 1 d0');
console.log('here!'); console.log('here!');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function (result) {
expect(result.argsArray[0][0]).toEqual(5); expect(result.argsArray[0][0]).toEqual(5);
expect(result.argsArray[0][1]).toEqual(1); expect(result.argsArray[0][1]).toEqual(1);
expect(result.fnArray[0]).toEqual(OPS.setCharWidth); expect(result.fnArray[0]).toEqual(OPS.setCharWidth);
}); });
});
it('should execute if too many arguments', function() { it('should execute if too many arguments', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('5 1 4 d0'); var stream = new StringStream('5 1 4 d0');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function (result) {
expect(result.argsArray[0][0]).toEqual(1); expect(result.argsArray[0][0]).toEqual(1);
expect(result.argsArray[0][1]).toEqual(4); expect(result.argsArray[0][1]).toEqual(4);
expect(result.fnArray[0]).toEqual(OPS.setCharWidth); expect(result.fnArray[0]).toEqual(OPS.setCharWidth);
}); });
});
it('should execute if nested commands', function() { it('should execute if nested commands', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('/F2 /GS2 gs 5.711 Tf'); var stream = new StringStream('/F2 /GS2 gs 5.711 Tf');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function (result) {
expect(result.fnArray.length).toEqual(3); expect(result.fnArray.length).toEqual(3);
expect(result.fnArray[0]).toEqual(OPS.setGState); expect(result.fnArray[0]).toEqual(OPS.setGState);
expect(result.fnArray[1]).toEqual(OPS.dependency); expect(result.fnArray[1]).toEqual(OPS.dependency);
@ -168,21 +201,25 @@ describe('evaluator', function() {
expect(result.argsArray[1].length).toEqual(1); expect(result.argsArray[1].length).toEqual(1);
expect(result.argsArray[2].length).toEqual(2); expect(result.argsArray[2].length).toEqual(2);
}); });
});
it('should skip if too few arguments', function() { it('should skip if too few arguments', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('5 d0'); var stream = new StringStream('5 d0');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function (result) {
expect(result.argsArray).toEqual([]); expect(result.argsArray).toEqual([]);
expect(result.fnArray).toEqual([]); expect(result.fnArray).toEqual([]);
}); });
});
it('should close opened saves', function() { it('should close opened saves', function() {
var evaluator = new PartialEvaluator(new PdfManagerMock(), var evaluator = new PartialEvaluator(new PdfManagerMock(),
new XrefMock(), new HandlerMock(), new XrefMock(), new HandlerMock(),
'prefix'); 'prefix');
var stream = new StringStream('qq'); var stream = new StringStream('qq');
var result = evaluator.getOperatorList(stream, new ResourcesMock()); runOperatorListCheck(evaluator, stream, new ResourcesMock(),
function (result) {
expect(!!result.fnArray && !!result.argsArray).toEqual(true); expect(!!result.fnArray && !!result.argsArray).toEqual(true);
expect(result.fnArray.length).toEqual(4); expect(result.fnArray.length).toEqual(4);
expect(result.fnArray[0]).toEqual(OPS.save); expect(result.fnArray[0]).toEqual(OPS.save);
@ -192,4 +229,5 @@ describe('evaluator', function() {
}); });
}); });
}); });
});

Write Preview
Loading…
Cancel
Save