Refactors FontLoader to group fonts per document.

This commit is contained in:
Yury Delendik 2015-10-27 17:48:10 -05:00
parent 09772e1e15
commit 06c1904675
6 changed files with 117 additions and 98 deletions

View file

@ -1299,6 +1299,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
this.loadingTask = loadingTask;
this.pdfDataRangeTransport = pdfDataRangeTransport;
this.commonObjs = new PDFObjects();
this.fontLoader = new FontLoader(loadingTask.docId);
this.destroyed = false;
this.destroyCapability = null;
@ -1333,7 +1334,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
var terminated = this.messageHandler.sendWithPromise('Terminate', null);
waitOn.push(terminated);
Promise.all(waitOn).then(function () {
FontLoader.clear();
self.fontLoader.clear();
if (self.pdfDataRangeTransport) {
self.pdfDataRangeTransport.abort();
self.pdfDataRangeTransport = null;
@ -1489,7 +1490,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
font = new FontFaceObject(exportedData);
}
FontLoader.bind(
this.fontLoader.bind(
[font],
function fontReady(fontObjs) {
this.commonObjs.resolve(id, font);
@ -1697,7 +1698,7 @@ var WorkerTransport = (function WorkerTransportClosure() {
}
}
this.commonObjs.clear();
FontLoader.clear();
this.fontLoader.clear();
}.bind(this));
}
};