From d9d2ab4c8e2e78cde7c2603522b1d20af793d8c7 Mon Sep 17 00:00:00 2001 From: Julian Viereck Date: Thu, 3 Nov 2011 15:30:53 +0100 Subject: [PATCH] Rename processorHandler to messageHandler --- src/core.js | 30 +++++++++++++++--------------- src/worker.js | 4 ++-- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/core.js b/src/core.js index 404d601da..ddf1cebbe 100644 --- a/src/core.js +++ b/src/core.js @@ -484,22 +484,22 @@ var PDFDoc = (function pdfDoc() { 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. - processorHandler.send('workerSrc', workerSrc); + messageHandler.send('workerSrc', workerSrc); - processorHandler.on('test', function pdfDocTest(supportTypedArray) { + messageHandler.on('test', function pdfDocTest(supportTypedArray) { if (supportTypedArray) { this.worker = worker; - this.setupProcessorHandler(processorHandler); + this.setupMessageHandler(messageHandler); } else { this.setupFakeWorker(); } }.bind(this)); var testObj = new Uint8Array(1); - processorHandler.send('test', testObj); + messageHandler.send('test', testObj); } else { this.setupFakeWorker(); } @@ -517,19 +517,19 @@ var PDFDoc = (function pdfDoc() { terminate: function pdfDocTerminate() {} }; - var processorHandler = new MessageHandler('main', fakeWorker); - this.setupProcessorHandler(processorHandler); + var messageHandler = new MessageHandler('main', fakeWorker); + this.setupMessageHandler(messageHandler); // If the main thread is our worker, setup the handling for the messages // the main thread sends to it self. - WorkerProcessorHandler.setup(processorHandler); + WorkerMessageHandler.setup(messageHandler); }, - setupProcessorHandler: function(processorHandler) { - this.processorHandler = processorHandler; + setupMessageHandler: function(messageHandler) { + this.messageHandler = messageHandler; - processorHandler.on('page', function pdfDocPage(data) { + messageHandler.on('page', function pdfDocPage(data) { var pageNum = data.pageNum; var page = this.pageCache[pageNum]; var depFonts = data.depFonts; @@ -537,7 +537,7 @@ var PDFDoc = (function pdfDoc() { page.startRenderingFromIRQueue(data.IRQueue, depFonts); }, this); - processorHandler.on('obj', function pdfDocObj(data) { + messageHandler.on('obj', function pdfDocObj(data) { var id = data[0]; var type = data[1]; @@ -581,7 +581,7 @@ var PDFDoc = (function pdfDoc() { } }, this); - processorHandler.on('font_ready', function pdfDocFontReady(data) { + messageHandler.on('font_ready', function pdfDocFontReady(data) { var id = data[0]; var font = new FontShape(data[1]); @@ -594,7 +594,7 @@ var PDFDoc = (function pdfDoc() { }.bind(this)); setTimeout(function pdfDocFontReadySetTimeout() { - processorHandler.send('doc', this.data); + messageHandler.send('doc', this.data); this.workerReadyPromise.resolve(true); }.bind(this)); }, @@ -606,7 +606,7 @@ var PDFDoc = (function pdfDoc() { startRendering: function pdfDocStartRendering(page) { // The worker might not be ready to receive the page request yet. this.workerReadyPromise.then(function pdfDocStartRenderingThen() { - this.processorHandler.send('page_request', page.pageNumber + 1); + this.messageHandler.send('page_request', page.pageNumber + 1); }.bind(this)); }, diff --git a/src/worker.js b/src/worker.js index 45a76e147..b6ea68741 100644 --- a/src/worker.js +++ b/src/worker.js @@ -43,7 +43,7 @@ MessageHandler.prototype = { } }; -var WorkerProcessorHandler = { +var WorkerMessageHandler = { setup: function wphSetup(handler) { var pdfDoc = null; @@ -188,6 +188,6 @@ if (typeof window === 'undefined') { globalScope.console = workerConsole; var handler = new MessageHandler('worker_processor', this); - WorkerProcessorHandler.setup(handler); + WorkerMessageHandler.setup(handler); }