Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enable the object-shorthand ESLint rule in src/shared

Browse Source 
Please see http://eslint.org/docs/rules/object-shorthand.

For the most part, these changes are of the search-and-replace kind, and the previously enabled `no-undef` rule should complement the tests in helping ensure that no stupid errors crept into to the patch.
This commit is contained in:
Jonas Jenwald 2017-04-27 12:58:44 +02:00
parent f91d01cad3
commit afc74b0178
22 changed files with 195 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/core/annotation.js
View File

@ -81,12 +81,12 @@ AnnotationFactory.prototype = /** @lends AnnotationFactory.prototype */ {
// Return the right annotation object based on the subtype and field type. // Return the right annotation object based on the subtype and field type.
var parameters = { var parameters = {
xref: xref, xref,
dict: dict, dict,
ref: isRef(ref) ? ref : null, ref: isRef(ref) ? ref : null,
subtype: subtype, subtype,
id: id, id,
pdfManager: pdfManager, pdfManager,
}; };
switch (subtype) { switch (subtype) {

2
src/core/bidi.js
View File

@ -115,7 +115,7 @@
function createBidiText(str, isLTR, vertical) { function createBidiText(str, isLTR, vertical) {
return { return {
str: str, str,
dir: (vertical ? 'ttb' : (isLTR ? 'ltr' : 'rtl')) dir: (vertical ? 'ttb' : (isLTR ? 'ltr' : 'rtl'))
}; };
} }

2
src/core/cff_parser.js
View File

@ -674,7 +674,7 @@ var CFFParser = (function CFFParserClosure() {
charStrings.set(i, new Uint8Array([14])); charStrings.set(i, new Uint8Array([14]));
} }
} }
return { charStrings: charStrings, seacs: seacs, widths: widths }; return { charStrings, seacs, widths, };
}, },
emptyPrivateDictionary: emptyPrivateDictionary:
function CFFParser_emptyPrivateDictionary(parentDict) { function CFFParser_emptyPrivateDictionary(parentDict) {

8
src/core/chunked_stream.js
View File

@ -320,7 +320,7 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
chunks.push(data); chunks.push(data);
loaded += arrayByteLength(data); loaded += arrayByteLength(data);
if (rangeReader.isStreamingSupported) { if (rangeReader.isStreamingSupported) {
manager.onProgress({loaded: loaded}); manager.onProgress({ loaded, });
} }
rangeReader.read().then(readChunk, reject); rangeReader.read().then(readChunk, reject);
return; return;
@ -338,7 +338,7 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
if (this.aborted) { if (this.aborted) {
return; // ignoring any data after abort return; // ignoring any data after abort
} }
this.onReceiveData({chunk: data, begin: begin}); this.onReceiveData({ chunk: data, begin, });
}.bind(this)); }.bind(this));
// TODO check errors // TODO check errors
}, },
@ -450,12 +450,12 @@ var ChunkedStreamManager = (function ChunkedStreamManagerClosure() {
} }
if (prevChunk >= 0 && prevChunk + 1 !== chunk) { if (prevChunk >= 0 && prevChunk + 1 !== chunk) {
groupedChunks.push({ beginChunk: beginChunk, groupedChunks.push({ beginChunk,
endChunk: prevChunk + 1 }); endChunk: prevChunk + 1 });
beginChunk = chunk; beginChunk = chunk;
} }
if (i + 1 === chunks.length) { if (i + 1 === chunks.length) {
groupedChunks.push({ beginChunk: beginChunk, groupedChunks.push({ beginChunk,
endChunk: chunk + 1 }); endChunk: chunk + 1 });
} }

56
src/core/cmap.js
View File

@ -235,18 +235,18 @@ var CMap = (function CMapClosure() {
this.builtInCMap = builtInCMap; this.builtInCMap = builtInCMap;
} }
CMap.prototype = { CMap.prototype = {
addCodespaceRange: function(n, low, high) { addCodespaceRange(n, low, high) {
this.codespaceRanges[n - 1].push(low, high); this.codespaceRanges[n - 1].push(low, high);
this.numCodespaceRanges++; this.numCodespaceRanges++;
}, },
mapCidRange: function(low, high, dstLow) { mapCidRange(low, high, dstLow) {
while (low <= high) { while (low <= high) {
this._map[low++] = dstLow++; this._map[low++] = dstLow++;
} }
}, },
mapBfRange: function(low, high, dstLow) { mapBfRange(low, high, dstLow) {
var lastByte = dstLow.length - 1; var lastByte = dstLow.length - 1;
while (low <= high) { while (low <= high) {
this._map[low++] = dstLow; this._map[low++] = dstLow;
@ -256,7 +256,7 @@ var CMap = (function CMapClosure() {
} }
}, },
mapBfRangeToArray: function(low, high, array) { mapBfRangeToArray(low, high, array) {
var i = 0, ii = array.length; var i = 0, ii = array.length;
while (low <= high && i < ii) { while (low <= high && i < ii) {
this._map[low] = array[i++]; this._map[low] = array[i++];
@ -265,19 +265,19 @@ var CMap = (function CMapClosure() {
}, },
// This is used for both bf and cid chars. // This is used for both bf and cid chars.
mapOne: function(src, dst) { mapOne(src, dst) {
this._map[src] = dst; this._map[src] = dst;
}, },
lookup: function(code) { lookup(code) {
return this._map[code]; return this._map[code];
}, },
contains: function(code) { contains(code) {
return this._map[code] !== undefined; return this._map[code] !== undefined;
}, },
forEach: function(callback) { forEach(callback) {
// Most maps have fewer than 65536 entries, and for those we use normal // Most maps have fewer than 65536 entries, and for those we use normal
// array iteration. But really sparse tables are possible -- e.g. with // array iteration. But really sparse tables are possible -- e.g. with
// indices in the *billions*. For such tables we use for..in, which isn't // indices in the *billions*. For such tables we use for..in, which isn't
@ -299,15 +299,15 @@ var CMap = (function CMapClosure() {
} }
}, },
charCodeOf: function(value) { charCodeOf(value) {
return this._map.indexOf(value); return this._map.indexOf(value);
}, },
getMap: function() { getMap() {
return this._map; return this._map;
}, },
readCharCode: function(str, offset, out) { readCharCode(str, offset, out) {
var c = 0; var c = 0;
var codespaceRanges = this.codespaceRanges; var codespaceRanges = this.codespaceRanges;
var codespaceRangesLen = this.codespaceRanges.length; var codespaceRangesLen = this.codespaceRanges.length;
@ -366,41 +366,41 @@ var IdentityCMap = (function IdentityCMapClosure() {
IdentityCMap.prototype = { IdentityCMap.prototype = {
addCodespaceRange: CMap.prototype.addCodespaceRange, addCodespaceRange: CMap.prototype.addCodespaceRange,
mapCidRange: function(low, high, dstLow) { mapCidRange(low, high, dstLow) {
error('should not call mapCidRange'); error('should not call mapCidRange');
}, },
mapBfRange: function(low, high, dstLow) { mapBfRange(low, high, dstLow) {
error('should not call mapBfRange'); error('should not call mapBfRange');
}, },
mapBfRangeToArray: function(low, high, array) { mapBfRangeToArray(low, high, array) {
error('should not call mapBfRangeToArray'); error('should not call mapBfRangeToArray');
}, },
mapOne: function(src, dst) { mapOne(src, dst) {
error('should not call mapCidOne'); error('should not call mapCidOne');
}, },
lookup: function(code) { lookup(code) {
return (isInt(code) && code <= 0xffff) ? code : undefined; return (isInt(code) && code <= 0xffff) ? code : undefined;
}, },
contains: function(code) { contains(code) {
return isInt(code) && code <= 0xffff; return isInt(code) && code <= 0xffff;
}, },
forEach: function(callback) { forEach(callback) {
for (var i = 0; i <= 0xffff; i++) { for (var i = 0; i <= 0xffff; i++) {
callback(i, i); callback(i, i);
} }
}, },
charCodeOf: function(value) { charCodeOf(value) {
return (isInt(value) && value <= 0xffff) ? value : -1; return (isInt(value) && value <= 0xffff) ? value : -1;
}, },
getMap: function() { getMap() {
// Sometimes identity maps must be instantiated, but it's rare. // Sometimes identity maps must be instantiated, but it's rare.
var map = new Array(0x10000); var map = new Array(0x10000);
for (var i = 0; i <= 0xffff; i++) { for (var i = 0; i <= 0xffff; i++) {
@ -473,13 +473,13 @@ var BinaryCMapReader = (function BinaryCMapReaderClosure() {
} }
BinaryCMapStream.prototype = { BinaryCMapStream.prototype = {
readByte: function () { readByte() {
if (this.pos >= this.end) { if (this.pos >= this.end) {
return -1; return -1;
} }
return this.buffer[this.pos++]; return this.buffer[this.pos++];
}, },
readNumber: function () { readNumber() {
var n = 0; var n = 0;
var last; var last;
do { do {
@ -492,16 +492,16 @@ var BinaryCMapReader = (function BinaryCMapReaderClosure() {
} while (!last); } while (!last);
return n; return n;
}, },
readSigned: function () { readSigned() {
var n = this.readNumber(); var n = this.readNumber();
return (n & 1) ? ~(n >>> 1) : n >>> 1; return (n & 1) ? ~(n >>> 1) : n >>> 1;
}, },
readHex: function (num, size) { readHex(num, size) {
num.set(this.buffer.subarray(this.pos, num.set(this.buffer.subarray(this.pos,
this.pos + size + 1)); this.pos + size + 1));
this.pos += size + 1; this.pos += size + 1;
}, },
readHexNumber: function (num, size) { readHexNumber(num, size) {
var last; var last;
var stack = this.tmpBuf, sp = 0; var stack = this.tmpBuf, sp = 0;
do { do {
@ -524,7 +524,7 @@ var BinaryCMapReader = (function BinaryCMapReaderClosure() {
bufferSize -= 8; bufferSize -= 8;
} }
}, },
readHexSigned: function (num, size) { readHexSigned(num, size) {
this.readHexNumber(num, size); this.readHexNumber(num, size);
var sign = num[size] & 1 ? 255 : 0; var sign = num[size] & 1 ? 255 : 0;
var c = 0; var c = 0;
@ -533,7 +533,7 @@ var BinaryCMapReader = (function BinaryCMapReaderClosure() {
num[i] = (c >> 1) ^ sign; num[i] = (c >> 1) ^ sign;
} }
}, },
readString: function () { readString() {
var len = this.readNumber(); var len = this.readNumber();
var s = ''; var s = '';
for (var i = 0; i < len; i++) { for (var i = 0; i < len; i++) {
@ -977,7 +977,7 @@ var CMapFactory = (function CMapFactoryClosure() {
} }
return { return {
create: function (params) { create(params) {
var encoding = params.encoding; var encoding = params.encoding;
var fetchBuiltInCMap = params.fetchBuiltInCMap; var fetchBuiltInCMap = params.fetchBuiltInCMap;
var useCMap = params.useCMap; var useCMap = params.useCMap;

10
src/core/document.js
View File

@ -93,7 +93,7 @@ var Page = (function PageClosure() {
obj: 0, obj: 0,
}; };
this.idFactory = { this.idFactory = {
createObjId: function () { createObjId() {
return uniquePrefix + (++idCounters.obj); return uniquePrefix + (++idCounters.obj);
}, },
}; };
@ -266,7 +266,7 @@ var Page = (function PageClosure() {
handler.send('StartRenderPage', { handler.send('StartRenderPage', {
transparency: partialEvaluator.hasBlendModes(self.resources), transparency: partialEvaluator.hasBlendModes(self.resources),
pageIndex: self.pageIndex, pageIndex: self.pageIndex,
intent: intent intent,
}); });
return partialEvaluator.getOperatorList(contentStream, task, return partialEvaluator.getOperatorList(contentStream, task,
self.resources, opList).then(function () { self.resources, opList).then(function () {
@ -567,11 +567,9 @@ var PDFDocument = (function PDFDocumentClosure() {
}, },
setup: function PDFDocument_setup(recoveryMode) { setup: function PDFDocument_setup(recoveryMode) {
this.xref.parse(recoveryMode); this.xref.parse(recoveryMode);
var self = this;
var pageFactory = { var pageFactory = {
createPage: function (pageIndex, dict, ref, fontCache, createPage: (pageIndex, dict, ref, fontCache, builtInCMapCache) => {
builtInCMapCache) { return new Page(this.pdfManager, this.xref, pageIndex, dict, ref,
return new Page(self.pdfManager, self.xref, pageIndex, dict, ref,
fontCache, builtInCMapCache); fontCache, builtInCMapCache);
} }
}; };

89
src/core/evaluator.js
View File

@ -124,11 +124,11 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
this.forceDataSchema = forceDataSchema; this.forceDataSchema = forceDataSchema;
} }
NativeImageDecoder.prototype = { NativeImageDecoder.prototype = {
canDecode: function (image) { canDecode(image) {
return image instanceof JpegStream && return image instanceof JpegStream &&
NativeImageDecoder.isDecodable(image, this.xref, this.resources); NativeImageDecoder.isDecodable(image, this.xref, this.resources);
}, },
decode: function (image) { decode(image) {
// For natively supported JPEGs send them to the main thread for decoding. // For natively supported JPEGs send them to the main thread for decoding.
var dict = image.dict; var dict = image.dict;
var colorSpace = dict.get('ColorSpace', 'CS'); var colorSpace = dict.get('ColorSpace', 'CS');
@ -181,17 +181,17 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
this.builtInCMapCache = builtInCMapCache; this.builtInCMapCache = builtInCMapCache;
this.options = options || DefaultPartialEvaluatorOptions; this.options = options || DefaultPartialEvaluatorOptions;
this.fetchBuiltInCMap = function (name) { this.fetchBuiltInCMap = (name) => {
var cachedCMap = builtInCMapCache[name]; var cachedCMap = this.builtInCMapCache[name];
if (cachedCMap) { if (cachedCMap) {
return Promise.resolve(cachedCMap); return Promise.resolve(cachedCMap);
} }
return handler.sendWithPromise('FetchBuiltInCMap', { return handler.sendWithPromise('FetchBuiltInCMap', {
name: name, name,
}).then(function (data) { }).then((data) => {
if (data.compressionType !== CMapCompressionType.NONE) { if (data.compressionType !== CMapCompressionType.NONE) {
// Given the size of uncompressed CMaps, only cache compressed ones. // Given the size of uncompressed CMaps, only cache compressed ones.
builtInCMapCache[name] = data; this.builtInCMapCache[name] = data;
} }
return data; return data;
}); });
@ -267,8 +267,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var TILING_PATTERN = 1, SHADING_PATTERN = 2; var TILING_PATTERN = 1, SHADING_PATTERN = 2;
PartialEvaluator.prototype = { PartialEvaluator.prototype = {
clone: function(newOptions) { clone(newOptions = DefaultPartialEvaluatorOptions) {
newOptions = newOptions || DefaultPartialEvaluatorOptions;
var newEvaluator = Object.create(this); var newEvaluator = Object.create(this);
newEvaluator.options = newOptions; newEvaluator.options = newOptions;
return newEvaluator; return newEvaluator;
@ -356,9 +355,9 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
var group = dict.get('Group'); var group = dict.get('Group');
if (group) { if (group) {
var groupOptions = { var groupOptions = {
matrix: matrix, matrix,
bbox: bbox, bbox,
smask: smask, smask,
isolated: false, isolated: false,
knockout: false knockout: false
}; };
@ -437,7 +436,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
if (cacheKey) { if (cacheKey) {
imageCache[cacheKey] = { imageCache[cacheKey] = {
fn: OPS.paintImageMaskXObject, fn: OPS.paintImageMaskXObject,
args: args args,
}; };
} }
return; return;
@ -501,7 +500,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
if (cacheKey) { if (cacheKey) {
imageCache[cacheKey] = { imageCache[cacheKey] = {
fn: OPS.paintImageXObject, fn: OPS.paintImageXObject,
args: args args,
}; };
} }
}, },
@ -2207,9 +2206,9 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
return { return {
defaultWidth: defaultWidth, defaultWidth,
monospace: monospace, monospace,
widths: widths widths,
}; };
}, },
@ -2308,10 +2307,10 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
return { return {
descriptor: descriptor, descriptor,
dict: dict, dict,
baseDict: baseDict, baseDict,
composite: composite, composite,
type: type.name, type: type.name,
hash: hash ? hash.hexdigest() : '' hash: hash ? hash.hexdigest() : ''
}; };
@ -2353,11 +2352,11 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
FontFlags.Nonsymbolic); FontFlags.Nonsymbolic);
properties = { properties = {
type: type, type,
name: baseFontName, name: baseFontName,
widths: metrics.widths, widths: metrics.widths,
defaultWidth: metrics.defaultWidth, defaultWidth: metrics.defaultWidth,
flags: flags, flags,
firstChar: 0, firstChar: 0,
lastChar: maxCharIndex lastChar: maxCharIndex
}; };
@ -2421,15 +2420,15 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
} }
properties = { properties = {
type: type, type,
name: fontName.name, name: fontName.name,
subtype: subtype, subtype,
file: fontFile, file: fontFile,
length1: length1, length1,
length2: length2, length2,
length3: length3, length3,
loadedName: baseDict.loadedName, loadedName: baseDict.loadedName,
composite: composite, composite,
wideChars: composite, wideChars: composite,
fixedPitch: false, fixedPitch: false,
fontMatrix: (dict.getArray('FontMatrix') || FONT_IDENTITY_MATRIX), fontMatrix: (dict.getArray('FontMatrix') || FONT_IDENTITY_MATRIX),
@ -2489,7 +2488,7 @@ var TranslatedFont = (function TranslatedFontClosure() {
this.sent = false; this.sent = false;
} }
TranslatedFont.prototype = { TranslatedFont.prototype = {
send: function (handler) { send(handler) {
if (this.sent) { if (this.sent) {
return; return;
} }
@ -2501,7 +2500,7 @@ var TranslatedFont = (function TranslatedFontClosure() {
]); ]);
this.sent = true; this.sent = true;
}, },
loadType3Data: function (evaluator, resources, parentOperatorList, task) { loadType3Data(evaluator, resources, parentOperatorList, task) {
assert(this.font.isType3Font); assert(this.font.isType3Font);
if (this.type3Loaded) { if (this.type3Loaded) {
@ -2594,7 +2593,7 @@ var OperatorList = (function OperatorListClosure() {
return (this._totalLength + this.length); return (this._totalLength + this.length);
}, },
addOp: function(fn, args) { addOp(fn, args) {
this.fnArray.push(fn); this.fnArray.push(fn);
this.argsArray.push(args); this.argsArray.push(args);
if (this.messageHandler) { if (this.messageHandler) {
@ -2608,7 +2607,7 @@ var OperatorList = (function OperatorListClosure() {
} }
}, },
addDependency: function(dependency) { addDependency(dependency) {
if (dependency in this.dependencies) { if (dependency in this.dependencies) {
return; return;
} }
@ -2616,20 +2615,20 @@ var OperatorList = (function OperatorListClosure() {
this.addOp(OPS.dependency, [dependency]); this.addOp(OPS.dependency, [dependency]);
}, },
addDependencies: function(dependencies) { addDependencies(dependencies) {
for (var key in dependencies) { for (var key in dependencies) {
this.addDependency(key); this.addDependency(key);
} }
}, },
addOpList: function(opList) { addOpList(opList) {
Util.extendObj(this.dependencies, opList.dependencies); Util.extendObj(this.dependencies, opList.dependencies);
for (var i = 0, ii = opList.length; i < ii; i++) { for (var i = 0, ii = opList.length; i < ii; i++) {
this.addOp(opList.fnArray[i], opList.argsArray[i]); this.addOp(opList.fnArray[i], opList.argsArray[i]);
} }
}, },
getIR: function() { getIR() {
return { return {
fnArray: this.fnArray, fnArray: this.fnArray,
argsArray: this.argsArray, argsArray: this.argsArray,
@ -2637,7 +2636,7 @@ var OperatorList = (function OperatorListClosure() {
}; };
}, },
flush: function(lastChunk) { flush(lastChunk) {
if (this.intent !== 'oplist') { if (this.intent !== 'oplist') {
new QueueOptimizer().optimize(this); new QueueOptimizer().optimize(this);
} }
@ -2649,8 +2648,8 @@ var OperatorList = (function OperatorListClosure() {
operatorList: { operatorList: {
fnArray: this.fnArray, fnArray: this.fnArray,
argsArray: this.argsArray, argsArray: this.argsArray,
lastChunk: lastChunk, lastChunk,
length: length length,
}, },
pageIndex: this.pageIndex, pageIndex: this.pageIndex,
intent: this.intent intent: this.intent
@ -2670,18 +2669,18 @@ var StateManager = (function StateManagerClosure() {
this.stateStack = []; this.stateStack = [];
} }
StateManager.prototype = { StateManager.prototype = {
save: function () { save() {
var old = this.state; var old = this.state;
this.stateStack.push(this.state); this.stateStack.push(this.state);
this.state = old.clone(); this.state = old.clone();
}, },
restore: function () { restore() {
var prev = this.stateStack.pop(); var prev = this.stateStack.pop();
if (prev) { if (prev) {
this.state = prev; this.state = prev;
} }
}, },
transform: function (args) { transform(args) {
this.state.ctm = Util.transform(this.state.ctm, args); this.state.ctm = Util.transform(this.state.ctm, args);
} }
}; };
@ -3110,7 +3109,7 @@ var QueueOptimizer = (function QueueOptimizerClosure() {
maxLineHeight = 0; maxLineHeight = 0;
} }
map.push({ map.push({
transform: transform, transform,
x: currentX, y: currentY, x: currentX, y: currentY,
w: img.width, h: img.height w: img.width, h: img.height
}); });
@ -3403,8 +3402,8 @@ var QueueOptimizer = (function QueueOptimizerClosure() {
var fnArray = queue.fnArray, argsArray = queue.argsArray; var fnArray = queue.fnArray, argsArray = queue.argsArray;
var context = { var context = {
iCurr: 0, iCurr: 0,
fnArray: fnArray, fnArray,
argsArray: argsArray argsArray,
}; };
var state; var state;
var i = 0, ii = fnArray.length; var i = 0, ii = fnArray.length;

14
src/core/font_renderer.js
View File

@ -237,7 +237,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
repeat += code[i++]; repeat += code[i++];
} }
while (repeat-- > 0) { while (repeat-- > 0) {
points.push({flags: flags}); points.push({ flags, });
} }
} }
for (j = 0; j < numberOfPoints; j++) { for (j = 0; j < numberOfPoints; j++) {
@ -617,7 +617,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
this.fontMatrix = fontMatrix; this.fontMatrix = fontMatrix;
} }
CompiledFont.prototype = { CompiledFont.prototype = {
getPathJs: function (unicode) { getPathJs(unicode) {
var cmap = lookupCmap(this.cmap, unicode); var cmap = lookupCmap(this.cmap, unicode);
var fn = this.compiledGlyphs[cmap.glyphId]; var fn = this.compiledGlyphs[cmap.glyphId];
if (!fn) { if (!fn) {
@ -630,7 +630,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
return fn; return fn;
}, },
compileGlyph: function (code) { compileGlyph(code) {
if (!code || code.length === 0 || code[0] === 14) { if (!code || code.length === 0 || code[0] === 14) {
return noop; return noop;
} }
@ -647,11 +647,11 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
return cmds; return cmds;
}, },
compileGlyphImpl: function () { compileGlyphImpl() {
error('Children classes should implement this.'); error('Children classes should implement this.');
}, },
hasBuiltPath: function (unicode) { hasBuiltPath(unicode) {
var cmap = lookupCmap(this.cmap, unicode); var cmap = lookupCmap(this.cmap, unicode);
return (this.compiledGlyphs[cmap.glyphId] !== undefined && return (this.compiledGlyphs[cmap.glyphId] !== undefined &&
this.compiledCharCodeToGlyphId[cmap.charCode] !== undefined); this.compiledCharCodeToGlyphId[cmap.charCode] !== undefined);
@ -667,7 +667,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
} }
Util.inherit(TrueTypeCompiled, CompiledFont, { Util.inherit(TrueTypeCompiled, CompiledFont, {
compileGlyphImpl: function (code, cmds) { compileGlyphImpl(code, cmds) {
compileGlyf(code, cmds, this); compileGlyf(code, cmds, this);
} }
}); });
@ -689,7 +689,7 @@ var FontRendererFactory = (function FontRendererFactoryClosure() {
} }
Util.inherit(Type2Compiled, CompiledFont, { Util.inherit(Type2Compiled, CompiledFont, {
compileGlyphImpl: function (code, cmds) { compileGlyphImpl(code, cmds) {
compileCharString(code, cmds, this); compileCharString(code, cmds, this);
} }
}); });

62
src/core/fonts.js
View File

@ -269,25 +269,25 @@ var ToUnicodeMap = (function ToUnicodeMapClosure() {
return this._map.length; return this._map.length;
}, },
forEach: function(callback) { forEach(callback) {
for (var charCode in this._map) { for (var charCode in this._map) {
callback(charCode, this._map[charCode].charCodeAt(0)); callback(charCode, this._map[charCode].charCodeAt(0));
} }
}, },
has: function(i) { has(i) {
return this._map[i] !== undefined; return this._map[i] !== undefined;
}, },
get: function(i) { get(i) {
return this._map[i]; return this._map[i];
}, },
charCodeOf: function(v) { charCodeOf(v) {
return this._map.indexOf(v); return this._map.indexOf(v);
}, },
amend: function (map) { amend(map) {
for (var charCode in map) { for (var charCode in map) {
this._map[charCode] = map[charCode]; this._map[charCode] = map[charCode];
} }
@ -308,28 +308,28 @@ var IdentityToUnicodeMap = (function IdentityToUnicodeMapClosure() {
return (this.lastChar + 1) - this.firstChar; return (this.lastChar + 1) - this.firstChar;
}, },
forEach: function (callback) { forEach(callback) {
for (var i = this.firstChar, ii = this.lastChar; i <= ii; i++) { for (var i = this.firstChar, ii = this.lastChar; i <= ii; i++) {
callback(i, i); callback(i, i);
} }
}, },
has: function (i) { has(i) {
return this.firstChar <= i && i <= this.lastChar; return this.firstChar <= i && i <= this.lastChar;
}, },
get: function (i) { get(i) {
if (this.firstChar <= i && i <= this.lastChar) { if (this.firstChar <= i && i <= this.lastChar) {
return String.fromCharCode(i); return String.fromCharCode(i);
} }
return undefined; return undefined;
}, },
charCodeOf: function (v) { charCodeOf(v) {
return (isInt(v) && v >= this.firstChar && v <= this.lastChar) ? v : -1; return (isInt(v) && v >= this.firstChar && v <= this.lastChar) ? v : -1;
}, },
amend: function (map) { amend(map) {
error('Should not call amend()'); error('Should not call amend()');
}, },
}; };
@ -887,9 +887,9 @@ var Font = (function FontClosure() {
usedFontCharCodes[fontCharCode] = true; usedFontCharCodes[fontCharCode] = true;
} }
return { return {
toFontChar: toFontChar, toFontChar,
charCodeToGlyphId: newMap, charCodeToGlyphId: newMap,
nextAvailableFontCharCode: nextAvailableFontCharCode nextAvailableFontCharCode,
}; };
} }
@ -1303,11 +1303,11 @@ var Font = (function FontClosure() {
} }
return { return {
tag: tag, tag,
checksum: checksum, checksum,
length: length, length,
offset: offset, offset,
data: data data,
}; };
} }
@ -1377,9 +1377,9 @@ var Font = (function FontClosure() {
if (useTable) { if (useTable) {
potentialTable = { potentialTable = {
platformId: platformId, platformId,
encodingId: encodingId, encodingId,
offset: offset offset,
}; };
} }
if (canBreak) { if (canBreak) {
@ -1476,7 +1476,7 @@ var Font = (function FontClosure() {
glyphId = (glyphId + delta) & 0xFFFF; glyphId = (glyphId + delta) & 0xFFFF;
mappings.push({ mappings.push({
charCode: j, charCode: j,
glyphId: glyphId glyphId,
}); });
} }
} }
@ -1494,8 +1494,8 @@ var Font = (function FontClosure() {
var charCode = firstCode + j; var charCode = firstCode + j;
mappings.push({ mappings.push({
charCode: charCode, charCode,
glyphId: glyphId glyphId,
}); });
} }
} else { } else {
@ -1522,8 +1522,8 @@ var Font = (function FontClosure() {
return { return {
platformId: potentialTable.platformId, platformId: potentialTable.platformId,
encodingId: potentialTable.encodingId, encodingId: potentialTable.encodingId,
mappings: mappings, mappings,
hasShortCmap: hasShortCmap hasShortCmap,
}; };
} }
@ -1977,7 +1977,7 @@ var Font = (function FontClosure() {
stack.length += ttContext.functionsStackDeltas[funcId]; stack.length += ttContext.functionsStackDeltas[funcId];
} else if (funcId in ttContext.functionsDefined && } else if (funcId in ttContext.functionsDefined &&
functionsCalled.indexOf(funcId) < 0) { functionsCalled.indexOf(funcId) < 0) {
callstack.push({data: data, i: i, stackTop: stack.length - 1}); callstack.push({ data, i, stackTop: stack.length - 1, });
functionsCalled.push(funcId); functionsCalled.push(funcId);
pc = ttContext.functionsDefined[funcId]; pc = ttContext.functionsDefined[funcId];
if (!pc) { if (!pc) {
@ -1998,7 +1998,7 @@ var Font = (function FontClosure() {
// collecting inforamtion about which functions are defined // collecting inforamtion about which functions are defined
lastDeff = i; lastDeff = i;
funcId = stack.pop(); funcId = stack.pop();
ttContext.functionsDefined[funcId] = {data: data, i: i}; ttContext.functionsDefined[funcId] = { data, i, };
} else if (op === 0x2D) { // ENDF - end of function } else if (op === 0x2D) { // ENDF - end of function
if (inFDEF) { if (inFDEF) {
inFDEF = false; inFDEF = false;
@ -2596,9 +2596,9 @@ var Font = (function FontClosure() {
var accentFontCharCode = createCharCode(charCodeToGlyphId, var accentFontCharCode = createCharCode(charCodeToGlyphId,
accentGlyphId); accentGlyphId);
seacMap[charCode] = { seacMap[charCode] = {
baseFontCharCode: baseFontCharCode, baseFontCharCode,
accentFontCharCode: accentFontCharCode, accentFontCharCode,
accentOffset: accentOffset accentOffset,
}; };
} }
} }
@ -2953,7 +2953,7 @@ var Type1Font = (function Type1FontClosure() {
i++; i++;
} }
return { return {
found: found, found,
length: i, length: i,
}; };
} }

14
src/core/function.js
View File

@ -870,36 +870,36 @@ var PostScriptCompiler = (function PostScriptCompilerClosure() {
this.parts = []; this.parts = [];
} }
ExpressionBuilderVisitor.prototype = { ExpressionBuilderVisitor.prototype = {
visitArgument: function (arg) { visitArgument(arg) {
this.parts.push('Math.max(', arg.min, ', Math.min(', this.parts.push('Math.max(', arg.min, ', Math.min(',
arg.max, ', src[srcOffset + ', arg.index, ']))'); arg.max, ', src[srcOffset + ', arg.index, ']))');
}, },
visitVariable: function (variable) { visitVariable(variable) {
this.parts.push('v', variable.index); this.parts.push('v', variable.index);
}, },
visitLiteral: function (literal) { visitLiteral(literal) {
this.parts.push(literal.number); this.parts.push(literal.number);
}, },
visitBinaryOperation: function (operation) { visitBinaryOperation(operation) {
this.parts.push('('); this.parts.push('(');
operation.arg1.visit(this); operation.arg1.visit(this);
this.parts.push(' ', operation.op, ' '); this.parts.push(' ', operation.op, ' ');
operation.arg2.visit(this); operation.arg2.visit(this);
this.parts.push(')'); this.parts.push(')');
}, },
visitVariableDefinition: function (definition) { visitVariableDefinition(definition) {
this.parts.push('var '); this.parts.push('var ');
definition.variable.visit(this); definition.variable.visit(this);
this.parts.push(' = '); this.parts.push(' = ');
definition.arg.visit(this); definition.arg.visit(this);
this.parts.push(';'); this.parts.push(';');
}, },
visitMin: function (max) { visitMin(max) {
this.parts.push('Math.min('); this.parts.push('Math.min(');
max.arg.visit(this); max.arg.visit(this);
this.parts.push(', ', max.max, ')'); this.parts.push(', ', max.max, ')');
}, },
toString: function () { toString() {
return this.parts.join(''); return this.parts.join('');
} }
}; };

2
src/core/image.js
View File

@ -280,7 +280,7 @@ var PDFImage = (function PDFImageClosure() {
} }
} }
return {data: data, width: width, height: height}; return { data, width, height, };
}; };
PDFImage.prototype = { PDFImage.prototype = {

4
src/core/jbig2.js
View File

@ -41,7 +41,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
function ContextCache() {} function ContextCache() {}
ContextCache.prototype = { ContextCache.prototype = {
getContexts: function(id) { getContexts(id) {
if (id in this) { if (id in this) {
return this[id]; return this[id];
} }
@ -720,7 +720,7 @@ var Jbig2Image = (function Jbig2ImageClosure() {
position = segmentHeader.headerEnd; position = segmentHeader.headerEnd;
var segment = { var segment = {
header: segmentHeader, header: segmentHeader,
data: data data,
}; };
if (!header.randomAccess) { if (!header.randomAccess) {
segment.start = position; segment.start = position;

4
src/core/jpg.js
View File

@ -803,8 +803,8 @@ var JpegImage = (function JpegImageClosure() {
} }
var qId = data[offset + 2]; var qId = data[offset + 2];
l = frame.components.push({ l = frame.components.push({
h: h, h,
v: v, v,
quantizationId: qId, quantizationId: qId,
quantizationTable: null, // See comment below. quantizationTable: null, // See comment below.
}); });

50
src/core/jpx.js
View File

@ -512,13 +512,13 @@ var JpxImage = (function JpxImageClosure() {
var numprecincts = numprecinctswide * numprecinctshigh; var numprecincts = numprecinctswide * numprecinctshigh;
resolution.precinctParameters = { resolution.precinctParameters = {
precinctWidth: precinctWidth, precinctWidth,
precinctHeight: precinctHeight, precinctHeight,
numprecinctswide: numprecinctswide, numprecinctswide,
numprecinctshigh: numprecinctshigh, numprecinctshigh,
numprecincts: numprecincts, numprecincts,
precinctWidthInSubband: precinctWidthInSubband, precinctWidthInSubband,
precinctHeightInSubband: precinctHeightInSubband precinctHeightInSubband,
}; };
} }
function buildCodeblocks(context, subband, dimensions) { function buildCodeblocks(context, subband, dimensions) {
@ -619,7 +619,7 @@ var JpxImage = (function JpxImageClosure() {
} }
} }
return { return {
layerNumber: layerNumber, layerNumber,
codeblocks: precinctCodeblocks codeblocks: precinctCodeblocks
}; };
} }
@ -921,10 +921,10 @@ var JpxImage = (function JpxImageClosure() {
} }
return { return {
components: sizePerComponent, components: sizePerComponent,
minWidth: minWidth, minWidth,
minHeight: minHeight, minHeight,
maxNumWide: maxNumWide, maxNumWide,
maxNumHigh: maxNumHigh maxNumHigh,
}; };
} }
function buildPackets(context) { function buildPackets(context) {
@ -1184,8 +1184,8 @@ var JpxImage = (function JpxImageClosure() {
codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock; codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock;
var codedDataLength = readBits(bits); var codedDataLength = readBits(bits);
queue.push({ queue.push({
codeblock: codeblock, codeblock,
codingpasses: codingpasses, codingpasses,
dataLength: codedDataLength dataLength: codedDataLength
}); });
} }
@ -1200,7 +1200,7 @@ var JpxImage = (function JpxImageClosure() {
codeblock.data = []; codeblock.data = [];
} }
codeblock.data.push({ codeblock.data.push({
data: data, data,
start: offset + position, start: offset + position,
end: offset + position + packetItem.dataLength, end: offset + position + packetItem.dataLength,
codingpasses: packetItem.codingpasses codingpasses: packetItem.codingpasses
@ -1363,8 +1363,8 @@ var JpxImage = (function JpxImageClosure() {
reversible, segmentationSymbolUsed); reversible, segmentationSymbolUsed);
} }
subbandCoefficients.push({ subbandCoefficients.push({
width: width, width,
height: height, height,
items: coefficients items: coefficients
}); });
} }
@ -1498,8 +1498,8 @@ var JpxImage = (function JpxImageClosure() {
this.levels = []; this.levels = [];
for (var i = 0; i < levelsLength; i++) { for (var i = 0; i < levelsLength; i++) {
var level = { var level = {
width: width, width,
height: height, height,
items: [] items: []
}; };
this.levels.push(level); this.levels.push(level);
@ -1562,9 +1562,9 @@ var JpxImage = (function JpxImageClosure() {
} }
var level = { var level = {
width: width, width,
height: height, height,
items: items items,
}; };
this.levels.push(level); this.levels.push(level);
@ -2097,9 +2097,9 @@ var JpxImage = (function JpxImageClosure() {
} }
return { return {
width: width, width,
height: height, height,
items: items items,
}; };
}; };
return Transform; return Transform;

12
src/core/network.js
View File

@ -87,8 +87,8 @@ if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('FIREFOX || MOZCENTRAL')) {
NetworkManager.prototype = { NetworkManager.prototype = {
requestRange: function NetworkManager_requestRange(begin, end, listeners) { requestRange: function NetworkManager_requestRange(begin, end, listeners) {
var args = { var args = {
begin: begin, begin,
end: end end,
}; };
for (var prop in listeners) { for (var prop in listeners) {
args[prop] = listeners[prop]; args[prop] = listeners[prop];
@ -104,7 +104,7 @@ if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('FIREFOX || MOZCENTRAL')) {
var xhr = this.getXhr(); var xhr = this.getXhr();
var xhrId = this.currXhrId++; var xhrId = this.currXhrId++;
var pendingRequest = this.pendingRequests[xhrId] = { var pendingRequest = this.pendingRequests[xhrId] = {
xhr: xhr xhr,
}; };
xhr.open('GET', this.url); xhr.open('GET', this.url);
@ -226,15 +226,15 @@ if (typeof PDFJSDev !== 'undefined' && PDFJSDev.test('FIREFOX || MOZCENTRAL')) {
var matches = /bytes (\d+)-(\d+)\/(\d+)/.exec(rangeHeader); var matches = /bytes (\d+)-(\d+)\/(\d+)/.exec(rangeHeader);
var begin = parseInt(matches[1], 10); var begin = parseInt(matches[1], 10);
pendingRequest.onDone({ pendingRequest.onDone({
begin: begin, begin,
chunk: chunk chunk,
}); });
} else if (pendingRequest.onProgressiveData) { } else if (pendingRequest.onProgressiveData) {
pendingRequest.onDone(null); pendingRequest.onDone(null);
} else if (chunk) { } else if (chunk) {
pendingRequest.onDone({ pendingRequest.onDone({
begin: 0, begin: 0,
chunk: chunk chunk,
}); });
} else if (pendingRequest.onError) { } else if (pendingRequest.onError) {
pendingRequest.onError(xhr.status); pendingRequest.onError(xhr.status);

8
src/core/obj.js
View File

@ -144,7 +144,7 @@ var Catalog = (function CatalogClosure() {
return null; return null;
} }
var root = { items: [] }; var root = { items: [] };
var queue = [{obj: obj, parent: root}]; var queue = [{ obj, parent: root, }];
// To avoid recursion, keep track of the already processed items. // To avoid recursion, keep track of the already processed items.
var processed = new RefSet(); var processed = new RefSet();
processed.put(obj); processed.put(obj);
@ -188,12 +188,12 @@ var Catalog = (function CatalogClosure() {
i.parent.items.push(outlineItem); i.parent.items.push(outlineItem);
obj = outlineDict.getRaw('First'); obj = outlineDict.getRaw('First');
if (isRef(obj) && !processed.has(obj)) { if (isRef(obj) && !processed.has(obj)) {
queue.push({obj: obj, parent: outlineItem}); queue.push({ obj, parent: outlineItem, });
processed.put(obj); processed.put(obj);
} }
obj = outlineDict.getRaw('Next'); obj = outlineDict.getRaw('Next');
if (isRef(obj) && !processed.has(obj)) { if (isRef(obj) && !processed.has(obj)) {
queue.push({obj: obj, parent: i.parent}); queue.push({ obj, parent: i.parent, });
processed.put(obj); processed.put(obj);
} }
} }
@ -962,7 +962,7 @@ var XRef = (function XRefClosure() {
this.streamState = { this.streamState = {
entryRanges: range, entryRanges: range,
byteWidths: byteWidths, byteWidths,
entryNum: 0, entryNum: 0,
streamPos: stream.pos streamPos: stream.pos
}; };

2
src/core/parser.js
View File

@ -1109,7 +1109,7 @@ var Linearization = {
'does not equal the stream length.'); 'does not equal the stream length.');
} }
return { return {
length: length, length,
hints: getHints(), hints: getHints(),
objectNumberFirst: getInt('O'), objectNumberFirst: getInt('O'),
endFirst: getInt('E'), endFirst: getInt('E'),

4
src/core/pattern.js
View File

@ -394,7 +394,7 @@ Shadings.Mesh = (function MeshClosure() {
type: 'lattice', type: 'lattice',
coords: new Int32Array(ps), coords: new Int32Array(ps),
colors: new Int32Array(ps), colors: new Int32Array(ps),
verticesPerRow: verticesPerRow verticesPerRow,
}); });
} }
@ -501,7 +501,7 @@ Shadings.Mesh = (function MeshClosure() {
type: 'lattice', type: 'lattice',
coords: figureCoords, coords: figureCoords,
colors: figureColors, colors: figureColors,
verticesPerRow: verticesPerRow verticesPerRow,
}; };
} }

2
src/core/pdf_manager.js
View File

@ -231,7 +231,7 @@ var NetworkPdfManager = (function NetworkPdfManagerClosure() {
sendProgressiveData: sendProgressiveData:
function NetworkPdfManager_sendProgressiveData(chunk) { function NetworkPdfManager_sendProgressiveData(chunk) {
this.streamManager.onReceiveData({ chunk: chunk }); this.streamManager.onReceiveData({ chunk, });
}, },
onLoadedStream: function NetworkPdfManager_onLoadedStream() { onLoadedStream: function NetworkPdfManager_onLoadedStream() {

2
src/core/stream.js
View File

@ -2344,7 +2344,7 @@ var LZWStream = (function LZWStreamClosure() {
var maxLzwDictionarySize = 4096; var maxLzwDictionarySize = 4096;
var lzwState = { var lzwState = {
earlyChange: earlyChange, earlyChange,
codeLength: 9, codeLength: 9,
nextCode: 258, nextCode: 258,
dictionaryValues: new Uint8Array(maxLzwDictionarySize), dictionaryValues: new Uint8Array(maxLzwDictionarySize),

6
src/core/type1_parser.js
View File

@ -332,7 +332,7 @@ var Type1CharString = (function Type1CharStringClosure() {
return error; return error;
}, },
executeCommand: function(howManyArgs, command, keepStack) { executeCommand(howManyArgs, command, keepStack) {
var stackLength = this.stack.length; var stackLength = this.stack.length;
if (howManyArgs > stackLength) { if (howManyArgs > stackLength) {
return true; return true;
@ -573,8 +573,8 @@ var Type1Parser = (function Type1ParserClosure() {
this.getToken(); // read in 'def' this.getToken(); // read in 'def'
} }
charstrings.push({ charstrings.push({
glyph: glyph, glyph,
encoded: encoded encoded,
}); });
} }
break; break;

30
src/core/worker.js
View File

@ -61,15 +61,15 @@ var WorkerTask = (function WorkerTaskClosure() {
return this._capability.promise; return this._capability.promise;
}, },
finish: function () { finish() {
this._capability.resolve(); this._capability.resolve();
}, },
terminate: function () { terminate() {
this.terminated = true; this.terminated = true;
}, },
ensureNotTerminated: function () { ensureNotTerminated() {
if (this.terminated) { if (this.terminated) {
throw new Error('Worker task was terminated'); throw new Error('Worker task was terminated');
} }
@ -92,7 +92,7 @@ IPDFStream.prototype = {
* Gets a reader for the entire PDF data. * Gets a reader for the entire PDF data.
* @returns {IPDFStreamReader} * @returns {IPDFStreamReader}
*/ */
getFullReader: function () { getFullReader() {
return null; return null;
}, },
@ -102,7 +102,7 @@ IPDFStream.prototype = {
* @param {number} end - the end offset of the data. * @param {number} end - the end offset of the data.
* @returns {IPDFStreamRangeReader} * @returns {IPDFStreamRangeReader}
*/ */
getRangeReader: function (begin, end) { getRangeReader(begin, end) {
return null; return null;
}, },
@ -110,7 +110,7 @@ IPDFStream.prototype = {
* Cancels all opened reader and closes all their opened requests. * Cancels all opened reader and closes all their opened requests.
* @param {Object} reason - the reason for cancelling * @param {Object} reason - the reason for cancelling
*/ */
cancelAllRequests: function (reason) {}, cancelAllRequests(reason) {},
}; };
/** /**
@ -165,13 +165,13 @@ IPDFStreamReader.prototype = {
* set to true. * set to true.
* @returns {Promise} * @returns {Promise}
*/ */
read: function () {}, read() {},
/** /**
* Cancels all pending read requests and closes the stream. * Cancels all pending read requests and closes the stream.
* @param {Object} reason * @param {Object} reason
*/ */
cancel: function (reason) {}, cancel(reason) {},
/** /**
* Sets or gets the progress callback. The callback can be useful when the * Sets or gets the progress callback. The callback can be useful when the
@ -205,13 +205,13 @@ IPDFStreamRangeReader.prototype = {
* set to true. * set to true.
* @returns {Promise} * @returns {Promise}
*/ */
read: function () {}, read() {},
/** /**
* Cancels all pending read requests and closes the stream. * Cancels all pending read requests and closes the stream.
* @param {Object} reason * @param {Object} reason
*/ */
cancel: function (reason) {}, cancel(reason) {},
/** /**
* Sets or gets the progress callback. The callback can be useful when the * Sets or gets the progress callback. The callback can be useful when the
@ -289,7 +289,7 @@ var PDFWorkerStream = (function PDFWorkerStreamClosure() {
getRangeReader: function PDFWorkerStream_getRangeReader(begin, end) { getRangeReader: function PDFWorkerStream_getRangeReader(begin, end) {
var reader = new PDFWorkerStreamRangeReader(this, begin, end); var reader = new PDFWorkerStreamRangeReader(this, begin, end);
this._msgHandler.send('RequestDataRange', { begin: begin, end: end }); this._msgHandler.send('RequestDataRange', { begin, end, });
this._rangeReaders.push(reader); this._rangeReaders.push(reader);
return reader; return reader;
}, },
@ -469,7 +469,7 @@ var WorkerMessageHandler = {
} }
handler.send('test', { handler.send('test', {
supportTypedArray: true, supportTypedArray: true,
supportTransfers: supportTransfers supportTransfers,
}); });
}); });
@ -602,7 +602,7 @@ var WorkerMessageHandler = {
url: source.url, url: source.url,
password: source.password, password: source.password,
length: fullRequest.contentLength, length: fullRequest.contentLength,
disableAutoFetch: disableAutoFetch, disableAutoFetch,
rangeChunkSize: source.rangeChunkSize rangeChunkSize: source.rangeChunkSize
}, evaluatorOptions, docBaseUrl); }, evaluatorOptions, docBaseUrl);
pdfManagerCapability.resolve(pdfManager); pdfManagerCapability.resolve(pdfManager);
@ -644,7 +644,7 @@ var WorkerMessageHandler = {
loaded += arrayByteLength(data); loaded += arrayByteLength(data);
if (!fullRequest.isStreamingSupported) { if (!fullRequest.isStreamingSupported) {
handler.send('DocProgress', { handler.send('DocProgress', {
loaded: loaded, loaded,
total: Math.max(loaded, fullRequest.contentLength || 0) total: Math.max(loaded, fullRequest.contentLength || 0)
}); });
} }
@ -890,7 +890,7 @@ var WorkerMessageHandler = {
} }
handler.send('PageError', { handler.send('PageError', {
pageNum: pageNum, pageNum,
error: wrappedException, error: wrappedException,
intent: data.intent intent: data.intent
}); });