From: sbarman <sbarman@L3CWZ5T.(none)>
Date: Thu, 21 Jul 2011 16:09:25 +0000 (-0700)
Subject: Merge branch 'master' into font
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bed8052cab09a40a0522e11a434e761f98d46af5;p=pdf.js.git

Merge branch 'master' into font
---

bed8052cab09a40a0522e11a434e761f98d46af5
diff --cc fonts.js
index ec510a7,f33cab9..57e974e
--- a/fonts.js
+++ b/fonts.js
@@@ -416,11 -379,9 +385,10 @@@ var Font = (function() 
          warn('Font ' + properties.type + ' is not supported');
          break;
      }
 +
      this.data = data;
      this.type = properties.type;
-     this.id = Fonts.registerFont(name, data, properties);
-     this.loadedName = 'pdfFont' + this.id;
+     this.loadedName = getUniqueName();
      this.compositeFont = properties.compositeFont;
    };