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

Merge pull request #6175 from Rob--W/font-loading-promises

Browse Source 
fontLoadPromises -> fontsToLoad
This commit is contained in:
Yury Delendik 2015-07-06 16:00:47 -05:00
commit 8e59528e60
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/display/font_loader.js
View File

@ -119,6 +119,13 @@ var FontLoader = {
var rules = []; var rules = [];
var fontsToLoad = []; var fontsToLoad = [];
var fontLoadPromises = []; var fontLoadPromises = [];
var getNativeFontPromise = function(nativeFontFace) {
// Return a promise that is always fulfilled, even when the font fails to
// load.
return nativeFontFace.loaded.catch(function(e) {
warn('Failed to load font "' + nativeFontFace.family + '": ' + e);
});
};
for (var i = 0, ii = fonts.length; i < ii; i++) { for (var i = 0, ii = fonts.length; i < ii; i++) {
var font = fonts[i]; var font = fonts[i];
@ -132,7 +139,7 @@ var FontLoader = {
if (this.isFontLoadingAPISupported) { if (this.isFontLoadingAPISupported) {
var nativeFontFace = font.createNativeFontFace(); var nativeFontFace = font.createNativeFontFace();
if (nativeFontFace) { if (nativeFontFace) {
fontLoadPromises.push(nativeFontFace.loaded); fontLoadPromises.push(getNativeFontPromise(nativeFontFace));
} }
} else { } else {
var rule = font.bindDOM(); var rule = font.bindDOM();
@ -145,7 +152,7 @@ var FontLoader = {
var request = FontLoader.queueLoadingCallback(callback); var request = FontLoader.queueLoadingCallback(callback);
if (this.isFontLoadingAPISupported) { if (this.isFontLoadingAPISupported) {
Promise.all(fontsToLoad).then(function() { Promise.all(fontLoadPromises).then(function() {
request.complete(); request.complete();
}); });
} else if (rules.length > 0 && !this.isSyncFontLoadingSupported) { } else if (rules.length > 0 && !this.isSyncFontLoadingSupported) {