Rename processorHandler to messageHandler
This commit is contained in:
parent
80b759b093
commit
d9d2ab4c8e
30
src/core.js
30
src/core.js
@ -484,22 +484,22 @@ var PDFDoc = (function pdfDoc() {
|
|||||||
|
|
||||||
var worker = new Worker(workerSrc);
|
var worker = new Worker(workerSrc);
|
||||||
|
|
||||||
var processorHandler = new MessageHandler('main', worker);
|
var messageHandler = new MessageHandler('main', worker);
|
||||||
|
|
||||||
// Tell the worker the file it was created from.
|
// Tell the worker the file it was created from.
|
||||||
processorHandler.send('workerSrc', workerSrc);
|
messageHandler.send('workerSrc', workerSrc);
|
||||||
|
|
||||||
processorHandler.on('test', function pdfDocTest(supportTypedArray) {
|
messageHandler.on('test', function pdfDocTest(supportTypedArray) {
|
||||||
if (supportTypedArray) {
|
if (supportTypedArray) {
|
||||||
this.worker = worker;
|
this.worker = worker;
|
||||||
this.setupProcessorHandler(processorHandler);
|
this.setupMessageHandler(messageHandler);
|
||||||
} else {
|
} else {
|
||||||
this.setupFakeWorker();
|
this.setupFakeWorker();
|
||||||
}
|
}
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
|
|
||||||
var testObj = new Uint8Array(1);
|
var testObj = new Uint8Array(1);
|
||||||
processorHandler.send('test', testObj);
|
messageHandler.send('test', testObj);
|
||||||
} else {
|
} else {
|
||||||
this.setupFakeWorker();
|
this.setupFakeWorker();
|
||||||
}
|
}
|
||||||
@ -517,19 +517,19 @@ var PDFDoc = (function pdfDoc() {
|
|||||||
terminate: function pdfDocTerminate() {}
|
terminate: function pdfDocTerminate() {}
|
||||||
};
|
};
|
||||||
|
|
||||||
var processorHandler = new MessageHandler('main', fakeWorker);
|
var messageHandler = new MessageHandler('main', fakeWorker);
|
||||||
this.setupProcessorHandler(processorHandler);
|
this.setupMessageHandler(messageHandler);
|
||||||
|
|
||||||
// If the main thread is our worker, setup the handling for the messages
|
// If the main thread is our worker, setup the handling for the messages
|
||||||
// the main thread sends to it self.
|
// the main thread sends to it self.
|
||||||
WorkerProcessorHandler.setup(processorHandler);
|
WorkerMessageHandler.setup(messageHandler);
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
||||||
setupProcessorHandler: function(processorHandler) {
|
setupMessageHandler: function(messageHandler) {
|
||||||
this.processorHandler = processorHandler;
|
this.messageHandler = messageHandler;
|
||||||
|
|
||||||
processorHandler.on('page', function pdfDocPage(data) {
|
messageHandler.on('page', function pdfDocPage(data) {
|
||||||
var pageNum = data.pageNum;
|
var pageNum = data.pageNum;
|
||||||
var page = this.pageCache[pageNum];
|
var page = this.pageCache[pageNum];
|
||||||
var depFonts = data.depFonts;
|
var depFonts = data.depFonts;
|
||||||
@ -537,7 +537,7 @@ var PDFDoc = (function pdfDoc() {
|
|||||||
page.startRenderingFromIRQueue(data.IRQueue, depFonts);
|
page.startRenderingFromIRQueue(data.IRQueue, depFonts);
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
processorHandler.on('obj', function pdfDocObj(data) {
|
messageHandler.on('obj', function pdfDocObj(data) {
|
||||||
var id = data[0];
|
var id = data[0];
|
||||||
var type = data[1];
|
var type = data[1];
|
||||||
|
|
||||||
@ -581,7 +581,7 @@ var PDFDoc = (function pdfDoc() {
|
|||||||
}
|
}
|
||||||
}, this);
|
}, this);
|
||||||
|
|
||||||
processorHandler.on('font_ready', function pdfDocFontReady(data) {
|
messageHandler.on('font_ready', function pdfDocFontReady(data) {
|
||||||
var id = data[0];
|
var id = data[0];
|
||||||
var font = new FontShape(data[1]);
|
var font = new FontShape(data[1]);
|
||||||
|
|
||||||
@ -594,7 +594,7 @@ var PDFDoc = (function pdfDoc() {
|
|||||||
}.bind(this));
|
}.bind(this));
|
||||||
|
|
||||||
setTimeout(function pdfDocFontReadySetTimeout() {
|
setTimeout(function pdfDocFontReadySetTimeout() {
|
||||||
processorHandler.send('doc', this.data);
|
messageHandler.send('doc', this.data);
|
||||||
this.workerReadyPromise.resolve(true);
|
this.workerReadyPromise.resolve(true);
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
},
|
},
|
||||||
@ -606,7 +606,7 @@ var PDFDoc = (function pdfDoc() {
|
|||||||
startRendering: function pdfDocStartRendering(page) {
|
startRendering: function pdfDocStartRendering(page) {
|
||||||
// The worker might not be ready to receive the page request yet.
|
// The worker might not be ready to receive the page request yet.
|
||||||
this.workerReadyPromise.then(function pdfDocStartRenderingThen() {
|
this.workerReadyPromise.then(function pdfDocStartRenderingThen() {
|
||||||
this.processorHandler.send('page_request', page.pageNumber + 1);
|
this.messageHandler.send('page_request', page.pageNumber + 1);
|
||||||
}.bind(this));
|
}.bind(this));
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@ MessageHandler.prototype = {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
var WorkerProcessorHandler = {
|
var WorkerMessageHandler = {
|
||||||
setup: function wphSetup(handler) {
|
setup: function wphSetup(handler) {
|
||||||
var pdfDoc = null;
|
var pdfDoc = null;
|
||||||
|
|
||||||
@ -188,6 +188,6 @@ if (typeof window === 'undefined') {
|
|||||||
globalScope.console = workerConsole;
|
globalScope.console = workerConsole;
|
||||||
|
|
||||||
var handler = new MessageHandler('worker_processor', this);
|
var handler = new MessageHandler('worker_processor', this);
|
||||||
WorkerProcessorHandler.setup(handler);
|
WorkerMessageHandler.setup(handler);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user