From: Vivien Nicolas <21@vingtetun.org> Date: Fri, 17 Jun 2011 07:06:19 +0000 (+0200) Subject: Merge with master X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2b0fa98257280226756bcded442625fb3e8f44ae;p=pdf.js.git Merge with master --- 2b0fa98257280226756bcded442625fb3e8f44ae diff --cc test.html index d18f959,aea4ec5..276ba30 --- a/test.html +++ b/test.html @@@ -1,31 -1,155 +1,35 @@@ - - Simple pdf.js page viewer - - - - - - - -
++<<<<<<< HEAD + + Simple pdf.js page viewer + + + + + + + + + + + +
+ + - - - - / -- - -
-
- - -
- - + + + + -- + +
+ +
+ + +
+ + diff --cc test.js index d0d3868,0000000..cbfd70c mode 100644,000000..100644 --- a/test.js +++ b/test.js @@@ -1,107 -1,0 +1,117 @@@ +/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- / +/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */ + +var pdfDocument, canvas, pageDisplay, pageNum, pageInterval; - function load() { ++function load(userInput) { + canvas = document.getElementById("canvas"); + canvas.mozOpaque = true; + pageNum = parseInt(queryParams().page) || 1; - fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf"; ++ fileName = userInput; ++ if (!userInput) { ++ fileName = queryParams().file || "compressed.tracemonkey-pldi-09.pdf"; ++ } + open(fileName); +} + +function queryParams() { + var qs = window.location.search.substring(1); + var kvs = qs.split("&"); + var params = { }; + for (var i = 0; i < kvs.length; ++i) { + var kv = kvs[i].split("="); + params[unescape(kv[0])] = unescape(kv[1]); + } + return params; +} + +function open(url) { + document.title = url; + req = new XMLHttpRequest(); + req.open("GET", url); + req.mozResponseType = req.responseType = "arraybuffer"; + req.expected = (document.URL.indexOf("file:") == 0) ? 0 : 200; + req.onreadystatechange = function() { + 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); +} + +function gotoPage(num) { + if (0 <= num && num <= numPages) + pageNum = num; + displayPage(pageNum); +} + +function displayPage(num) { + if (pageNum != num) + window.clearTimeout(pageInterval); + + document.getElementById("pageNumber").value = num; + + var t0 = Date.now(); + + var page = pdfDocument.getPage(pageNum = num); + + var t1 = Date.now(); + var ctx = canvas.getContext("2d"); + ctx.save(); + ctx.fillStyle = "rgb(255, 255, 255)"; + ctx.fillRect(0, 0, canvas.width, canvas.height); + ctx.restore(); + + var gfx = new CanvasGraphics(ctx); + + // page.compile will collect all fonts for us, once we have loaded them + // we can trigger the actual page rendering with page.display + var fonts = []; - + page.compile(gfx, fonts); + var t2 = Date.now(); + ++ var interval = 0; ++ for (var i = 0; i < fonts.length; i++) { ++ if (fonts[i].loading) { ++ interval = 10; ++ break; ++ } ++ }; ++ + // FIXME This need to be replaced by an event + pageInterval = setInterval(function() { + for (var i = 0; i < fonts.length; i++) { + if (fonts[i].loading) + return; + } + var t3 = Date.now(); + + clearInterval(pageInterval); + page.display(gfx); + + var t4 = Date.now(); + + var infoDisplay = document.getElementById("info"); + infoDisplay.innerHTML = "Time to load/compile/fonts/render: "+ (t1 - t0) + "/" + (t2 - t1) + "/" + (t3 - t2) + "/" + (t4 - t3) + " ms"; - }, 10); ++ }, interval); +} + +function nextPage() { + if (pageNum < pdfDocument.numPages) + displayPage(++pageNum); +} + +function prevPage() { + if (pageNum > 1) + displayPage(--pageNum); +} + +function goToPage(num) { + if (0 <= num && num <= numPages) + displayPage(pageNum = num); +} +