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

Remove the, now obsolete, handling of the CMapReaderFactory parameter in getDocument

Browse Source 
This special handling was added in PR 8567, but was made redundant in PR 8721 which stopped sending everything but the kitchen sink to the Worker side.
This commit is contained in:
Jonas Jenwald 2018-06-05 20:30:14 +02:00
parent c8e2163bbc
commit 871bf5c68b
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/display/api.js
View File

@ -231,7 +231,6 @@ function getDocument(src) {
let params = Object.create(null); let params = Object.create(null);
var rangeTransport = null; var rangeTransport = null;
let worker = null; let worker = null;
let CMapReaderFactory = DOMCMapReaderFactory;
for (var key in source) { for (var key in source) {
if (key === 'url' && typeof window !== 'undefined') { if (key === 'url' && typeof window !== 'undefined') {
@ -260,14 +259,12 @@ function getDocument(src) {
'data property.'); 'data property.');
} }
continue; continue;
} else if (key === 'CMapReaderFactory') {
CMapReaderFactory = source[key];
continue;
} }
params[key] = source[key]; params[key] = source[key];
} }
params.rangeChunkSize = params.rangeChunkSize || DEFAULT_RANGE_CHUNK_SIZE; params.rangeChunkSize = params.rangeChunkSize || DEFAULT_RANGE_CHUNK_SIZE;
params.CMapReaderFactory = params.CMapReaderFactory || DOMCMapReaderFactory;
params.ignoreErrors = params.stopAtErrors !== true; params.ignoreErrors = params.stopAtErrors !== true;
params.pdfBug = params.pdfBug === true; params.pdfBug = params.pdfBug === true;
@ -355,7 +352,7 @@ function getDocument(src) {
var messageHandler = new MessageHandler(docId, workerId, worker.port); var messageHandler = new MessageHandler(docId, workerId, worker.port);
messageHandler.postMessageTransfers = worker.postMessageTransfers; messageHandler.postMessageTransfers = worker.postMessageTransfers;
var transport = new WorkerTransport(messageHandler, task, networkStream, var transport = new WorkerTransport(messageHandler, task, networkStream,
params, CMapReaderFactory); params);
task._transport = transport; task._transport = transport;
messageHandler.send('Ready', null); messageHandler.send('Ready', null);
}); });
@ -387,7 +384,7 @@ function _fetchDocument(worker, source, pdfDataRangeTransport, docId) {
docId, docId,
apiVersion: (typeof PDFJSDev !== 'undefined' ? apiVersion: (typeof PDFJSDev !== 'undefined' ?
PDFJSDev.eval('BUNDLE_VERSION') : null), PDFJSDev.eval('BUNDLE_VERSION') : null),
source: { source: { // Only send the required properties, and *not* the entire object.
data: source.data, data: source.data,
url: source.url, url: source.url,
password: source.password, password: source.password,
@ -1614,14 +1611,13 @@ var PDFWorker = (function PDFWorkerClosure() {
* @ignore * @ignore
*/ */
var WorkerTransport = (function WorkerTransportClosure() { var WorkerTransport = (function WorkerTransportClosure() {
function WorkerTransport(messageHandler, loadingTask, networkStream, function WorkerTransport(messageHandler, loadingTask, networkStream, params) {
params, CMapReaderFactory) {
this.messageHandler = messageHandler; this.messageHandler = messageHandler;
this.loadingTask = loadingTask; this.loadingTask = loadingTask;
this.commonObjs = new PDFObjects(); this.commonObjs = new PDFObjects();
this.fontLoader = new FontLoader(loadingTask.docId); this.fontLoader = new FontLoader(loadingTask.docId);
this._params = params; this._params = params;
this.CMapReaderFactory = new CMapReaderFactory({ this.CMapReaderFactory = new params.CMapReaderFactory({
baseUrl: params.cMapUrl, baseUrl: params.cMapUrl,
isCompressed: params.cMapPacked, isCompressed: params.cMapPacked,
}); });