Sakurai/pdf.js
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing some smaller bugs & do some cleanup. viewer_worker.html UI is now

Browse Source
This commit is contained in:
Julian Viereck 2011-06-22 11:08:30 +02:00
parent 39ac389a7e
commit 52a117d32a
3 changed files with 89 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pdf.js
View File

@ -2867,7 +2867,7 @@ var CanvasGraphics = (function() {
this.ctx.scale(1, -1); this.ctx.scale(1, -1);
if (this.ctx.$showText) { if (this.ctx.$showText) {
this.ctx.$showText(this.current.y, Fonts.charsToUnicode(text)); this.ctx.$showText(this.current.y, text, Fonts.charsToUnicode(text));
} else { } else {
text = Fonts.charsToUnicode(text); text = Fonts.charsToUnicode(text);
this.ctx.translate(this.current.x, -1 * this.current.y); this.ctx.translate(this.current.x, -1 * this.current.y);
@ -3423,7 +3423,6 @@ var CanvasGraphics = (function() {
TODO("Images with "+ numComps + " components per pixel"); TODO("Images with "+ numComps + " components per pixel");
} }
} }
console.log("paintImageXObject", w, h);
tmpCanvas.putImageData(imgData, 0, 0); tmpCanvas.putImageData(imgData, 0, 0);
ctx.drawImage(tmpCanvas.getCanvas(), 0, -h); ctx.drawImage(tmpCanvas.getCanvas(), 0, -h);
this.restore(); this.restore();

84
viewer_worker.html
View File

@ -2,6 +2,16 @@
<head> <head>
<title>Simple pdf.js page viewer worker</title> <title>Simple pdf.js page viewer worker</title>
<script> <script>
var timer = null
function tic() {
timer = Date.now();
}
function toc(msg) {
console.log(msg + ": " + (Date.now() - timer) + "ms");
}
var myWorker = new Worker('worker.js'); var myWorker = new Worker('worker.js');
var currentX = 0; var currentX = 0;
@ -23,11 +33,9 @@ var special = {
currentX = currentXStack.pop(); currentX = currentXStack.pop();
}, },
"$showText": function(y, text) { "$showText": function(y, text, uniText) {
// console.log(text, currentX, y, this.measureText(text).width);
this.translate(currentX, -1 * y); this.translate(currentX, -1 * y);
this.fillText(text, 0, 0); this.fillText(uniText, 0, 0);
currentX += this.measureText(text).width; currentX += this.measureText(text).width;
}, },
@ -48,20 +56,10 @@ function renderProxyCanvas(stack) {
// for (var i = 0; i < 1000; i++) { // for (var i = 0; i < 1000; i++) {
var opp = stack[i]; var opp = stack[i];
if (opp[0] == "$") { if (opp[0] == "$") {
// console.log("set property", opp[1], opp[2]); ctx[opp[1]] = opp[2];
if (opp[1] == "font") {
ctx[opp[1]] = opp[2];
// ctx.font = "10px 'Verdana Bold Italic'";
// console.log("font", opp[2]);
} else {
ctx[opp[1]] = opp[2];
}
} else if (opp[0] in special) { } else if (opp[0] in special) {
// console.log("sepcial", opp[0], opp[1])
special[opp[0]].apply(ctx, opp[1]); special[opp[0]].apply(ctx, opp[1]);
} else { } else {
// console.log("execute", opp[0], opp[1]);
ctx[opp[0]].apply(ctx, opp[1]); ctx[opp[0]].apply(ctx, opp[1]);
} }
} }
@ -71,6 +69,7 @@ const WAIT = 0;
const CANVAS_PROXY_STACK = 1; const CANVAS_PROXY_STACK = 1;
const LOG = 2; const LOG = 2;
const FONT = 3; const FONT = 3;
const PDF_NUM_PAGE = 4;
var onMessageState = WAIT; var onMessageState = WAIT;
var fontStr = null; var fontStr = null;
@ -85,6 +84,9 @@ myWorker.onmessage = function(event) {
throw "expecting to get an string"; throw "expecting to get an string";
} }
switch (data) { switch (data) {
case "pdf_num_page":
onMessageState = PDF_NUM_PAGE;
return;
case "log": case "log":
onMessageState = LOG; onMessageState = LOG;
return; return;
@ -99,6 +101,13 @@ myWorker.onmessage = function(event) {
} }
break; break;
case PDF_NUM_PAGE:
console.log(data);
maxPages = parseInt(data);
document.getElementById("numPages").innerHTML = "/" + data;
onMessageState = WAIT;
break;
case FONT: case FONT:
data = JSON.parse(data); data = JSON.parse(data);
var base64 = window.btoa(data.str); var base64 = window.btoa(data.str);
@ -115,6 +124,7 @@ myWorker.onmessage = function(event) {
ctx.font = "bold italic 20px " + data.fontName + ", Symbol, Arial"; ctx.font = "bold italic 20px " + data.fontName + ", Symbol, Arial";
}, 10); }, 10);
intervals.push(interval); intervals.push(interval);
console.log("setup font", data.fontName);
onMessageState = WAIT; onMessageState = WAIT;
break; break;
@ -127,7 +137,7 @@ myWorker.onmessage = function(event) {
case CANVAS_PROXY_STACK: case CANVAS_PROXY_STACK:
var stack = JSON.parse(data); var stack = JSON.parse(data);
gStack = stack; gStack = stack;
console.log("canvas stack", stack.length) console.log("canvas stack size", stack.length)
// Shedule a timeout. Hoping the fonts are loaded after 100ms. // Shedule a timeout. Hoping the fonts are loaded after 100ms.
setTimeout(function() { setTimeout(function() {
@ -135,7 +145,9 @@ myWorker.onmessage = function(event) {
intervals.forEach(function(inter) { intervals.forEach(function(inter) {
clearInterval(inter); clearInterval(inter);
}); });
tic();
renderProxyCanvas(stack); renderProxyCanvas(stack);
toc("canvas rendering")
}, 100); }, 100);
onMessageState = WAIT; onMessageState = WAIT;
break; break;
@ -144,6 +156,19 @@ myWorker.onmessage = function(event) {
// //
// myWorker.postMessage(array); // myWorker.postMessage(array);
var currentPage = 1;
var maxPages = 1;
function showPage(num) {
ctx.save();
ctx.fillStyle = "rgb(255, 255, 255)";
ctx.fillRect(0, 0, canvas.width, canvas.height);
ctx.restore();
console.log("worker: page=" + num)
document.getElementById('pageNumber').value = num;
currentPage = parseInt(num);
myWorker.postMessage(num);
}
function open(url) { function open(url) {
document.title = url; document.title = url;
var req = new XMLHttpRequest(); var req = new XMLHttpRequest();
@ -155,22 +180,27 @@ function open(url) {
var data = req.mozResponseArrayBuffer || req.mozResponse || var data = req.mozResponseArrayBuffer || req.mozResponse ||
req.responseArrayBuffer || req.response; req.responseArrayBuffer || req.response;
myWorker.postMessage(data); myWorker.postMessage(data);
showPage("1");
} }
}; };
req.send(null); req.send(null);
} }
function nextPage() {
if (currentPage == maxPages) return;
currentPage++;
showPage(currentPage);
}
function prevPage() {
if (currentPage == 0) return;
currentPage--;
showPage(currentPage);
}
window.onload = function() { window.onload = function() {
var ctx = window.ctx = document.getElementById("canvas").getContext("2d"); window.canvas = document.getElementById("canvas");
ctx.save(); window.ctx = canvas.getContext("2d");
ctx.fillStyle = "rgb(255, 255, 255)";
ctx.fillRect(0, 0, canvas.width, canvas.height);
ctx.restore();
// for (var name in ctx) {
// if (!(ctx[name] instanceof Function)) {
// console.log('"' + name + '": "' + ctx[name] + '",');
// }
// }
open("compressed.tracemonkey-pldi-09.pdf"); open("compressed.tracemonkey-pldi-09.pdf");
} }
</script> </script>
@ -184,7 +214,7 @@ window.onload = function() {
-- Can we use JSONP to overcome the same-origin restrictions? --> -- Can we use JSONP to overcome the same-origin restrictions? -->
<button onclick="prevPage();">Previous</button> <button onclick="prevPage();">Previous</button>
<button onclick="nextPage();">Next</button> <button onclick="nextPage();">Next</button>
<input type="text" id="pageNumber" onchange="gotoPage(this.value);" <input type="text" id="pageNumber" onchange="showPage(this.value);"
value="1" size="4"></input> value="1" size="4"></input>
<span id="numPages">--</span> <span id="numPages">--</span>
<span id="info"></span> <span id="info"></span>

67
worker.js
View File

@ -26,7 +26,7 @@ function tic() {
} }
function toc(msg) { function toc(msg) {
log("Took ", (Date.now() - timer)); log(msg + ": " + (Date.now() - timer) + "ms");
timer = null; timer = null;
} }
@ -41,46 +41,41 @@ var canvas = new CanvasProxy(1224, 1584);
log("test"); log("test");
var pageInterval; var pageInterval;
var pdfDocument = null;
onmessage = function(event) { onmessage = function(event) {
var data = event.data; var data = event.data;
var pdfDocument = new PDFDoc(new Stream(data)); if (!pdfDocument) {
var numPages = pdfDocument.numPages; pdfDocument = new PDFDoc(new Stream(data));
postMessage("pdf_num_page");
postMessage(pdfDocument.numPages)
return;
} else {
tic();
tic(); // Let's try to render the first page...
// Let's try to render the first page... var page = pdfDocument.getPage(parseInt(data));
var page = pdfDocument.getPage(2);
// page.compile will collect all fonts for us, once we have loaded them // page.compile will collect all fonts for us, once we have loaded them
// we can trigger the actual page rendering with page.display // we can trigger the actual page rendering with page.display
var fonts = []; var fonts = [];
var gfx = new CanvasGraphics(canvas, ImageCanvasProxy);
page.compile(gfx, fonts);
var gfx = new CanvasGraphics(canvas, ImageCanvasProxy); // Inspect fonts and translate the missing one.
page.compile(gfx, fonts); var count = fonts.length;
toc("compiled page"); for (var i = 0; i < count; i++) {
var font = fonts[i];
if (Fonts[font.name]) {
fontsReady = fontsReady && !Fonts[font.name].loading;
continue;
}
// This "builds" the font and sents it over to the main thread.
new Font(font.name, font.file, font.properties);
}
toc("compiled page");
page.display(gfx); page.display(gfx);
canvas.flush(); canvas.flush();
}
} }
// function open(url) {
// var req = new XMLHttpRequest();
// req.open("GET", url);
// // req.responseType = "arraybuffer";
// req.expected = 0;//(document.URL.indexOf("file:") == 0) ? 0 : 200;
// req.onreadystatechange = function() {
// postMessage("loaded");
// if (req.readyState == 4 && req.status == req.expected) {
// var data = req.mozResponseArrayBuffer || req.mozResponse ||
// req.responseArrayBuffer || req.response;
// pdfDocument = new PDFDoc(new Stream(data));
// numPages = pdfDocument.numPages;
// // document.getElementById("numPages").innerHTML = numPages.toString();
// // goToPage(pageNum);
// }
// };
// req.send(null);
// }
//
// open("compressed.tracemonkey-pldi-09.pdf")