webfontloader 1.2.1 → 1.3.0

data/CHANGELOG

@@ -1,3 +1,8 @@
+v1.3.0 (February 28, 2013)
+* New optional configuration parameter `timeout` which lets you customize the default timeout.
+* Change the Typekit module to use `use.typekit.net` instead of `use.typekit.com`.
+* Disable height check on OSX and iOS WebKit based browsers which suffer from a metrics bug when loading web fonts.
+
 v1.2.1 (February 26, 2013)
 * Fix the possibility of test strings wrapping to a new line and thereby breaking font watching.
 * Change the FontWatchRunner to not create DOM elements until it is started.

data/docs/EVENTS.md

@@ -112,7 +112,18 @@ load. You can use events to gracefully degrade in this situation.
 
 > The `Font Inactive` event will be triggered after 5 seconds if the font
 fails to render. If *at least* one font succesfully renders, the `Active`
-event will be triggered, else the `Inative` even will be triggered.
+event will be triggered, else the `Inactive` even will be triggered.
+
+You can configure the timeout by using the `timeout` configuration on the
+`WebFont.load` function.
+
+    WebFont.load({
+      timeout: 2000, // Set the timeout to two seconds
+      ...
+    });
+
+The timeout value should be in milliseconds, and defaults to 5 seconds if
+not supplied.
 
 ### Browser Support
 

data/lib/webfontloader.rb

@@ -3,7 +3,7 @@ require 'yaml'
 require 'webfontloader/modules'
 
 module WebFontLoader
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 
   ProjectRoot = File.expand_path(File.dirname(__FILE__) + "/..")
 

data/spec/core/font_spec.js

@@ -7,7 +7,7 @@ describe('WebFont', function () {
       userAgent = null;
 
   beforeEach(function () {
-    userAgent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false));
+    userAgent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false, false));
     fontModuleLoader = new FontModuleLoader();
   });
 
@@ -190,7 +190,7 @@ describe('WebFont', function () {
         testModule = null;
 
     beforeEach(function () {
-      font = new WebFont(window, fontModuleLoader, function (func, timeout) { func(); }, new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(false, false)));
+      font = new WebFont(window, fontModuleLoader, function (func, timeout) { func(); }, new UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new BrowserInfo(false, false, false)));
       font.addModule('test', function (conf, domHelper) {
         testModule = new function () {
           this.conf = conf;

data/spec/core/fontwatcher_spec.js

@@ -6,13 +6,15 @@ describe('FontWatcher', function () {
       domHelper = new DomHelper(window),
       eventDispatcher = {},
       testStrings = null,
+      timeout = null,
       userAgent = null,
       activeFontFamilies = [];
 
   beforeEach(function () {
-    userAgent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.3', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false));
+    userAgent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.3', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false, false));
     activeFontFamilies = [];
     testStrings = jasmine.createSpy('testStrings');
+    timeout = jasmine.createSpy('timeout');
     eventDispatcher.dispatchLoading = jasmine.createSpy('dispatchLoading');
     eventDispatcher.dispatchFontLoading = jasmine.createSpy('dispatchFontLoading');
     eventDispatcher.dispatchFontActive = jasmine.createSpy('dispatchFontActive');
@@ -22,11 +24,12 @@ describe('FontWatcher', function () {
   });
 
   function FakeFontWatchRunner(activeCallback, inactiveCallback, domHelper, fontSizer, asyncCall, getTime,
-    fontFamily, fontDescription, hasWebKitFallbackBug, opt_metricCompatibleFonts, opt_fontTestString) {
+    fontFamily, fontDescription, hasWebKitFallbackBug, opt_timeout, opt_metricCompatibleFonts, opt_fontTestString) {
     this.activeCallback = activeCallback;
     this.inactiveCallback = inactiveCallback;
     this.fontFamily = fontFamily;
     this.fontDescription = fontDescription;
+    timeout(opt_timeout);
 
     if (opt_fontTestString) {
       testStrings(opt_fontTestString);
@@ -201,4 +204,13 @@ describe('FontWatcher', function () {
       expect(testStrings).toHaveBeenCalledWith('testString2');
     });
   });
+
+  it('should pass on the timeout to FontWatchRunner', function () {
+    var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher, jasmine.createSpy('fakeFontSizer'),
+        jasmine.createSpy('fakeAsyncCall'), jasmine.createSpy('fakeGetTime'), 4000);
+
+    fontWatcher.watch(['fontFamily1'], {}, {}, FakeFontWatchRunner, true);
+
+    expect(timeout).toHaveBeenCalledWith(4000);
+  });
 });

data/spec/core/fontwatchrunner_spec.js

@@ -1,5 +1,6 @@
 describe('FontWatchRunner', function () {
   var FontWatchRunner = webfont.FontWatchRunner,
+      BrowserInfo = webfont.BrowserInfo,
       UserAgentParser = webfont.UserAgentParser,
       Size = webfont.Size,
       DomHelper = webfont.DomHelper,
@@ -14,6 +15,7 @@ describe('FontWatchRunner', function () {
       FALLBACK_SIZE_B = new Size(2, 2),
       LAST_RESORT_SIZE = new Size(4, 4),
 
+      browserInfo = new BrowserInfo(true, false, false),
       setupSizes = [FALLBACK_SIZE_A, FALLBACK_SIZE_B, LAST_RESORT_SIZE],
       actualSizes = [],
       fakeGetSizeCount = 0,
@@ -85,7 +87,7 @@ describe('FontWatchRunner', function () {
     ];
 
     var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, false);
+        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
 
@@ -102,7 +104,7 @@ describe('FontWatchRunner', function () {
     ];
 
     var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, false);
+        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
     expect(asyncCount).toEqual(3);
@@ -121,7 +123,7 @@ describe('FontWatchRunner', function () {
     ];
 
     var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, false);
+        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
 
@@ -130,6 +132,12 @@ describe('FontWatchRunner', function () {
   });
 
   describe('WebKit fallback bug', function () {
+    var fallbackBugBrowserInfo = null;
+
+    beforeEach(function () {
+      fallbackBugBrowserInfo = new BrowserInfo(true, true, false);
+    });
+
     it('should ignore fallback size and call active', function () {
       actualSizes = [
         LAST_RESORT_SIZE, LAST_RESORT_SIZE,
@@ -137,7 +145,7 @@ describe('FontWatchRunner', function () {
       ];
 
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true);
+          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo);
 
       fontWatchRunner.start();
 
@@ -154,7 +162,7 @@ describe('FontWatchRunner', function () {
       timesToGetTimeBeforeTimeout = 2;
 
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true);
+          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo);
 
       fontWatchRunner.start();
 
@@ -172,7 +180,7 @@ describe('FontWatchRunner', function () {
       timesToGetTimeBeforeTimeout = 3;
 
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true);
+          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo);
 
       fontWatchRunner.start();
 
@@ -189,8 +197,8 @@ describe('FontWatchRunner', function () {
       timesToGetTimeBeforeTimeout = 2;
 
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true,
-          { 'My Other Family': true });
+          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo,
+          0, { 'My Other Family': true });
 
       fontWatchRunner.start();
       expect(asyncCount).toEqual(1);
@@ -206,8 +214,8 @@ describe('FontWatchRunner', function () {
       timesToGetTimeBeforeTimeout = 2;
 
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true,
-          { 'My Family': true });
+          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, fallbackBugBrowserInfo,
+          0, { 'My Family': true });
 
       fontWatchRunner.start();
       expect(asyncCount).toEqual(1);
@@ -215,6 +223,24 @@ describe('FontWatchRunner', function () {
     });
   });
 
+  describe('webkit metrics bug', function () {
+    it('should correctly call active even though the height is different', function () {
+      actualSizes = [
+        FALLBACK_SIZE_A, FALLBACK_SIZE_B,
+        new Size(1, 2), new Size(2, 3), // Same as FALLBACK_SIZE_A and FALLBACK_SIZE_B except that the height is different.
+        TARGET_SIZE, TARGET_SIZE
+      ];
+
+      var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
+          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, new BrowserInfo(true, false, true));
+
+      fontWatchRunner.start();
+
+      expect(asyncCount).toEqual(2);
+      expect(activeCallback).toHaveBeenCalledWith('My Family', 'n4');
+    });
+  });
+
   describe('real browser testing', function () {
     var fontSizer = null,
         asyncCall = null,
@@ -243,7 +269,8 @@ describe('FontWatchRunner', function () {
 
     it('should fail to load a null font', function () {
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fontSizer, asyncCall, getTime, '__webfontloader_test__', '', userAgent.getBrowserInfo().hasWebKitFallbackBug());
+          domHelper, fontSizer, asyncCall, getTime, '__webfontloader_test__', '',
+          userAgent.getBrowserInfo(), 500);
 
       runs(function () {
         fontWatchRunner.start();
@@ -260,7 +287,8 @@ describe('FontWatchRunner', function () {
 
     it('should load font succesfully', function () {
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fontSizer, asyncCall, getTime, 'SourceSansA', '', userAgent.getBrowserInfo().hasWebKitFallbackBug()),
+          domHelper, fontSizer, asyncCall, getTime, 'SourceSansA', '',
+          userAgent.getBrowserInfo(), 500),
           ruler = new FontRuler(domHelper, fontSizer, 'abcdef'),
           activeSize = null,
           originalSize = null,
@@ -300,7 +328,8 @@ describe('FontWatchRunner', function () {
 
     it('should attempt to load a non-existing font', function () {
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fontSizer, asyncCall, getTime, 'Elena', '', userAgent.getBrowserInfo().hasWebKitFallbackBug());
+          domHelper, fontSizer, asyncCall, getTime, 'Elena', '',
+          userAgent.getBrowserInfo(), 500);
 
       runs(function () {
         fontWatchRunner.start();
@@ -317,7 +346,8 @@ describe('FontWatchRunner', function () {
 
     it('should load even if @font-face is inserted after watching has started', function () {
       var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fontSizer, asyncCall, getTime, 'SourceSansB', '', userAgent.getBrowserInfo().hasWebKitFallbackBug()),
+          domHelper, fontSizer, asyncCall, getTime, 'SourceSansB', '',
+          userAgent.getBrowserInfo(), 500),
           ruler = new FontRuler(domHelper, fontSizer, 'abcdef'),
           activeSize = null,
           originalSize = null,
@@ -375,7 +405,7 @@ describe('FontWatchRunner', function () {
       ];
 
       fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, false);
+          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
 
       fontWatchRunner.start();
 
@@ -388,7 +418,8 @@ describe('FontWatchRunner', function () {
       ];
 
       fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, false, {}, 'TestString');
+          domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily,
+          fontDescription, browserInfo, 0, {}, 'TestString');
 
       fontWatchRunner.start();
 

data/spec/core/useragentparser_spec.js

@@ -58,6 +58,11 @@ describe('UserAgentParser', function () {
           return false;
         }
 
+        if (actual.getBrowserInfo().hasWebKitMetricsBug() !== expected.browserInfo.hasWebKitMetricsBug) {
+          this.message = msg('web kit metrics bug', actual.getBrowserInfo().hasWebKitMetricsBug(), expected.browserInfo.hasWebKitFallbackBug);
+          return false;
+        }
+
         return true;
       }
     });
@@ -81,7 +86,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -98,7 +104,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -117,7 +124,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
 
@@ -132,7 +140,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -149,7 +158,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -168,7 +178,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -185,7 +196,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -204,7 +216,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -221,7 +234,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -238,7 +252,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -255,7 +270,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -272,7 +288,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -291,7 +308,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
 
@@ -306,7 +324,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -323,7 +342,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -340,7 +360,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
 
@@ -355,7 +376,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
 
@@ -370,7 +392,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -387,7 +410,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
 
@@ -402,7 +426,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: true
           }
         });
       });
@@ -421,7 +446,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
 
@@ -436,7 +462,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -453,7 +480,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -470,7 +498,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -487,7 +516,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -504,7 +534,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -521,7 +552,8 @@ describe('UserAgentParser', function () {
           documentMode: 8,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -540,7 +572,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -557,7 +590,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -574,7 +608,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -591,7 +626,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -608,7 +644,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -625,7 +662,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -642,7 +680,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -659,7 +698,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -678,7 +718,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -695,7 +736,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -712,7 +754,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -729,7 +772,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -746,7 +790,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -765,7 +810,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: true
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -782,7 +828,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -801,7 +848,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -818,7 +866,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -835,7 +884,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: true,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });
@@ -852,7 +902,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
 
@@ -867,7 +918,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
 
@@ -882,7 +934,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
 
@@ -897,7 +950,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
 
@@ -912,7 +966,8 @@ describe('UserAgentParser', function () {
           documentMode: undefined,
           browserInfo: {
             hasWebFontSupport: false,
-            hasWebKitFallbackBug: false
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
           }
         });
       });

data/spec/google/lastresortwebkitfontwatchrunner_spec.js

@@ -1,5 +1,6 @@
 describe('LastResortWebKitFontWatchRunner', function () {
   var LastResortWebKitFontWatchRunner = webfont.LastResortWebKitFontWatchRunner,
+      BrowserInfo = webfont.BrowserInfo,
       Size = webfont.Size,
       DomHelper = webfont.DomHelper,
       domHelper = new DomHelper(window),
@@ -12,6 +13,7 @@ describe('LastResortWebKitFontWatchRunner', function () {
       FALLBACK_SIZE_B = new Size(2, 2),
       LAST_RESORT_SIZE = new Size(4, 4),
 
+      browserInfo = new BrowserInfo(true, true, false),
       setupSizes = [FALLBACK_SIZE_A, FALLBACK_SIZE_B, LAST_RESORT_SIZE],
       actualSizes = [],
       fakeGetSizeCount = 0,
@@ -84,7 +86,7 @@ describe('LastResortWebKitFontWatchRunner', function () {
     ];
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true);
+        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
 
@@ -101,7 +103,7 @@ describe('LastResortWebKitFontWatchRunner', function () {
     timesToGetTimeBeforeTimeout = 2;
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, 'Arimo', fontDescription, true);
+        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, 'Arimo', fontDescription, browserInfo);
 
     fontWatchRunner.start();
 
@@ -119,7 +121,7 @@ describe('LastResortWebKitFontWatchRunner', function () {
     timesToGetTimeBeforeTimeout = 3;
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true);
+        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
 
@@ -136,7 +138,7 @@ describe('LastResortWebKitFontWatchRunner', function () {
     timesToGetTimeBeforeTimeout = 2;
 
     var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, true);
+        domHelper, fakeFontSizer, fakeAsyncCall, fakeGetTime, fontFamily, fontDescription, browserInfo);
 
     fontWatchRunner.start();
     expect(asyncCount).toEqual(1);

data/spec/monotype/monotypescript_spec.js

@@ -27,7 +27,7 @@ describe('MonotypeScript', function () {
     };
     support = jasmine.createSpy('support');
     load = jasmine.createSpy('load');
-    useragent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.3', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false));
+    useragent = new UserAgent('Firefox', '3.6', 'Gecko', '1.9.3', 'Macintosh', '10.6', undefined, new BrowserInfo(true, false, false));
 
     monotype = new MonotypeScript(useragent, fakeDomHelper, configuration);
     monotype.supportUserAgent(useragent, support);

data/spec/typekit/typekitscript_spec.js

@@ -31,7 +31,7 @@ describe('TypekitScript', function () {
     typekit.supportUserAgent('useragent', support);
 
     expect(fakeDomHelper.insertInto.calls[0].args[0]).toEqual('head');
-    expect(fakeDomHelper.createScriptSrc).toHaveBeenCalledWith('http://use.typekit.com/abc.js');
+    expect(fakeDomHelper.createScriptSrc).toHaveBeenCalledWith('http://use.typekit.net/abc.js');
     expect(support).not.toHaveBeenCalled();
 
     expect(global.__webfonttypekitmodule__).not.toBeNull();

data/src/core/browserinfo.js

@@ -2,13 +2,17 @@
  * @constructor
  * @param {boolean} webfontSupport
  * @param {boolean} webKitFallbackBug
+ * @param {boolean} webKitMetricsBug
  */
-webfont.BrowserInfo = function (webfontSupport, webKitFallbackBug) {
+webfont.BrowserInfo = function (webfontSupport, webKitFallbackBug, webKitMetricsBug) {
   this.webfontSupport_ = webfontSupport;
   this.webKitFallbackBug_ = webKitFallbackBug;
+  this.webKitMetricsBug_ = webKitMetricsBug;
 };
 
 /**
+ * Returns true if the browser supports web fonts.
+ *
  * @return {boolean}
  */
 webfont.BrowserInfo.prototype.hasWebFontSupport = function () {
@@ -16,8 +20,42 @@ webfont.BrowserInfo.prototype.hasWebFontSupport = function () {
 };
 
 /**
+ * Returns true if the browser has the WebKit fallback bug.
+ *
+ * The bug causes the normal CSS font stack to be ignored while
+ * loading web fonts. Instead it picks the generic font family
+ * (or the default generic font family) of the first instance
+ * the web font is mentioned in CSS. It switches to this font
+ * immediately while loading web font, causing two changes in
+ * font to occur (compared to other browsers which only change
+ * font once the web font has loaded.)
+ *
+ * The bug has been fixed and is only happens in WebKit versions
+ * below 536.11. Even though it is fixed we still have a large
+ * percentage of users on older WebKit versions, mostly on mobile
+ * platforms.
+ *
+ * Also see: https://bugs.webkit.org/show_bug.cgi?id=76684
+ *
  * @return {boolean}
  */
 webfont.BrowserInfo.prototype.hasWebKitFallbackBug = function () {
   return this.webKitFallbackBug_;
 };
+
+/**
+ * Returns true if the browser has the WebKit metrics bug
+ *
+ * The metrics bug causes WebKit to change the height of a font
+ * while loading a web font. Other browsers do not modify
+ * the width or height of the fallback font while a web font is
+ * loading. This caused our width and height check to be incorrect,
+ * triggering a false positive.
+ *
+ * Also see: https://bugs.webkit.org/show_bug.cgi?id=110977
+ *
+ * @return {boolean}
+ */
+webfont.BrowserInfo.prototype.hasWebKitMetricsBug = function () {
+  return this.webKitMetricsBug_;
+};

data/src/core/font.js

@@ -73,6 +73,7 @@ webfont.WebFont.prototype.onModuleReady_ = function(eventDispatcher, fontWatcher
 
 webfont.WebFont.prototype.load_ = function(eventDispatcher, configuration) {
   var modules = this.fontModuleLoader_.getModules(configuration, this.domHelper_),
+      timeout = configuration['timeout'],
       self = this;
 
   this.moduleFailedLoading_ = this.moduleLoading_ = modules.length;
@@ -83,7 +84,7 @@ webfont.WebFont.prototype.load_ = function(eventDispatcher, configuration) {
           return new webfont.Size(elem.offsetWidth, elem.offsetHeight);
         }}, self.asyncCall_, function() {
           return new Date().getTime();
-        });
+        }, timeout);
 
   for (var i = 0, len = modules.length; i < len; i++) {
     var module = modules[i];

data/src/core/fontwatcher.js

@@ -6,9 +6,10 @@
  * @param {Object.<string, function(Object): webfont.Size>} fontSizer
  * @param {function(function(), number=)} asyncCall
  * @param {function(): number} getTime
+ * @param {number=} opt_timeout
  */
 webfont.FontWatcher = function(userAgent, domHelper, eventDispatcher, fontSizer,
-    asyncCall, getTime) {
+    asyncCall, getTime, opt_timeout) {
   this.domHelper_ = domHelper;
   this.eventDispatcher_ = eventDispatcher;
   this.fontSizer_ = fontSizer;
@@ -17,8 +18,9 @@ webfont.FontWatcher = function(userAgent, domHelper, eventDispatcher, fontSizer,
   this.currentlyWatched_ = 0;
   this.last_ = false;
   this.success_ = false;
+  this.timeout_ = opt_timeout;
 
-  this.hasWebKitFallbackBug_ = userAgent.getBrowserInfo().hasWebKitFallbackBug();
+  this.browserInfo_ = userAgent.getBrowserInfo();
 };
 
 /**
@@ -38,7 +40,7 @@ webfont.FontWatcher.DEFAULT_VARIATION = 'n4';
  *     function(string, string), webfont.DomHelper,
  *     Object.<string, function(Object): number>,
  *     function(function(), number=), function(): number, string, string,
- *     boolean, Object.<string,boolean>=, string=)} fontWatchRunnerCtor The font watch runner constructor.
+ *     webfont.BrowserInfo, number=, Object.<string,boolean>=, string=)} fontWatchRunnerCtor The font watch runner constructor.
  * @param {boolean} last True if this is the last set of families to watch.
  */
 webfont.FontWatcher.prototype.watch = function(fontFamilies, fontDescriptions,
@@ -76,7 +78,8 @@ webfont.FontWatcher.prototype.watch = function(fontFamilies, fontDescriptions,
       var inactiveCallback = webfont.bind(this, this.fontInactive_)
       var fontWatchRunner = new fontWatchRunnerCtor(activeCallback,
           inactiveCallback, this.domHelper_, this.fontSizer_, this.asyncCall_,
-          this.getTime_, fontFamily, fontDescription, this.hasWebKitFallbackBug_, null, fontTestString);
+          this.getTime_, fontFamily, fontDescription,
+          this.browserInfo_, this.timeout_, null, fontTestString);
 
       fontWatchRunner.start();
     }

data/src/core/fontwatchrunner.js

@@ -8,12 +8,14 @@
  * @param {function(): number} getTime
  * @param {string} fontFamily
  * @param {string} fontDescription
- * @param {boolean} hasWebKitFallbackBug
+ * @param {webfont.BrowserInfo} browserInfo
+ * @param {number=} opt_timeout
  * @param {Object.<string, boolean>=} opt_metricCompatibleFonts
  * @param {string=} opt_fontTestString
  */
 webfont.FontWatchRunner = function(activeCallback, inactiveCallback, domHelper,
-    fontSizer, asyncCall, getTime, fontFamily, fontDescription, hasWebKitFallbackBug, opt_metricCompatibleFonts, opt_fontTestString) {
+    fontSizer, asyncCall, getTime, fontFamily, fontDescription, browserInfo,
+    opt_timeout, opt_metricCompatibleFonts, opt_fontTestString) {
   this.activeCallback_ = activeCallback;
   this.inactiveCallback_ = inactiveCallback;
   this.domHelper_ = domHelper;
@@ -23,8 +25,9 @@ webfont.FontWatchRunner = function(activeCallback, inactiveCallback, domHelper,
   this.fontFamily_ = fontFamily;
   this.fontDescription_ = fontDescription;
   this.fontTestString_ = opt_fontTestString || webfont.FontWatchRunner.DEFAULT_TEST_STRING;
-  this.hasWebKitFallbackBug_ = hasWebKitFallbackBug;
+  this.browserInfo_ = browserInfo;
   this.lastResortSizes_ = {};
+  this.timeout_ = opt_timeout || 5000;
 
   this.metricCompatibleFonts_ = opt_metricCompatibleFonts || null;
 
@@ -102,7 +105,11 @@ webfont.FontWatchRunner.prototype.start = function() {
  * @return {boolean}
  */
 webfont.FontWatchRunner.prototype.sizeMatches_ = function(size, lastResortFont) {
-  return size.equals(this.lastResortSizes_[lastResortFont]);
+  if (this.browserInfo_.hasWebKitMetricsBug()) {
+    return size.equalsWidth(this.lastResortSizes_[lastResortFont]);
+  } else {
+    return size.equals(this.lastResortSizes_[lastResortFont]);
+  }
 };
 
 /**
@@ -132,7 +139,7 @@ webfont.FontWatchRunner.prototype.sizesMatchLastResortSizes_ = function(a, b) {
  * @return {boolean}
  */
 webfont.FontWatchRunner.prototype.hasTimedOut_ = function() {
-  return this.getTime_() - this.started_ >= 5000;
+  return this.getTime_() - this.started_ >= this.timeout_;
 };
 
 /**
@@ -157,7 +164,7 @@ webfont.FontWatchRunner.prototype.isFallbackFont_ = function (sizeA, sizeB) {
  * @return {boolean}
  */
 webfont.FontWatchRunner.prototype.isLastResortFont_ = function (sizeA, sizeB) {
-  return this.hasWebKitFallbackBug_ && this.sizesMatchLastResortSizes_(sizeA, sizeB);
+  return this.browserInfo_.hasWebKitFallbackBug() && this.sizesMatchLastResortSizes_(sizeA, sizeB);
 };
 
 /**

data/src/core/size.js

@@ -15,5 +15,23 @@ webfont.Size = function (width, height) {
  * @return {boolean}
  */
 webfont.Size.prototype.equals = function (other) {
-  return !!other && this.width == other.width && this.height == other.height;
+  return this.equalsWidth(other) && this.equalsHeight(other);
+};
+
+/**
+ * Returns true if this.width equals other.width
+ * @param {webfont.Size} other
+ * @return {boolean}
+ */
+webfont.Size.prototype.equalsWidth = function (other) {
+  return !!other && this.width == other.width;
+};
+
+/**
+ * Returns true if this.height equals other.height
+ * @param {webfont.Size} other
+ * @return {boolean}
+ */
+webfont.Size.prototype.equalsHeight = function (other) {
+  return !!other && this.height == other.height;
 };

data/src/core/useragentparser.js

@@ -35,7 +35,7 @@ webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(
     webfont.UserAgentParser.UNKNOWN,
     webfont.UserAgentParser.UNKNOWN,
     undefined,
-    new webfont.BrowserInfo(false, false));
+    new webfont.BrowserInfo(false, false, false));
 
 /**
  * Parses the user agent string and returns an object.
@@ -142,12 +142,12 @@ webfont.UserAgentParser.prototype.parseIeUserAgentString_ = function() {
         (platform == "Windows Phone" && platformVersion.major >= 8);
 
     return new webfont.UserAgent(name, version, name, version,
-        platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, false));
+        platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, false, false));
   }
 
   return new webfont.UserAgent("MSIE", webfont.UserAgentParser.UNKNOWN,
       "MSIE", webfont.UserAgentParser.UNKNOWN,
-      platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(false, false));
+      platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(false, false, false));
 };
 
 /**
@@ -192,7 +192,7 @@ webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
 
     return new webfont.UserAgent("OperaMini", version, engineName,
         engineVersion, this.getPlatform_(), this.getPlatformVersion_(),
-        this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(false, false));
+        this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(false, false, false));
   }
 
   // Otherwise, find version information for normal Opera or Opera Mobile
@@ -203,7 +203,7 @@ webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
       var version = this.parseVersion_(versionString);
       return new webfont.UserAgent("Opera", versionString, engineName, engineVersion,
           this.getPlatform_(), this.getPlatformVersion_(),
-          this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(version.major >= 10, false));
+          this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(version.major >= 10, false, false));
     }
   }
   var versionString = this.getMatchingGroup_(this.userAgent_, /Opera[\/ ]([\d\.]+)/, 1);
@@ -212,11 +212,11 @@ webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
     var version = this.parseVersion_(versionString);
     return new webfont.UserAgent("Opera", versionString, engineName, engineVersion,
         this.getPlatform_(), this.getPlatformVersion_(),
-        this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(version.major >= 10, false));
+        this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(version.major >= 10, false, false));
   }
   return new webfont.UserAgent("Opera", webfont.UserAgentParser.UNKNOWN,
       engineName, engineVersion, this.getPlatform_(),
-      this.getPlatformVersion_(), this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(false, false));
+      this.getPlatformVersion_(), this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(false, false, false));
 };
 
 /**
@@ -279,10 +279,11 @@ webfont.UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
     supportWebFont = webKitVersion.major >= 526 || webKitVersion.major >= 525 && webKitVersion.minor >= 13;
   }
 
-  var hasWebKitFallbackBug = webKitVersion.major < 536 || (webKitVersion.major == 536 && webKitVersion.minor < 11);
+  var hasWebKitFallbackBug = webKitVersion.major < 536 || (webKitVersion.major == 536 && webKitVersion.minor < 11),
+      hasWebKitMetricsBug = platform == 'iPhone' || platform == 'iPad' || platform == 'iPod' || platform == 'Macintosh';
 
   return new webfont.UserAgent(name, version, "AppleWebKit", webKitVersionString,
-      platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, hasWebKitFallbackBug));
+      platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, hasWebKitFallbackBug, hasWebKitMetricsBug));
 };
 
 /**
@@ -331,7 +332,7 @@ webfont.UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
     }
   }
   return new webfont.UserAgent(name, version, "Gecko", geckoVersionString,
-      this.getPlatform_(), this.getPlatformVersion_(), this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, false));
+      this.getPlatform_(), this.getPlatformVersion_(), this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, false, false));
 };
 
 /**

data/src/typekit/typekit_script.js

@@ -13,7 +13,7 @@ webfont.TypekitScript.HOOK = '__webfonttypekitmodule__';
 
 webfont.TypekitScript.prototype.getScriptSrc = function(kitId) {
   var protocol = this.domHelper_.getProtocol();
-  var api = this.configuration_['api'] || protocol + '//use.typekit.com';
+  var api = this.configuration_['api'] || protocol + '//use.typekit.net';
   return api + '/' + kitId + '.js';
 };
 

data/webfontloader.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'webfontloader'
-  s.version           = '1.2.1'
-  s.date              = '2013-02-26'
+  s.version           = '1.3.0'
+  s.date              = '2013-02-28'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 1
-  version: 1.2.1
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-02-26 00:00:00 Z
+date: 2013-02-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   prerelease: false