Merge pull request #711 from jviereck/worker_feature

Feature detection
2011-11-02 15:16:31 -07:00 · 2011-11-02 15:16:31 -07:00 · 43dbc3a84d
commit 43dbc3a84d
parent 0f7141e2a3 50fe4f55e2
8 changed files with 123 additions and 63 deletions
--- a/examples/helloworld/index.html
+++ b/examples/helloworld/index.html
@ -3,27 +3,33 @@

 <head>
  <!-- In production, only one script (pdf.js) is necessary -->
-  <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>  
+  <!-- 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>
+  <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">
+    // 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>  
+</head>

 <body>
  <canvas id="the-canvas" style="border:1px solid black;"/>
--- a/src/core.js
+++ b/src/core.js
@ -472,7 +472,18 @@ var PDFDoc = (function pdfDoc() {
    this.pageCache = [];

    if (useWorker) {
-      var worker = new Worker('../src/worker_loader.js');
+      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 = {
--- a/src/pdf.js
+++ b/src/pdf.js
@ -4,12 +4,11 @@
 var PDFJS = {};

 (function pdfjsWrapper() {
-
  // Use strict in our context only - users might not want it
  'use strict';

  // Files are inserted below - see Makefile
  /* PDFJSSCRIPT_INCLUDE_ALL */

-})();
+}).call((typeof window === 'undefined') ? this : window);

--- a/src/worker.js
+++ b/src/worker.js
@ -47,6 +47,13 @@ var WorkerProcessorHandler = {
  setup: function wphSetup(handler) {
    var pdfDoc = null;

+    handler.on('workerSrc', function wphSetupWorkerSrc(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 wphSetupDoc(data) {
      // Create only the model of the PDFDoc, which is enough for
      // processing the content of the pdf.
@ -176,8 +183,7 @@ var workerConsole = {
 if (typeof window === 'undefined') {
  globalScope.console = workerConsole;

-  // Listen for messages from the main thread.
-  var handler = new MessageHandler('worker_processor', globalScope);
+  var handler = new MessageHandler('worker_processor', this);
  WorkerProcessorHandler.setup(handler);
 }

--- a/src/worker_loader.js
+++ b/src/worker_loader.js
@ -3,22 +3,50 @@

 'use strict';

-importScripts('../src/core.js');
-importScripts('../src/util.js');
-importScripts('../src/canvas.js');
-importScripts('../src/obj.js');
-importScripts('../src/function.js');
-importScripts('../src/charsets.js');
-importScripts('../src/cidmaps.js');
-importScripts('../src/colorspace.js');
-importScripts('../src/crypto.js');
-importScripts('../src/evaluator.js');
-importScripts('../src/fonts.js');
-importScripts('../src/glyphlist.js');
-importScripts('../src/image.js');
-importScripts('../src/metrics.js');
-importScripts('../src/parser.js');
-importScripts('../src/pattern.js');
-importScripts('../src/stream.js');
-importScripts('../src/worker.js');
+function onMessageLoader(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.
+  this.onmessage = null;

+  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 = [
+    'core.js',
+    'util.js',
+    'canvas.js',
+    'obj.js',
+    'function.js',
+    'charsets.js',
+    'cidmaps.js',
+    'colorspace.js',
+    'crypto.js',
+    'evaluator.js',
+    'fonts.js',
+    'glyphlist.js',
+    'image.js',
+    'metrics.js',
+    'parser.js',
+    'pattern.js',
+    'stream.js',
+    'worker.js'
+  ];
+
+  // Load all the files.
+  for (var i = 0; i < files.length; i++) {
+    importScripts(dir + files[i]);
+  }
+}
+
+this.onmessage = onMessageLoader.bind(this);
--- 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>
--- a/web/viewer-snippet.html
+++ b/web/viewer-snippet.html
@ -1,2 +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.
+  PDFJS.workerSrc = "../build/pdf.js";
+</script>
--- a/web/viewer.html
+++ b/web/viewer.html
@ -3,10 +3,10 @@
    <head>
        <title>Simple pdf.js page viewer</title>
        <link rel="stylesheet" href="viewer.css"/>
+
        <script type="text/javascript" src="compatibility.js"></script>
-        
+
        <!-- PDFJSSCRIPT_INCLUDE_BUILD -->
-        
        <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 -->
@ -26,6 +26,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="viewer.js"></script>
  </head>

@ -114,7 +116,7 @@
        </div>
     </div>
    </div>
-    
+
    <div id="loading">Loading... 0%</div>
    <div id="viewer"></div>
  </body>