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

Move the workerPort from the global PDFJS object and into GlobalWorkerOptions instead

Browse Source
This commit is contained in:
Jonas Jenwald 2018-02-14 14:25:47 +01:00
parent 003bd4044b
commit 45adf33187
4 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
external/dist/webpack.js vendored
View File

@ -18,7 +18,7 @@ var pdfjs = require('./build/pdf.js');
var PdfjsWorker = require('worker-loader!./build/pdf.worker.js'); var PdfjsWorker = require('worker-loader!./build/pdf.worker.js');
if (typeof window !== 'undefined' && 'Worker' in window) { if (typeof window !== 'undefined' && 'Worker' in window) {
pdfjs.PDFJS.workerPort = new PdfjsWorker(); pdfjs.GlobalWorkerOptions.workerPort = new PdfjsWorker();
} }
module.exports = pdfjs; module.exports = pdfjs;

5
src/display/api.js
View File

@ -27,6 +27,7 @@ import {
import { FontFaceObject, FontLoader } from './font_loader'; import { FontFaceObject, FontLoader } from './font_loader';
import { CanvasGraphics } from './canvas'; import { CanvasGraphics } from './canvas';
import globalScope from '../shared/global_scope'; import globalScope from '../shared/global_scope';
import { GlobalWorkerOptions } from './worker_options';
import { Metadata } from './metadata'; import { Metadata } from './metadata';
import { PDFDataTransportStream } from './transport_stream'; import { PDFDataTransportStream } from './transport_stream';
import { WebGLContext } from './webgl'; import { WebGLContext } from './webgl';
@ -240,8 +241,8 @@ function getDocument(src) {
if (!worker) { if (!worker) {
// Worker was not provided -- creating and owning our own. If message port // Worker was not provided -- creating and owning our own. If message port
// is specified in global settings, using it. // is specified in global worker options, using it.
var workerPort = getDefaultSetting('workerPort'); let workerPort = GlobalWorkerOptions.workerPort;
worker = workerPort ? PDFWorker.fromPort(workerPort) : new PDFWorker(); worker = workerPort ? PDFWorker.fromPort(workerPort) : new PDFWorker();
task._worker = worker; task._worker = worker;
} }

2
src/display/dom_utils.js
View File

@ -351,8 +351,6 @@ function getDefaultSetting(id) {
return globalSettings ? globalSettings.cMapPacked : false; return globalSettings ? globalSettings.cMapPacked : false;
case 'postMessageTransfers': case 'postMessageTransfers':
return globalSettings ? globalSettings.postMessageTransfers : true; return globalSettings ? globalSettings.postMessageTransfers : true;
case 'workerPort':
return globalSettings ? globalSettings.workerPort : null;
case 'workerSrc': case 'workerSrc':
return globalSettings ? globalSettings.workerSrc : null; return globalSettings ? globalSettings.workerSrc : null;
case 'maxImageSize': case 'maxImageSize':

5
src/display/global.js
View File

@ -122,11 +122,6 @@ PDFJS.disableFontFace = (PDFJS.disableFontFace === undefined ?
*/ */
PDFJS.workerSrc = (PDFJS.workerSrc === undefined ? null : PDFJS.workerSrc); PDFJS.workerSrc = (PDFJS.workerSrc === undefined ? null : PDFJS.workerSrc);
/**
* Defines global port for worker process. Overrides `workerSrc` setting.
*/
PDFJS.workerPort = (PDFJS.workerPort === undefined ? null : PDFJS.workerPort);
/** /**
* Disable range request loading of PDF files. When enabled and if the server * Disable range request loading of PDF files. When enabled and if the server
* supports partial content requests then the PDF will be fetched in chunks. * supports partial content requests then the PDF will be fetched in chunks.