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

completed async font loading framework

Browse Source
This commit is contained in:
Andreas Gal 2011-06-14 23:41:26 -07:00
parent 0ef077c44c
commit 77bc59681e
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
pdf.js
View File

@ -1385,6 +1385,14 @@ var Page = (function() {
? obj ? obj
: null)); : null));
}, },
compile: function(gfx, fonts) {
if (!this.code) {
var xref = this.xref;
var content = xref.fetchIfRef(this.content);
var resources = xref.fetchIfRef(this.resources);
this.code = gfx.compile(content, xref, resources, fonts);
}
},
display: function(gfx) { display: function(gfx) {
var xref = this.xref; var xref = this.xref;
var content = xref.fetchIfRef(this.content); var content = xref.fetchIfRef(this.content);
@ -1395,8 +1403,6 @@ var Page = (function() {
gfx.beginDrawing({ x: mediaBox[0], y: mediaBox[1], gfx.beginDrawing({ x: mediaBox[0], y: mediaBox[1],
width: mediaBox[2] - mediaBox[0], width: mediaBox[2] - mediaBox[0],
height: mediaBox[3] - mediaBox[1] }); height: mediaBox[3] - mediaBox[1] });
if (!this.code)
this.code = gfx.compile(content, xref, resources);
gfx.execute(this.code, xref, resources); gfx.execute(this.code, xref, resources);
gfx.endDrawing(); gfx.endDrawing();
} }
@ -1701,7 +1707,7 @@ var CanvasGraphics = (function() {
this.xref = savedXref; this.xref = savedXref;
}, },
compile: function(stream, xref, resources) { compile: function(stream, xref, resources, fonts) {
var xobjs = xref.fetchIfRef(resources.get("XObject")) || new Dict(); var xobjs = xref.fetchIfRef(resources.get("XObject")) || new Dict();
var parser = new Parser(new Lexer(stream), false); var parser = new Parser(new Lexer(stream), false);
@ -1739,7 +1745,10 @@ var CanvasGraphics = (function() {
assertWellFormed(IsName(type), "XObject should have a Name subtype"); assertWellFormed(IsName(type), "XObject should have a Name subtype");
if ("Form" == type.name) { if ("Form" == type.name) {
args[0].code = this.compile(xobj, xref, xobj.dict.get("Resources")); args[0].code = this.compile(xobj,
xref,
xobj.dict.get("Resources"),
fonts);
} }
} }
} else if (cmd == "Tf") { // eagerly collect all fonts } else if (cmd == "Tf") { // eagerly collect all fonts
@ -1748,8 +1757,14 @@ var CanvasGraphics = (function() {
fontRes = xref.fetchIfRef(fontRes); fontRes = xref.fetchIfRef(fontRes);
var font = xref.fetchIfRef(fontRes.get(args[0].name)); var font = xref.fetchIfRef(fontRes.get(args[0].name));
assertWellFormed(IsDict(font)); assertWellFormed(IsDict(font));
if (!font.translated) if (!font.translated) {
font.translated = this.translateFont(font); font.translated = this.translateFont(font);
if (fonts && font.translated) {
// keep track of each font we translated so the caller can
// load them asynchronously before calling display on a page
fonts.push(font.translated);
}
}
} }
} }

7
test.html
View File

@ -95,6 +95,13 @@ function displayPage(num) {
ctx.restore(); ctx.restore();
var gfx = new CanvasGraphics(ctx); 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);
// This should be called when font loading is complete
page.display(gfx); page.display(gfx);
var t2 = Date.now(); var t2 = Date.now();