fixed font loading bug

diff --git a/fonts.js b/fonts.js
index 262746ac6685de9faa57dd7aedcfc43c58aa551c..c275227a9ec0247ad81923481b7d071cec6f8267 100755 (executable)
--- a/fonts.js
+++ b/fonts.js
@@ -61,16 +61,16 @@ var Fonts = (function Fonts() {
     lookupById: function fonts_lookupById(id) {
       return fonts[id];
     },
-    setActive: function fonts_setActive(font, size) {
+    setActive: function fonts_setActive(fontName, fontObj, size) {
       // |current| can be null is fontName is a built-in font
       // (e.g. "sans-serif")
-      if ((current = fonts[font.id])) {
+      if (fontObj && (current = fonts[fontObj.id])) {
         charsCache = current.charsCache;
         var sizes = current.sizes;
         if (!(measureCache = sizes[size]))
           measureCache = sizes[size] = Object.create(null);
       }
-      ctx.font = (size * kScalePrecision) + 'px "' + font.loadedName + '"';
+      ctx.font = (size * kScalePrecision) + 'px "' + fontName + '"';
     },
     charsToUnicode: function fonts_chars2Unicode(chars) {
       if (!charsCache)
@@ -161,6 +161,7 @@ var FontLoader = {
       }
     }
 
+    this.listeningForFontLoad = false;
     if (!isWorker && rules.length) {
       FontLoader.prepareFontLoadEvent(rules, names, ids);
     }
@@ -213,7 +214,7 @@ var FontLoader = {
       div.innerHTML = html;
       document.body.appendChild(div);
 
-      if (!this.listeneningForFontLoad) {
+      if (!this.listeningForFontLoad) {
         window.addEventListener(
           'message',
           function(e) {
@@ -227,7 +228,7 @@ var FontLoader = {
             document.documentElement.dispatchEvent(evt);
           },
           false);
-        this.listeneningForFontLoad = true;
+        this.listeningForFontLoad = true;
       }
 
       // XXX we should have a time-out here too, and maybe fire

diff --git a/pdf.js b/pdf.js
index a2526f362414736e38db8d6a52cbec984b149337..c30c896142211a974ac2fad27ed19973c2af563f 100644 (file)
--- a/pdf.js
+++ b/pdf.js
@@ -3885,7 +3885,7 @@ var CanvasGraphics = (function() {
         this.ctx.$setFont(fontName, size);
       } else {
         this.ctx.font = size + 'px "' + fontName + '"';
-        Fonts.setActive(fontObj, size);
+        Fonts.setActive(fontName, fontObj, size);
       }
     },
     setTextRenderingMode: function(mode) {