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

Merge pull request #87 from cgjones/master

Browse Source 
fix test_harness missing exceptions thrown by numPages getter r=gal
This commit is contained in:
Andreas Gal 2011-06-24 20:47:36 -07:00
commit cc7aeedfd2
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/test_slave.html
View File

@ -6,7 +6,7 @@
<script type="text/javascript" src="/fonts.js"></script> <script type="text/javascript" src="/fonts.js"></script>
<script type="text/javascript" src="/glyphlist.js"></script> <script type="text/javascript" src="/glyphlist.js"></script>
<script type="application/javascript"> <script type="application/javascript">
var browser, canvas, currentTask, currentTaskIdx, failure, manifest, pdfDoc, stdout; var browser, canvas, currentTask, currentTaskIdx, failure, manifest, numPages, pdfDoc, stdout;
function queryParams() { function queryParams() {
var qs = window.location.search.substring(1); var qs = window.location.search.substring(1);
@ -66,8 +66,9 @@ function nextTask() {
try { try {
pdfDoc = new PDFDoc(new Stream(data)); pdfDoc = new PDFDoc(new Stream(data));
numPages = pdfDoc.numPages;
} catch(e) { } catch(e) {
pdfDoc.numPages = 1; numPages = 1;
failure = 'load PDF doc: '+ e.toString(); failure = 'load PDF doc: '+ e.toString();
} }
@ -78,7 +79,7 @@ function nextTask() {
} }
function nextPage() { function nextPage() {
if (currentTask.pageNum > pdfDoc.numPages) { if (currentTask.pageNum > numPages) {
if (++currentTask.round < currentTask.rounds) { if (++currentTask.round < currentTask.rounds) {
log(" Round "+ (1 + currentTask.round) +"\n"); log(" Round "+ (1 + currentTask.round) +"\n");
currentTask.pageNum = 1; currentTask.pageNum = 1;
@ -95,8 +96,9 @@ function nextPage() {
clear(ctx); clear(ctx);
var fonts = []; var fonts = [];
var gfx = new CanvasGraphics(ctx); var gfx = null;
try { try {
gfx = new CanvasGraphics(ctx);
currentPage = pdfDoc.getPage(currentTask.pageNum); currentPage = pdfDoc.getPage(currentTask.pageNum);
currentPage.compile(gfx, fonts); currentPage.compile(gfx, fonts);
} catch(e) { } catch(e) {
@ -105,10 +107,14 @@ function nextPage() {
var fontLoaderTimer = null; var fontLoaderTimer = null;
function checkFontsLoaded() { function checkFontsLoaded() {
try {
if (!FontLoader.bind(fonts)) { if (!FontLoader.bind(fonts)) {
fontLoaderTimer = window.setTimeout(checkFontsLoaded, 10); fontLoaderTimer = window.setTimeout(checkFontsLoaded, 10);
return; return;
} }
} catch(e) {
failure = 'fonts: '+ e.toString();
}
snapshotCurrentPage(gfx); snapshotCurrentPage(gfx);
} }
@ -166,7 +172,7 @@ var inFlightRequests = 0;
function sendTaskResult(snapshot) { function sendTaskResult(snapshot) {
var result = { browser: browser, var result = { browser: browser,
id: currentTask.id, id: currentTask.id,
numPages: pdfDoc.numPages, numPages: numPages,
failure: failure, failure: failure,
file: currentTask.file, file: currentTask.file,
round: currentTask.round, round: currentTask.round,