Address review comments. Use only one PDFJS.workerSrc variable to spe…

…cify the worker source
tonytlwu · Nov 1, 2011 · 3b7829d · 3b7829d
1 parent 1e6d1f9
commit 3b7829d
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 51 deletions.
diff --git a/examples/helloworld/hello.js b/examples/helloworld/hello.js
@@ -7,7 +7,7 @@
 
 'use strict';
 
-getPdf('helloworld.pdf', function getPdfHelloWorld(data) {
+PDFJS.getPdf('helloworld.pdf', function getPdfHelloWorld(data) {
   //
   // Instantiate PDFDoc with PDF data
   //

diff --git a/examples/helloworld/index.html b/examples/helloworld/index.html
@@ -3,6 +3,7 @@
 
 <head>
   <!-- In production, only one script (pdf.js) is necessary -->
+  <!-- In production, change the content of PDFJS.workerSrc below -->
   <script type="text/javascript" src="../../src/core.js"></script>
   <script type="text/javascript" src="../../src/util.js"></script>
   <script type="text/javascript" src="../../src/canvas.js"></script>
@@ -23,9 +24,9 @@
   <script type="text/javascript" src="../../src/worker.js"></script>
 
   <script type="text/javascript">
-    // Specify the directory of the source files, such that the web worker
-    // knows where to load them.
-    var PDFJS_WORKER_DIR = '../../src/';
+    // Specify the main script used to create a new PDF.JS web worker.
+    // In production, change this to point to the combined `pdf.js` file.
+    PDFJS.workerSrc = '../../src/worker_loader.js';
   </script>
   <script type="text/javascript" src="hello.js"></script>
 </head>

diff --git a/src/core.js b/src/core.js
@@ -471,26 +471,18 @@ var PDFDoc = (function() {
     this.pageCache = [];
 
     if (useWorker) {
-      var worker;
-      if (typeof PDFJS_WORKER_DIR !== 'undefined') {
-        // If `PDFJS_WORKER_DIR` is specified, we assume the pdf.js files
-        // located all in that directory. Create a new worker and tell him
-        // the directory, such that he can load the scripts from there.
-        worker = new Worker(PDFJS_WORKER_DIR + 'worker_loader.js');
-        console.log('main: post dir');
-
-        worker.postMessage(PDFJS_WORKER_DIR);
-      } else if (typeof PDFJS_WORKER_FILE !== 'undefined') {
-        // If we build the worker using a worker file, then we assume, that
-        // everything the worker needs is already included in that file.
-        // Therefore the worker doesn't have to call `importScripts` to load
-        // all the single files and therefore it's not necessary to tell the
-        // worker a directory to laod the js files from.
-        // (Which is different from the PDFJS_WORKER_DIR case above.)
-        worker = new Worker(PDFJS_WORKER_FILE);
-      } else {
-        throw 'No worker file or directory specified.';
+      var workerSrc = PDFJS.workerSrc;
+      if (typeof workerSrc === 'undefined') {
+        throw 'No PDFJS.workerSrc specified';
       }
+
+      var worker = new Worker(workerSrc);
+
+      // Tell the worker the file it was created from.
+      worker.postMessage({
+        action: 'workerSrc',
+        data: workerSrc
+      });
     } else {
       // If we don't use a worker, just post/sendMessage to the main thread.
       var worker = {

diff --git a/src/pdf.js b/src/pdf.js
@@ -10,5 +10,5 @@ var PDFJS = {};
   // Files are inserted below - see Makefile
   /* PDFJSSCRIPT_INCLUDE_ALL */
 
-})();
+}).call((typeof window === 'undefined') ? this : window);
 
diff --git a/src/worker.js b/src/worker.js
@@ -47,6 +47,13 @@ var WorkerProcessorHandler = {
   setup: function(handler) {
     var pdfDoc = null;
 
+    handler.on('workerSrc', function(data) {
+      // In development, the `workerSrc` message is handled in the
+      // `worker_loader.js` file. In production the workerProcessHandler is
+      // called for this. This servers as a dummy to prevent calling an
+      // undefined action `workerSrc`.
+    });
+
     handler.on('doc', function(data) {
       // Create only the model of the PDFDoc, which is enough for
       // processing the content of the pdf.
@@ -174,7 +181,7 @@ var workerConsole = {
 
 // Worker thread?
 if (typeof window === 'undefined') {
-  this.console = workerConsole;
+  globalScope.console = workerConsole;
 
   var handler = new MessageHandler('worker_processor', this);
   WorkerProcessorHandler.setup(handler);

diff --git a/src/worker_loader.js b/src/worker_loader.js
@@ -7,11 +7,19 @@ this.onmessage = function(evt) {
   // Reset the `onmessage` function as it was only set to call
   // this function the first time a message is passed to the worker
   // but shouldn't get called anytime afterwards.
-  delete this.onmessage;
+  this.onmessage = null;
 
-  // Directory the include files are contained is send as the
-  // first message to the worker.
-  var dir = evt.data;
+  if (evt.data.action !== 'workerSrc') {
+    throw 'Worker expects first message to be `workerSrc`';
+  }
+
+  // Content of `PDFJS.workerSrc` as defined on the main thread.
+  var workerSrc = evt.data.data;
+
+  // Extract the directory that contains the source files to load.
+  // Assuming the source files have the same relative possition as the
+  // `workerSrc` file.
+  var dir = workerSrc.substring(0, workerSrc.lastIndexOf('/') + 1);
 
   // List of files to include;
   var files = [

diff --git a/test/test_slave.html b/test/test_slave.html
@@ -3,25 +3,29 @@
   <head>
     <title>pdf.js test slave</title>
     <style type="text/css"></style>
-    <script type="text/javascript" src="/src/core.js"></script> 
-    <script type="text/javascript" src="/src/util.js"></script>  
-    <script type="text/javascript" src="/src/canvas.js"></script>  
-    <script type="text/javascript" src="/src/obj.js"></script>  
-    <script type="text/javascript" src="/src/function.js"></script> 
-    <script type="text/javascript" src="/src/charsets.js"></script>  
-    <script type="text/javascript" src="/src/cidmaps.js"></script>  
-    <script type="text/javascript" src="/src/colorspace.js"></script>  
-    <script type="text/javascript" src="/src/crypto.js"></script>  
-    <script type="text/javascript" src="/src/evaluator.js"></script>  
-    <script type="text/javascript" src="/src/fonts.js"></script>  
-    <script type="text/javascript" src="/src/glyphlist.js"></script>  
-    <script type="text/javascript" src="/src/image.js"></script>  
-    <script type="text/javascript" src="/src/metrics.js"></script>  
-    <script type="text/javascript" src="/src/parser.js"></script>  
-    <script type="text/javascript" src="/src/pattern.js"></script>  
-    <script type="text/javascript" src="/src/stream.js"></script>  
-    <script type="text/javascript" src="/src/worker.js"></script>  
+    <script type="text/javascript" src="/src/core.js"></script>
+    <script type="text/javascript" src="/src/util.js"></script>
+    <script type="text/javascript" src="/src/canvas.js"></script>
+    <script type="text/javascript" src="/src/obj.js"></script>
+    <script type="text/javascript" src="/src/function.js"></script>
+    <script type="text/javascript" src="/src/charsets.js"></script>
+    <script type="text/javascript" src="/src/cidmaps.js"></script>
+    <script type="text/javascript" src="/src/colorspace.js"></script>
+    <script type="text/javascript" src="/src/crypto.js"></script>
+    <script type="text/javascript" src="/src/evaluator.js"></script>
+    <script type="text/javascript" src="/src/fonts.js"></script>
+    <script type="text/javascript" src="/src/glyphlist.js"></script>
+    <script type="text/javascript" src="/src/image.js"></script>
+    <script type="text/javascript" src="/src/metrics.js"></script>
+    <script type="text/javascript" src="/src/parser.js"></script>
+    <script type="text/javascript" src="/src/pattern.js"></script>
+    <script type="text/javascript" src="/src/stream.js"></script>
+    <script type="text/javascript" src="/src/worker.js"></script>
     <script type="text/javascript" src="driver.js"></script>
+
+    <script type="text/javascript">
+      PDFJS.workerSrc = '/src/worker_loader.js';
+    </script>
   </head>
 
   <body>

diff --git a/web/viewer-snippet.html b/web/viewer-snippet.html
@@ -1,7 +1,6 @@
 <!-- This snippet is used in production, see Makefile -->
 <script type="text/javascript" src="../build/pdf.js"></script>
 <script type="text/javascript">
-  // This specifies the location of the pdf.js file. This is necessary to
-  // spawn the web worker.
-  var PDFJS_WORKER_FILE = "../build/pdf.js";
+  // This specifies the location of the pdf.js file.
+  PDFJS.workerSrc = "../build/pdf.js";
 </script>
diff --git a/web/viewer.html b/web/viewer.html
@@ -5,7 +5,6 @@
         <link rel="stylesheet" href="viewer.css"/>
 
         <!-- PDFJSSCRIPT_INCLUDE_BUILD -->
-        <script type="text/javascript">var PDFJS_WORKER_DIR = "../src/"</script> <!-- PDFJSSCRIPT_REMOVE -->
         <script type="text/javascript" src="../src/core.js"></script> <!-- PDFJSSCRIPT_REMOVE -->
         <script type="text/javascript" src="../src/util.js"></script>  <!-- PDFJSSCRIPT_REMOVE -->
         <script type="text/javascript" src="../src/canvas.js"></script>  <!-- PDFJSSCRIPT_REMOVE -->
@@ -25,6 +24,8 @@
         <script type="text/javascript" src="../src/stream.js"></script>  <!-- PDFJSSCRIPT_REMOVE -->
         <script type="text/javascript" src="../src/worker.js"></script>  <!-- PDFJSSCRIPT_REMOVE -->
 
+        <script type="text/javascript">PDFJS.workerSrc = '../../src/worker_loader.js';</script> <!-- PDFJSSCRIPT_REMOVE -->
+
         <script type="text/javascript" src="compatibility.js"></script>
         <script type="text/javascript" src="viewer.js"></script>
   </head>