Fix sending image data to main thread

diff --git a/canvas_proxy.js b/canvas_proxy.js
index e2795bd00ec03e5a41e44d26364ac2e7a3e6d704..d6f5a0a25b3c99adb4afa020cd3990e84aff287a 100644 (file)
--- a/canvas_proxy.js
+++ b/canvas_proxy.js
@@ -12,8 +12,11 @@ var JpegStreamProxy = (function() {
 
     // Tell the main thread to create an image.
     postMessage({
-      action: jpeg_stream,
-      data:   bytesToString(bytes)
+      action: "jpeg_stream",
+      data: {
+        id: this.id,
+        raw: bytesToString(bytes)
+      }
     });
   }
 

diff --git a/viewer.js b/viewer.js
index 41aaf354ca79db922c897a0e831f05013ffb78f2..d0aeb0b2dfc89fe62150dba371aba92c1fe4e552 100644 (file)
--- a/viewer.js
+++ b/viewer.js
@@ -10,7 +10,7 @@ function load(userInput) {
     pageNum = parseInt(queryParams().page) || 1;
     var fileName = userInput;
     if (!userInput) {
-      fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf";
+      fileName = "canvas.pdf";
     }
     open(fileName);
 }

diff --git a/worker_client.js b/worker_client.js
index 4af0d97648c053eb531246bf71f4e7d04aa173b4..385103c30ba37774625394e717a2c95ab796a5df 100644 (file)
--- a/worker_client.js
+++ b/worker_client.js
@@ -71,7 +71,7 @@ function WorkerPDFDoc(canvas) {
     "$drawImage": function(id, x, y, sx, sy, swidth, sheight) {
       var image = imagesList[id];
       if (!image) {
-        throw "Image not found";
+        throw "Image not found: " + id;
       }
       this.drawImage(image, x, y, image.width, image.height,
         sx, sy, swidth, sheight);
@@ -179,9 +179,8 @@ function WorkerPDFDoc(canvas) {
 
     "jpeg_stream": function(data) {
       var img = new Image();
-      img.src = "data:image/jpeg;base64," + window.btoa(data);
+      img.src = "data:image/jpeg;base64," + window.btoa(data.raw);
       imagesList[data.id] = img;
-      console.log("got image", data.id)
     },
     
     "canvas_proxy_cmd_queue": function(data) {