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

PDF.js version 1.0.197

master v1.0.197
Yury Delendik 11 years ago
parent
bec7ee62a6
commit
b87f319e8e
5 changed files with 418 additions and 465 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      bower.json
  2. 322
      build/pdf.combined.js
  3. 223
      build/pdf.js
  4. 178
      build/pdf.worker.js
  5. 2
      package.json

2
bower.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "1.0.194",
"version": "1.0.197",
"keywords": [
"Mozilla",
"pdf",

322
build/pdf.combined.js
Unescape View File

@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {};
}
PDFJS.version = '1.0.194';
PDFJS.build = '36c6bc2';
PDFJS.version = '1.0.197';
PDFJS.build = '44cd0f4';
(function pdfjsWrapper() {
// Use strict in our context only - users might not want it
@ -1439,7 +1439,7 @@ function MessageHandler(name, comObj) { @@ -1439,7 +1439,7 @@ function MessageHandler(name, comObj) {
this.comObj = comObj;
this.callbackIndex = 1;
this.postMessageTransfers = true;
var callbacks = this.callbacks = {};
var callbacksCapabilities = this.callbacksCapabilities = {};
var ah = this.actionHandler = {};
ah['console_log'] = [function ahConsoleLog(data) {
@ -1456,35 +1456,40 @@ function MessageHandler(name, comObj) { @@ -1456,35 +1456,40 @@ function MessageHandler(name, comObj) {
var data = event.data;
if (data.isReply) {
var callbackId = data.callbackId;
if (data.callbackId in callbacks) {
var callback = callbacks[callbackId];
delete callbacks[callbackId];
callback(data.data);
if (data.callbackId in callbacksCapabilities) {
var callback = callbacksCapabilities[callbackId];
delete callbacksCapabilities[callbackId];
if ('error' in data) {
callback.reject(data.error);
} else {
callback.resolve(data.data);
}
} else {
error('Cannot resolve callback ' + callbackId);
}
} else if (data.action in ah) {
var action = ah[data.action];
if (data.callbackId) {
var deferred = {};
var promise = new Promise(function (resolve, reject) {
deferred.resolve = resolve;
deferred.reject = reject;
Promise.resolve().then(function () {
return action[0].call(action[1], data.data);
}).then(function (result) {
comObj.postMessage({
isReply: true,
callbackId: data.callbackId,
data: result
});
deferred.promise = promise;
promise.then(function(resolvedData) {
}, function (reason) {
comObj.postMessage({
isReply: true,
callbackId: data.callbackId,
data: resolvedData
error: reason
});
});
action[0].call(action[1], data.data, deferred);
} else {
action[0].call(action[1], data.data);
}
} else {
error('Unkown action from worker: ' + data.action);
error('Unknown action from worker: ' + data.action);
}
};
}
@ -1501,19 +1506,47 @@ MessageHandler.prototype = { @@ -1501,19 +1506,47 @@ MessageHandler.prototype = {
* Sends a message to the comObj to invoke the action with the supplied data.
* @param {String} actionName Action to call.
* @param {JSON} data JSON data to send.
* @param {function} [callback] Optional callback that will handle a reply.
* @param {Array} [transfers] Optional list of transfers/ArrayBuffers
*/
send: function messageHandlerSend(actionName, data, callback, transfers) {
send: function messageHandlerSend(actionName, data, transfers) {
var message = {
action: actionName,
data: data
};
if (callback) {
this.postMessage(message, transfers);
},
/**
* Sends a message to the comObj to invoke the action with the supplied data.
* Expects that other side will callback with the response.
* @param {String} actionName Action to call.
* @param {JSON} data JSON data to send.
* @param {Array} [transfers] Optional list of transfers/ArrayBuffers.
* @returns {Promise} Promise to be resolved with response data.
*/
sendWithPromise:
function messageHandlerSendWithPromise(actionName, data, transfers) {
var callbackId = this.callbackIndex++;
this.callbacks[callbackId] = callback;
message.callbackId = callbackId;
var message = {
action: actionName,
data: data,
callbackId: callbackId
};
var capability = createPromiseCapability();
this.callbacksCapabilities[callbackId] = capability;
try {
this.postMessage(message, transfers);
} catch (e) {
capability.reject(e);
}
return capability.promise;
},
/**
* Sends raw message to the comObj.
* @private
* @param message {Object} Raw message.
* @param transfers List of transfers/ArrayBuffers, or undefined.
*/
postMessage: function (message, transfers) {
if (transfers && this.postMessageTransfers) {
this.comObj.postMessage(message, transfers);
} else {
@ -4326,7 +4359,8 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() { @@ -4326,7 +4359,8 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
* @class
*/
var PDFPageProxy = (function PDFPageProxyClosure() {
function PDFPageProxy(pageInfo, transport) {
function PDFPageProxy(pageIndex, pageInfo, transport) {
this.pageIndex = pageIndex;
this.pageInfo = pageInfo;
this.transport = transport;
this.stats = new StatTimer();
@ -4342,7 +4376,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { @@ -4342,7 +4376,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
* @return {number} Page number of the page. First page is 1.
*/
get pageNumber() {
return this.pageInfo.pageIndex + 1;
return this.pageIndex + 1;
},
/**
* @return {number} The number of degrees the page is rotated clockwise.
@ -4382,14 +4416,13 @@ var PDFPageProxy = (function PDFPageProxyClosure() { @@ -4382,14 +4416,13 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
* annotation objects.
*/
getAnnotations: function PDFPageProxy_getAnnotations() {
if (this.annotationsCapability) {
return this.annotationsCapability.promise;
if (this.annotationsPromise) {
return this.annotationsPromise;
}
var capability = createPromiseCapability();
this.annotationsCapability = capability;
this.transport.getAnnotations(this.pageInfo.pageIndex);
return capability.promise;
var promise = this.transport.getAnnotations(this.pageIndex);
this.annotationsPromise = promise;
return promise;
},
/**
* Begins the process of rendering a page to the desired context.
@ -4485,15 +4518,9 @@ var PDFPageProxy = (function PDFPageProxyClosure() { @@ -4485,15 +4518,9 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
* object that represent the page text content.
*/
getTextContent: function PDFPageProxy_getTextContent() {
return new Promise(function (resolve) {
this.transport.messageHandler.send('GetTextContent', {
return this.transport.messageHandler.sendWithPromise('GetTextContent', {
pageIndex: this.pageNumber - 1
},
function textContentCallback(textContent) {
resolve(textContent);
}
);
}.bind(this));
});
},
/**
* Destroys resources allocated by the page.
@ -4521,6 +4548,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { @@ -4521,6 +4548,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
delete this.intentStates[intent];
}, this);
this.objs.clear();
this.annotationsPromise = null;
this.pendingDestroy = false;
},
/**
@ -4576,7 +4604,7 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4576,7 +4604,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.commonObjs = new PDFObjects();
this.pageCache = [];
this.pageCapabilities = [];
this.pagePromises = [];
this.downloadInfoCapability = createPromiseCapability();
this.passwordCallback = null;
@ -4596,9 +4624,9 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4596,9 +4624,9 @@ var WorkerTransport = (function WorkerTransportClosure() {
WorkerTransport.prototype = {
destroy: function WorkerTransport_destroy() {
this.pageCache = [];
this.pageCapabilities = [];
this.pagePromises = [];
var self = this;
this.messageHandler.send('Terminate', null, function () {
this.messageHandler.sendWithPromise('Terminate', null).then(function () {
FontLoader.clear();
if (self.worker) {
self.worker.terminate();
@ -4708,20 +4736,6 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4708,20 +4736,6 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.downloadInfoCapability.resolve(data);
}, this);
messageHandler.on('GetPage', function transportPage(data) {
var pageInfo = data.pageInfo;
var page = new PDFPageProxy(pageInfo, this);
this.pageCache[pageInfo.pageIndex] = page;
var promise = this.pageCapabilities[pageInfo.pageIndex];
promise.resolve(page);
}, this);
messageHandler.on('GetAnnotations', function transportAnnotations(data) {
var annotations = data.annotations;
var promise = this.pageCache[data.pageIndex].annotationsCapability;
promise.resolve(annotations);
}, this);
messageHandler.on('StartRenderPage', function transportRender(data) {
var page = this.pageCache[data.pageIndex];
@ -4815,9 +4829,9 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4815,9 +4829,9 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.workerReadyCapability.reject(data);
}, this);
messageHandler.on('PageError', function transportError(data, intent) {
messageHandler.on('PageError', function transportError(data) {
var page = this.pageCache[data.pageNum - 1];
var intentState = page.intentStates[intent];
var intentState = page.intentStates[data.intent];
if (intentState.displayReadyCapability.promise) {
intentState.displayReadyCapability.reject(data.error);
} else {
@ -4825,15 +4839,17 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4825,15 +4839,17 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
}, this);
messageHandler.on('JpegDecode', function(data, deferred) {
messageHandler.on('JpegDecode', function(data) {
var imageUrl = data[0];
var components = data[1];
if (components != 3 && components != 1) {
error('Only 3 component or 1 component can be returned');
return Promise.reject(
new Error('Only 3 components or 1 component can be returned'));
}
return new Promise(function (resolve, reject) {
var img = new Image();
img.onload = (function messageHandler_onloadClosure() {
img.onload = function () {
var width = img.width;
var height = img.height;
var size = width * height;
@ -4856,10 +4872,14 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4856,10 +4872,14 @@ var WorkerTransport = (function WorkerTransportClosure() {
buf[j] = data[i];
}
}
deferred.resolve({ data: buf, width: width, height: height});
}).bind(this);
resolve({ data: buf, width: width, height: height});
};
img.onerror = function () {
reject(new Error('JpegDecode failed to load image'));
};
img.src = imageUrl;
});
});
},
fetchDocument: function WorkerTransport_fetchDocument(source) {
@ -4890,86 +4910,58 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4890,86 +4910,58 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
var pageIndex = pageNumber - 1;
if (pageIndex in this.pageCapabilities) {
return this.pageCapabilities[pageIndex].promise;
if (pageIndex in this.pagePromises) {
return this.pagePromises[pageIndex];
}
capability = createPromiseCapability();
this.pageCapabilities[pageIndex] = capability;
this.messageHandler.send('GetPageRequest', { pageIndex: pageIndex });
return capability.promise;
var promise = this.messageHandler.sendWithPromise('GetPage', {
pageIndex: pageIndex
}).then(function (pageInfo) {
var page = new PDFPageProxy(pageIndex, pageInfo, this);
this.pageCache[pageIndex] = page;
return page;
}.bind(this));
this.pagePromises[pageIndex] = promise;
return promise;
},
getPageIndex: function WorkerTransport_getPageIndexByRef(ref) {
return new Promise(function (resolve) {
this.messageHandler.send('GetPageIndex', { ref: ref },
function (pageIndex) {
resolve(pageIndex);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref });
},
getAnnotations: function WorkerTransport_getAnnotations(pageIndex) {
this.messageHandler.send('GetAnnotationsRequest',
return this.messageHandler.sendWithPromise('GetAnnotations',
{ pageIndex: pageIndex });
},
getDestinations: function WorkerTransport_getDestinations() {
return new Promise(function (resolve) {
this.messageHandler.send('GetDestinations', null,
function transportDestinations(destinations) {
resolve(destinations);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetDestinations', null);
},
getAttachments: function WorkerTransport_getAttachments() {
return new Promise(function (resolve) {
this.messageHandler.send('GetAttachments', null,
function transportAttachments(attachments) {
resolve(attachments);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetAttachments', null);
},
getJavaScript: function WorkerTransport_getJavaScript() {
return new Promise(function (resolve) {
this.messageHandler.send('GetJavaScript', null,
function transportJavaScript(js) {
resolve(js);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetJavaScript', null);
},
getOutline: function WorkerTransport_getOutline() {
return new Promise(function (resolve) {
this.messageHandler.send('GetOutline', null,
function transportOutline(outline) {
resolve(outline);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetOutline', null);
},
getMetadata: function WorkerTransport_getMetadata() {
return new Promise(function (resolve) {
this.messageHandler.send('GetMetadata', null,
function transportMetadata(results) {
resolve({
return this.messageHandler.sendWithPromise('GetMetadata', null).
then(function transportMetadata(results) {
return {
info: results[0],
metadata: (results[1] ? new PDFJS.Metadata(results[1]) : null)
};
});
}
);
}.bind(this));
},
startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.send('Cleanup', null,
function endCleanup() {
this.messageHandler.sendWithPromise('Cleanup', null).
then(function endCleanup() {
for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
var page = this.pageCache[i];
if (page) {
@ -4978,8 +4970,7 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4978,8 +4970,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
this.commonObjs.clear();
FontLoader.clear();
}.bind(this)
);
}.bind(this));
}
};
return WorkerTransport;
@ -20283,7 +20274,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() { @@ -20283,7 +20274,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
then(function(imageObj) {
var imgData = imageObj.createImageData(/* forceRGBA = */ false);
self.handler.send('obj', [objId, self.pageIndex, 'Image', imgData],
null, [imgData.data.buffer]);
[imgData.data.buffer]);
}).then(null, function (reason) {
warn('Unable to decode image: ' + reason);
self.handler.send('obj', [objId, self.pageIndex, 'Image', null]);
@ -21681,7 +21672,7 @@ var OperatorList = (function OperatorListClosure() { @@ -21681,7 +21672,7 @@ var OperatorList = (function OperatorListClosure() {
},
pageIndex: this.pageIndex,
intent: this.intent
}, null, transfers);
}, transfers);
this.dependencies = {};
this.fnArray.length = 0;
this.argsArray.length = 0;
@ -35022,14 +35013,11 @@ var PDFImage = (function PDFImageClosure() { @@ -35022,14 +35013,11 @@ var PDFImage = (function PDFImageClosure() {
var colorSpace = dict.get('ColorSpace', 'CS');
colorSpace = ColorSpace.parse(colorSpace, xref, res);
var numComps = colorSpace.numComps;
var resolvePromise;
handler.send('JpegDecode', [image.getIR(), numComps], function(message) {
var decodePromise = handler.sendWithPromise('JpegDecode',
[image.getIR(), numComps]);
return decodePromise.then(function (message) {
var data = message.data;
var stream = new Stream(data, 0, data.length, image.dict);
resolvePromise(stream);
});
return new Promise(function (resolve) {
resolvePromise = resolve;
return new Stream(data, 0, data.length, image.dict);
});
} else {
return Promise.resolve(image);
@ -42258,81 +42246,64 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = { @@ -42258,81 +42246,64 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
}, onFailure);
});
handler.on('GetPageRequest', function wphSetupGetPage(data) {
var pageIndex = data.pageIndex;
pdfManager.getPage(pageIndex).then(function(page) {
handler.on('GetPage', function wphSetupGetPage(data) {
return pdfManager.getPage(data.pageIndex).then(function(page) {
var rotatePromise = pdfManager.ensure(page, 'rotate');
var refPromise = pdfManager.ensure(page, 'ref');
var viewPromise = pdfManager.ensure(page, 'view');
Promise.all([rotatePromise, refPromise, viewPromise]).then(
return Promise.all([rotatePromise, refPromise, viewPromise]).then(
function(results) {
var page = {
pageIndex: data.pageIndex,
return {
rotate: results[0],
ref: results[1],
view: results[2]
};
handler.send('GetPage', { pageInfo: page });
});
});
});
handler.on('GetPageIndex', function wphSetupGetPageIndex(data, deferred) {
handler.on('GetPageIndex', function wphSetupGetPageIndex(data) {
var ref = new Ref(data.ref.num, data.ref.gen);
var catalog = pdfManager.pdfDocument.catalog;
catalog.getPageIndex(ref).then(function (pageIndex) {
deferred.resolve(pageIndex);
}, deferred.reject);
return catalog.getPageIndex(ref);
});
handler.on('GetDestinations',
function wphSetupGetDestinations(data, deferred) {
pdfManager.ensureCatalog('destinations').then(function(destinations) {
deferred.resolve(destinations);
});
function wphSetupGetDestinations(data) {
return pdfManager.ensureCatalog('destinations');
}
);
handler.on('GetAttachments',
function wphSetupGetAttachments(data, deferred) {
pdfManager.ensureCatalog('attachments').then(function(attachments) {
deferred.resolve(attachments);
}, deferred.reject);
function wphSetupGetAttachments(data) {
return pdfManager.ensureCatalog('attachments');
}
);
handler.on('GetJavaScript',
function wphSetupGetJavaScript(data, deferred) {
pdfManager.ensureCatalog('javaScript').then(function (js) {
deferred.resolve(js);
}, deferred.reject);
function wphSetupGetJavaScript(data) {
return pdfManager.ensureCatalog('javaScript');
}
);
handler.on('GetOutline',
function wphSetupGetOutline(data, deferred) {
pdfManager.ensureCatalog('documentOutline').then(function (outline) {
deferred.resolve(outline);
}, deferred.reject);
function wphSetupGetOutline(data) {
return pdfManager.ensureCatalog('documentOutline');
}
);
handler.on('GetMetadata',
function wphSetupGetMetadata(data, deferred) {
Promise.all([pdfManager.ensureDoc('documentInfo'),
pdfManager.ensureCatalog('metadata')]).then(
function (results) {
deferred.resolve(results);
}, deferred.reject);
function wphSetupGetMetadata(data) {
return Promise.all([pdfManager.ensureDoc('documentInfo'),
pdfManager.ensureCatalog('metadata')]);
}
);
handler.on('GetData', function wphSetupGetData(data, deferred) {
handler.on('GetData', function wphSetupGetData(data) {
pdfManager.requestLoadedStream();
pdfManager.onLoadedStream().then(function(stream) {
deferred.resolve(stream.bytes);
return pdfManager.onLoadedStream().then(function(stream) {
return stream.bytes;
});
});
@ -42340,16 +42311,9 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = { @@ -42340,16 +42311,9 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
pdfManager.updatePassword(data);
});
handler.on('GetAnnotationsRequest', function wphSetupGetAnnotations(data) {
pdfManager.getPage(data.pageIndex).then(function(page) {
pdfManager.ensure(page, 'getAnnotationsData', []).then(
function(annotationsData) {
handler.send('GetAnnotations', {
pageIndex: data.pageIndex,
annotations: annotationsData
});
}
);
handler.on('GetAnnotations', function wphSetupGetAnnotations(data) {
return pdfManager.getPage(data.pageIndex).then(function(page) {
return pdfManager.ensure(page, 'getAnnotationsData', []);
});
});
@ -42398,29 +42362,25 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = { @@ -42398,29 +42362,25 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
});
}, this);
handler.on('GetTextContent', function wphExtractText(data, deferred) {
pdfManager.getPage(data.pageIndex).then(function(page) {
handler.on('GetTextContent', function wphExtractText(data) {
return pdfManager.getPage(data.pageIndex).then(function(page) {
var pageNum = data.pageIndex + 1;
var start = Date.now();
page.extractTextContent().then(function(textContent) {
deferred.resolve(textContent);
return page.extractTextContent().then(function(textContent) {
info('text indexing: page=' + pageNum + ' - time=' +
(Date.now() - start) + 'ms');
}, function (e) {
// Skip errored pages
deferred.reject(e);
return textContent;
});
});
});
handler.on('Cleanup', function wphCleanup(data, deferred) {
handler.on('Cleanup', function wphCleanup(data) {
pdfManager.cleanup();
deferred.resolve(true);
return true;
});
handler.on('Terminate', function wphTerminate(data, deferred) {
handler.on('Terminate', function wphTerminate(data) {
pdfManager.terminate();
deferred.resolve();
});
}
};

223
build/pdf.js
Unescape View File

@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {};
}
PDFJS.version = '1.0.194';
PDFJS.build = '36c6bc2';
PDFJS.version = '1.0.197';
PDFJS.build = '44cd0f4';
(function pdfjsWrapper() {
// Use strict in our context only - users might not want it
@ -1439,7 +1439,7 @@ function MessageHandler(name, comObj) { @@ -1439,7 +1439,7 @@ function MessageHandler(name, comObj) {
this.comObj = comObj;
this.callbackIndex = 1;
this.postMessageTransfers = true;
var callbacks = this.callbacks = {};
var callbacksCapabilities = this.callbacksCapabilities = {};
var ah = this.actionHandler = {};
ah['console_log'] = [function ahConsoleLog(data) {
@ -1456,35 +1456,40 @@ function MessageHandler(name, comObj) { @@ -1456,35 +1456,40 @@ function MessageHandler(name, comObj) {
var data = event.data;
if (data.isReply) {
var callbackId = data.callbackId;
if (data.callbackId in callbacks) {
var callback = callbacks[callbackId];
delete callbacks[callbackId];
callback(data.data);
if (data.callbackId in callbacksCapabilities) {
var callback = callbacksCapabilities[callbackId];
delete callbacksCapabilities[callbackId];
if ('error' in data) {
callback.reject(data.error);
} else {
callback.resolve(data.data);
}
} else {
error('Cannot resolve callback ' + callbackId);
}
} else if (data.action in ah) {
var action = ah[data.action];
if (data.callbackId) {
var deferred = {};
var promise = new Promise(function (resolve, reject) {
deferred.resolve = resolve;
deferred.reject = reject;
Promise.resolve().then(function () {
return action[0].call(action[1], data.data);
}).then(function (result) {
comObj.postMessage({
isReply: true,
callbackId: data.callbackId,
data: result
});
deferred.promise = promise;
promise.then(function(resolvedData) {
}, function (reason) {
comObj.postMessage({
isReply: true,
callbackId: data.callbackId,
data: resolvedData
error: reason
});
});
action[0].call(action[1], data.data, deferred);
} else {
action[0].call(action[1], data.data);
}
} else {
error('Unkown action from worker: ' + data.action);
error('Unknown action from worker: ' + data.action);
}
};
}
@ -1501,19 +1506,47 @@ MessageHandler.prototype = { @@ -1501,19 +1506,47 @@ MessageHandler.prototype = {
* Sends a message to the comObj to invoke the action with the supplied data.
* @param {String} actionName Action to call.
* @param {JSON} data JSON data to send.
* @param {function} [callback] Optional callback that will handle a reply.
* @param {Array} [transfers] Optional list of transfers/ArrayBuffers
*/
send: function messageHandlerSend(actionName, data, callback, transfers) {
send: function messageHandlerSend(actionName, data, transfers) {
var message = {
action: actionName,
data: data
};
if (callback) {
this.postMessage(message, transfers);
},
/**
* Sends a message to the comObj to invoke the action with the supplied data.
* Expects that other side will callback with the response.
* @param {String} actionName Action to call.
* @param {JSON} data JSON data to send.
* @param {Array} [transfers] Optional list of transfers/ArrayBuffers.
* @returns {Promise} Promise to be resolved with response data.
*/
sendWithPromise:
function messageHandlerSendWithPromise(actionName, data, transfers) {
var callbackId = this.callbackIndex++;
this.callbacks[callbackId] = callback;
message.callbackId = callbackId;
var message = {
action: actionName,
data: data,
callbackId: callbackId
};
var capability = createPromiseCapability();
this.callbacksCapabilities[callbackId] = capability;
try {
this.postMessage(message, transfers);
} catch (e) {
capability.reject(e);
}
return capability.promise;
},
/**
* Sends raw message to the comObj.
* @private
* @param message {Object} Raw message.
* @param transfers List of transfers/ArrayBuffers, or undefined.
*/
postMessage: function (message, transfers) {
if (transfers && this.postMessageTransfers) {
this.comObj.postMessage(message, transfers);
} else {
@ -4326,7 +4359,8 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() { @@ -4326,7 +4359,8 @@ var PDFDocumentProxy = (function PDFDocumentProxyClosure() {
* @class
*/
var PDFPageProxy = (function PDFPageProxyClosure() {
function PDFPageProxy(pageInfo, transport) {
function PDFPageProxy(pageIndex, pageInfo, transport) {
this.pageIndex = pageIndex;
this.pageInfo = pageInfo;
this.transport = transport;
this.stats = new StatTimer();
@ -4342,7 +4376,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { @@ -4342,7 +4376,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
* @return {number} Page number of the page. First page is 1.
*/
get pageNumber() {
return this.pageInfo.pageIndex + 1;
return this.pageIndex + 1;
},
/**
* @return {number} The number of degrees the page is rotated clockwise.
@ -4382,14 +4416,13 @@ var PDFPageProxy = (function PDFPageProxyClosure() { @@ -4382,14 +4416,13 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
* annotation objects.
*/
getAnnotations: function PDFPageProxy_getAnnotations() {
if (this.annotationsCapability) {
return this.annotationsCapability.promise;
if (this.annotationsPromise) {
return this.annotationsPromise;
}
var capability = createPromiseCapability();
this.annotationsCapability = capability;
this.transport.getAnnotations(this.pageInfo.pageIndex);
return capability.promise;
var promise = this.transport.getAnnotations(this.pageIndex);
this.annotationsPromise = promise;
return promise;
},
/**
* Begins the process of rendering a page to the desired context.
@ -4485,15 +4518,9 @@ var PDFPageProxy = (function PDFPageProxyClosure() { @@ -4485,15 +4518,9 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
* object that represent the page text content.
*/
getTextContent: function PDFPageProxy_getTextContent() {
return new Promise(function (resolve) {
this.transport.messageHandler.send('GetTextContent', {
return this.transport.messageHandler.sendWithPromise('GetTextContent', {
pageIndex: this.pageNumber - 1
},
function textContentCallback(textContent) {
resolve(textContent);
}
);
}.bind(this));
});
},
/**
* Destroys resources allocated by the page.
@ -4521,6 +4548,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() { @@ -4521,6 +4548,7 @@ var PDFPageProxy = (function PDFPageProxyClosure() {
delete this.intentStates[intent];
}, this);
this.objs.clear();
this.annotationsPromise = null;
this.pendingDestroy = false;
},
/**
@ -4576,7 +4604,7 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4576,7 +4604,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.commonObjs = new PDFObjects();
this.pageCache = [];
this.pageCapabilities = [];
this.pagePromises = [];
this.downloadInfoCapability = createPromiseCapability();
this.passwordCallback = null;
@ -4620,7 +4648,7 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4620,7 +4648,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
// Some versions of Opera throw a DATA_CLONE_ERR on serializing the
// typed array. Also, checking if we can use transfers.
try {
messageHandler.send('test', testObj, null, [testObj.buffer]);
messageHandler.send('test', testObj, [testObj.buffer]);
} catch (ex) {
info('Cannot use postMessage transfers');
testObj[0] = 0;
@ -4642,9 +4670,9 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4642,9 +4670,9 @@ var WorkerTransport = (function WorkerTransportClosure() {
WorkerTransport.prototype = {
destroy: function WorkerTransport_destroy() {
this.pageCache = [];
this.pageCapabilities = [];
this.pagePromises = [];
var self = this;
this.messageHandler.send('Terminate', null, function () {
this.messageHandler.sendWithPromise('Terminate', null).then(function () {
FontLoader.clear();
if (self.worker) {
self.worker.terminate();
@ -4756,20 +4784,6 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4756,20 +4784,6 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.downloadInfoCapability.resolve(data);
}, this);
messageHandler.on('GetPage', function transportPage(data) {
var pageInfo = data.pageInfo;
var page = new PDFPageProxy(pageInfo, this);
this.pageCache[pageInfo.pageIndex] = page;
var promise = this.pageCapabilities[pageInfo.pageIndex];
promise.resolve(page);
}, this);
messageHandler.on('GetAnnotations', function transportAnnotations(data) {
var annotations = data.annotations;
var promise = this.pageCache[data.pageIndex].annotationsCapability;
promise.resolve(annotations);
}, this);
messageHandler.on('StartRenderPage', function transportRender(data) {
var page = this.pageCache[data.pageIndex];
@ -4863,9 +4877,9 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4863,9 +4877,9 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.workerReadyCapability.reject(data);
}, this);
messageHandler.on('PageError', function transportError(data, intent) {
messageHandler.on('PageError', function transportError(data) {
var page = this.pageCache[data.pageNum - 1];
var intentState = page.intentStates[intent];
var intentState = page.intentStates[data.intent];
if (intentState.displayReadyCapability.promise) {
intentState.displayReadyCapability.reject(data.error);
} else {
@ -4873,15 +4887,17 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4873,15 +4887,17 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
}, this);
messageHandler.on('JpegDecode', function(data, deferred) {
messageHandler.on('JpegDecode', function(data) {
var imageUrl = data[0];
var components = data[1];
if (components != 3 && components != 1) {
error('Only 3 component or 1 component can be returned');
return Promise.reject(
new Error('Only 3 components or 1 component can be returned'));
}
return new Promise(function (resolve, reject) {
var img = new Image();
img.onload = (function messageHandler_onloadClosure() {
img.onload = function () {
var width = img.width;
var height = img.height;
var size = width * height;
@ -4904,10 +4920,14 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4904,10 +4920,14 @@ var WorkerTransport = (function WorkerTransportClosure() {
buf[j] = data[i];
}
}
deferred.resolve({ data: buf, width: width, height: height});
}).bind(this);
resolve({ data: buf, width: width, height: height});
};
img.onerror = function () {
reject(new Error('JpegDecode failed to load image'));
};
img.src = imageUrl;
});
});
},
fetchDocument: function WorkerTransport_fetchDocument(source) {
@ -4938,86 +4958,58 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -4938,86 +4958,58 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
var pageIndex = pageNumber - 1;
if (pageIndex in this.pageCapabilities) {
return this.pageCapabilities[pageIndex].promise;
}
capability = createPromiseCapability();
this.pageCapabilities[pageIndex] = capability;
this.messageHandler.send('GetPageRequest', { pageIndex: pageIndex });
return capability.promise;
if (pageIndex in this.pagePromises) {
return this.pagePromises[pageIndex];
}
var promise = this.messageHandler.sendWithPromise('GetPage', {
pageIndex: pageIndex
}).then(function (pageInfo) {
var page = new PDFPageProxy(pageIndex, pageInfo, this);
this.pageCache[pageIndex] = page;
return page;
}.bind(this));
this.pagePromises[pageIndex] = promise;
return promise;
},
getPageIndex: function WorkerTransport_getPageIndexByRef(ref) {
return new Promise(function (resolve) {
this.messageHandler.send('GetPageIndex', { ref: ref },
function (pageIndex) {
resolve(pageIndex);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetPageIndex', { ref: ref });
},
getAnnotations: function WorkerTransport_getAnnotations(pageIndex) {
this.messageHandler.send('GetAnnotationsRequest',
return this.messageHandler.sendWithPromise('GetAnnotations',
{ pageIndex: pageIndex });
},
getDestinations: function WorkerTransport_getDestinations() {
return new Promise(function (resolve) {
this.messageHandler.send('GetDestinations', null,
function transportDestinations(destinations) {
resolve(destinations);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetDestinations', null);
},
getAttachments: function WorkerTransport_getAttachments() {
return new Promise(function (resolve) {
this.messageHandler.send('GetAttachments', null,
function transportAttachments(attachments) {
resolve(attachments);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetAttachments', null);
},
getJavaScript: function WorkerTransport_getJavaScript() {
return new Promise(function (resolve) {
this.messageHandler.send('GetJavaScript', null,
function transportJavaScript(js) {
resolve(js);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetJavaScript', null);
},
getOutline: function WorkerTransport_getOutline() {
return new Promise(function (resolve) {
this.messageHandler.send('GetOutline', null,
function transportOutline(outline) {
resolve(outline);
}
);
}.bind(this));
return this.messageHandler.sendWithPromise('GetOutline', null);
},
getMetadata: function WorkerTransport_getMetadata() {
return new Promise(function (resolve) {
this.messageHandler.send('GetMetadata', null,
function transportMetadata(results) {
resolve({
return this.messageHandler.sendWithPromise('GetMetadata', null).
then(function transportMetadata(results) {
return {
info: results[0],
metadata: (results[1] ? new PDFJS.Metadata(results[1]) : null)
};
});
}
);
}.bind(this));
},
startCleanup: function WorkerTransport_startCleanup() {
this.messageHandler.send('Cleanup', null,
function endCleanup() {
this.messageHandler.sendWithPromise('Cleanup', null).
then(function endCleanup() {
for (var i = 0, ii = this.pageCache.length; i < ii; i++) {
var page = this.pageCache[i];
if (page) {
@ -5026,8 +5018,7 @@ var WorkerTransport = (function WorkerTransportClosure() { @@ -5026,8 +5018,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
this.commonObjs.clear();
FontLoader.clear();
}.bind(this)
);
}.bind(this));
}
};
return WorkerTransport;

178
build/pdf.worker.js vendored
Unescape View File

@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') { @@ -21,8 +21,8 @@ if (typeof PDFJS === 'undefined') {
(typeof window !== 'undefined' ? window : this).PDFJS = {};
}
PDFJS.version = '1.0.194';
PDFJS.build = '36c6bc2';
PDFJS.version = '1.0.197';
PDFJS.build = '44cd0f4';
(function pdfjsWrapper() {
// Use strict in our context only - users might not want it
@ -1439,7 +1439,7 @@ function MessageHandler(name, comObj) { @@ -1439,7 +1439,7 @@ function MessageHandler(name, comObj) {
this.comObj = comObj;
this.callbackIndex = 1;
this.postMessageTransfers = true;
var callbacks = this.callbacks = {};
var callbacksCapabilities = this.callbacksCapabilities = {};
var ah = this.actionHandler = {};
ah['console_log'] = [function ahConsoleLog(data) {
@ -1456,35 +1456,40 @@ function MessageHandler(name, comObj) { @@ -1456,35 +1456,40 @@ function MessageHandler(name, comObj) {
var data = event.data;
if (data.isReply) {
var callbackId = data.callbackId;
if (data.callbackId in callbacks) {
var callback = callbacks[callbackId];
delete callbacks[callbackId];
callback(data.data);
if (data.callbackId in callbacksCapabilities) {
var callback = callbacksCapabilities[callbackId];
delete callbacksCapabilities[callbackId];
if ('error' in data) {
callback.reject(data.error);
} else {
callback.resolve(data.data);
}
} else {
error('Cannot resolve callback ' + callbackId);
}
} else if (data.action in ah) {
var action = ah[data.action];
if (data.callbackId) {
var deferred = {};
var promise = new Promise(function (resolve, reject) {
deferred.resolve = resolve;
deferred.reject = reject;
Promise.resolve().then(function () {
return action[0].call(action[1], data.data);
}).then(function (result) {
comObj.postMessage({
isReply: true,
callbackId: data.callbackId,
data: result
});
deferred.promise = promise;
promise.then(function(resolvedData) {
}, function (reason) {
comObj.postMessage({
isReply: true,
callbackId: data.callbackId,
data: resolvedData
error: reason
});
});
action[0].call(action[1], data.data, deferred);
} else {
action[0].call(action[1], data.data);
}
} else {
error('Unkown action from worker: ' + data.action);
error('Unknown action from worker: ' + data.action);
}
};
}
@ -1501,19 +1506,47 @@ MessageHandler.prototype = { @@ -1501,19 +1506,47 @@ MessageHandler.prototype = {
* Sends a message to the comObj to invoke the action with the supplied data.
* @param {String} actionName Action to call.
* @param {JSON} data JSON data to send.
* @param {function} [callback] Optional callback that will handle a reply.
* @param {Array} [transfers] Optional list of transfers/ArrayBuffers
*/
send: function messageHandlerSend(actionName, data, callback, transfers) {
send: function messageHandlerSend(actionName, data, transfers) {
var message = {
action: actionName,
data: data
};
if (callback) {
this.postMessage(message, transfers);
},
/**
* Sends a message to the comObj to invoke the action with the supplied data.
* Expects that other side will callback with the response.
* @param {String} actionName Action to call.
* @param {JSON} data JSON data to send.
* @param {Array} [transfers] Optional list of transfers/ArrayBuffers.
* @returns {Promise} Promise to be resolved with response data.
*/
sendWithPromise:
function messageHandlerSendWithPromise(actionName, data, transfers) {
var callbackId = this.callbackIndex++;
this.callbacks[callbackId] = callback;
message.callbackId = callbackId;
var message = {
action: actionName,
data: data,
callbackId: callbackId
};
var capability = createPromiseCapability();
this.callbacksCapabilities[callbackId] = capability;
try {
this.postMessage(message, transfers);
} catch (e) {
capability.reject(e);
}
return capability.promise;
},
/**
* Sends raw message to the comObj.
* @private
* @param message {Object} Raw message.
* @param transfers List of transfers/ArrayBuffers, or undefined.
*/
postMessage: function (message, transfers) {
if (transfers && this.postMessageTransfers) {
this.comObj.postMessage(message, transfers);
} else {
@ -15644,7 +15677,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() { @@ -15644,7 +15677,7 @@ var PartialEvaluator = (function PartialEvaluatorClosure() {
then(function(imageObj) {
var imgData = imageObj.createImageData(/* forceRGBA = */ false);
self.handler.send('obj', [objId, self.pageIndex, 'Image', imgData],
null, [imgData.data.buffer]);
[imgData.data.buffer]);
}).then(null, function (reason) {
warn('Unable to decode image: ' + reason);
self.handler.send('obj', [objId, self.pageIndex, 'Image', null]);
@ -17042,7 +17075,7 @@ var OperatorList = (function OperatorListClosure() { @@ -17042,7 +17075,7 @@ var OperatorList = (function OperatorListClosure() {
},
pageIndex: this.pageIndex,
intent: this.intent
}, null, transfers);
}, transfers);
this.dependencies = {};
this.fnArray.length = 0;
this.argsArray.length = 0;
@ -30383,14 +30416,11 @@ var PDFImage = (function PDFImageClosure() { @@ -30383,14 +30416,11 @@ var PDFImage = (function PDFImageClosure() {
var colorSpace = dict.get('ColorSpace', 'CS');
colorSpace = ColorSpace.parse(colorSpace, xref, res);
var numComps = colorSpace.numComps;
var resolvePromise;
handler.send('JpegDecode', [image.getIR(), numComps], function(message) {
var decodePromise = handler.sendWithPromise('JpegDecode',
[image.getIR(), numComps]);
return decodePromise.then(function (message) {
var data = message.data;
var stream = new Stream(data, 0, data.length, image.dict);
resolvePromise(stream);
});
return new Promise(function (resolve) {
resolvePromise = resolve;
return new Stream(data, 0, data.length, image.dict);
});
} else {
return Promise.resolve(image);
@ -37619,81 +37649,64 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = { @@ -37619,81 +37649,64 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
}, onFailure);
});
handler.on('GetPageRequest', function wphSetupGetPage(data) {
var pageIndex = data.pageIndex;
pdfManager.getPage(pageIndex).then(function(page) {
handler.on('GetPage', function wphSetupGetPage(data) {
return pdfManager.getPage(data.pageIndex).then(function(page) {
var rotatePromise = pdfManager.ensure(page, 'rotate');
var refPromise = pdfManager.ensure(page, 'ref');
var viewPromise = pdfManager.ensure(page, 'view');
Promise.all([rotatePromise, refPromise, viewPromise]).then(
return Promise.all([rotatePromise, refPromise, viewPromise]).then(
function(results) {
var page = {
pageIndex: data.pageIndex,
return {
rotate: results[0],
ref: results[1],
view: results[2]
};
handler.send('GetPage', { pageInfo: page });
});
});
});
handler.on('GetPageIndex', function wphSetupGetPageIndex(data, deferred) {
handler.on('GetPageIndex', function wphSetupGetPageIndex(data) {
var ref = new Ref(data.ref.num, data.ref.gen);
var catalog = pdfManager.pdfDocument.catalog;
catalog.getPageIndex(ref).then(function (pageIndex) {
deferred.resolve(pageIndex);
}, deferred.reject);
return catalog.getPageIndex(ref);
});
handler.on('GetDestinations',
function wphSetupGetDestinations(data, deferred) {
pdfManager.ensureCatalog('destinations').then(function(destinations) {
deferred.resolve(destinations);
});
function wphSetupGetDestinations(data) {
return pdfManager.ensureCatalog('destinations');
}
);
handler.on('GetAttachments',
function wphSetupGetAttachments(data, deferred) {
pdfManager.ensureCatalog('attachments').then(function(attachments) {
deferred.resolve(attachments);
}, deferred.reject);
function wphSetupGetAttachments(data) {
return pdfManager.ensureCatalog('attachments');
}
);
handler.on('GetJavaScript',
function wphSetupGetJavaScript(data, deferred) {
pdfManager.ensureCatalog('javaScript').then(function (js) {
deferred.resolve(js);
}, deferred.reject);
function wphSetupGetJavaScript(data) {
return pdfManager.ensureCatalog('javaScript');
}
);
handler.on('GetOutline',
function wphSetupGetOutline(data, deferred) {
pdfManager.ensureCatalog('documentOutline').then(function (outline) {
deferred.resolve(outline);
}, deferred.reject);
function wphSetupGetOutline(data) {
return pdfManager.ensureCatalog('documentOutline');
}
);
handler.on('GetMetadata',
function wphSetupGetMetadata(data, deferred) {
Promise.all([pdfManager.ensureDoc('documentInfo'),
pdfManager.ensureCatalog('metadata')]).then(
function (results) {
deferred.resolve(results);
}, deferred.reject);
function wphSetupGetMetadata(data) {
return Promise.all([pdfManager.ensureDoc('documentInfo'),
pdfManager.ensureCatalog('metadata')]);
}
);
handler.on('GetData', function wphSetupGetData(data, deferred) {
handler.on('GetData', function wphSetupGetData(data) {
pdfManager.requestLoadedStream();
pdfManager.onLoadedStream().then(function(stream) {
deferred.resolve(stream.bytes);
return pdfManager.onLoadedStream().then(function(stream) {
return stream.bytes;
});
});
@ -37701,16 +37714,9 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = { @@ -37701,16 +37714,9 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
pdfManager.updatePassword(data);
});
handler.on('GetAnnotationsRequest', function wphSetupGetAnnotations(data) {
pdfManager.getPage(data.pageIndex).then(function(page) {
pdfManager.ensure(page, 'getAnnotationsData', []).then(
function(annotationsData) {
handler.send('GetAnnotations', {
pageIndex: data.pageIndex,
annotations: annotationsData
});
}
);
handler.on('GetAnnotations', function wphSetupGetAnnotations(data) {
return pdfManager.getPage(data.pageIndex).then(function(page) {
return pdfManager.ensure(page, 'getAnnotationsData', []);
});
});
@ -37759,29 +37765,25 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = { @@ -37759,29 +37765,25 @@ var WorkerMessageHandler = PDFJS.WorkerMessageHandler = {
});
}, this);
handler.on('GetTextContent', function wphExtractText(data, deferred) {
pdfManager.getPage(data.pageIndex).then(function(page) {
handler.on('GetTextContent', function wphExtractText(data) {
return pdfManager.getPage(data.pageIndex).then(function(page) {
var pageNum = data.pageIndex + 1;
var start = Date.now();
page.extractTextContent().then(function(textContent) {
deferred.resolve(textContent);
return page.extractTextContent().then(function(textContent) {
info('text indexing: page=' + pageNum + ' - time=' +
(Date.now() - start) + 'ms');
}, function (e) {
// Skip errored pages
deferred.reject(e);
return textContent;
});
});
});
handler.on('Cleanup', function wphCleanup(data, deferred) {
handler.on('Cleanup', function wphCleanup(data) {
pdfManager.cleanup();
deferred.resolve(true);
return true;
});
handler.on('Terminate', function wphTerminate(data, deferred) {
handler.on('Terminate', function wphTerminate(data) {
pdfManager.terminate();
deferred.resolve();
});
}
};

2
package.json
Unescape View File

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
{
"name": "pdfjs-dist",
"version": "1.0.194",
"version": "1.0.197",
"description": "Generic build of Mozilla's PDF.js library.",
"keywords": [
"Mozilla",

Write Preview
Loading…
Cancel
Save