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

Make sure to reset callbacks array and get more fonts working

Browse Source
This commit is contained in:
Julian Viereck 2011-06-26 01:35:17 +02:00
parent b00df76044
commit c1834c1bb5
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
worker/client.js
View File

@ -59,6 +59,10 @@ FontWorker.prototype = {
this.fontsWaiting --; this.fontsWaiting --;
} }
if (this.fontsWaiting == 0) {
console.timeEnd("ensureFonts");
}
// This timeout is necessary right now to make sure the fonts are really // This timeout is necessary right now to make sure the fonts are really
// loaded at the point the callbacks are called. // loaded at the point the callbacks are called.
setTimeout(function() { setTimeout(function() {
@ -68,6 +72,7 @@ FontWorker.prototype = {
for (var i = 0; i < callbacks.length; i++) { for (var i = 0; i < callbacks.length; i++) {
callbacks[i](); callbacks[i]();
} }
this.fontsWaitingCallbacks.length = 0;
} }
}.bind(this), 100); }.bind(this), 100);
} }
@ -86,7 +91,7 @@ FontWorker.prototype = {
// hold track on as lease memory as possible. // hold track on as lease memory as possible.
Fonts[font.name] = { Fonts[font.name] = {
properties: { properties: {
charset: font.properties.charset encoding: font.properties.encoding
}, },
cache: Object.create(null) cache: Object.create(null)
}; };
@ -97,9 +102,11 @@ FontWorker.prototype = {
this.fontsWaiting++; this.fontsWaiting++;
} }
console.time("ensureFonts");
// If there are fonts, that need to get loaded, tell the FontWorker to get // If there are fonts, that need to get loaded, tell the FontWorker to get
// started and push the callback on the waiting-callback-stack. // started and push the callback on the waiting-callback-stack.
if (notLoaded.length != 0) { if (notLoaded.length != 0) {
console.log("fonts -> FontWorker");
// Send the worker the fonts to work on. // Send the worker the fonts to work on.
this.worker.postMessage({ this.worker.postMessage({
action: "fonts", action: "fonts",
@ -304,6 +311,7 @@ function WorkerPDFDoc(canvas) {
for (var i = 0; i < callbacks.length; i++) { for (var i = 0; i < callbacks.length; i++) {
callbacks[i](); callbacks[i]();
} }
this.waitingForFontsCallback.length = 0;
}.bind(this)); }.bind(this));
}, },