webfontloader 1.4.5 → 1.4.6

data/CHANGELOG

@@ -1,3 +1,7 @@
+v1.4.6 (May 29, 2013)
+* Merge font watching strategies from core and the Google module
+* Add support for the Samsung Galaxy S4 user agent string
+
 v1.4.5 (May 23, 2013)
 * Move modules into their own namespace
 * Add new methods into DomHelper and add specs for all DomHelper methods

data/lib/webfontloader.rb

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

data/spec/core/fontwatcher_spec.js

@@ -1,5 +1,6 @@
 describe('FontWatcher', function () {
   var FontWatcher = webfont.FontWatcher,
+      FontWatchRunner = webfont.FontWatchRunner,
       Font = webfont.Font,
       UserAgent = webfont.UserAgent,
       BrowserInfo = webfont.BrowserInfo,
@@ -30,42 +31,34 @@ describe('FontWatcher', function () {
     eventDispatcher.dispatchFontInactive = jasmine.createSpy('dispatchFontInactive');
     eventDispatcher.dispatchActive = jasmine.createSpy('dispatchActive');
     eventDispatcher.dispatchInactive = jasmine.createSpy('dispatchInactive');
-  });
 
-  function FakeFontWatchRunner(activeCallback, inactiveCallback, domHelper,
-    font, browserInfo, opt_timeout, opt_metricCompatibleFonts, opt_fontTestString) {
-    this.activeCallback = activeCallback;
-    this.inactiveCallback = inactiveCallback;
-    this.font = font;
-    timeout(opt_timeout);
-
-    if (opt_fontTestString) {
-      testStrings(opt_fontTestString);
-    }
-  }
-
-  FakeFontWatchRunner.prototype.start = function () {
-    var found = false;
-
-    for (var i = 0; i < activeFonts.length; i += 1) {
-      if (activeFonts[i].getName() === this.font.getName()) {
-        found = true;
-        break;
+    spyOn(FontWatchRunner.prototype, 'start').andCallFake(function (font, fontTestString) {
+      var found = false;
+
+      testStrings(this.fontTestString_);
+      timeout(this.timeout_);
+
+      for (var i = 0; i < activeFonts.length; i += 1) {
+        if (activeFonts[i].getName() === this.font_.getName()) {
+          found = true;
+          break;
+        }
+      }
+
+      if (found) {
+        this.activeCallback_(this.font_);
+      } else {
+        this.inactiveCallback_(this.font_);
       }
-    }
-    if (found) {
-      this.activeCallback(this.font);
-    } else {
-      this.inactiveCallback(this.font);
-    }
-  };
+    });
+  });
 
   describe('watch zero fonts', function () {
     it('should call inactive when there are no fonts to load', function () {
       activeFonts = [];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([], {}, null, true);
       expect(eventDispatcher.dispatchInactive).toHaveBeenCalled();
     });
 
@@ -73,7 +66,7 @@ describe('FontWatcher', function () {
       activeFonts = [];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([], {}, FakeFontWatchRunner, false);
+      fontWatcher.watchFonts([], {}, null, false);
       expect(eventDispatcher.dispatchInactive).not.toHaveBeenCalled();
     });
   });
@@ -83,7 +76,7 @@ describe('FontWatcher', function () {
       activeFonts = [font1];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, false);
+      fontWatcher.watchFonts([font1], {}, null, false);
       expect(eventDispatcher.dispatchFontInactive).not.toHaveBeenCalled();
       expect(eventDispatcher.dispatchActive).not.toHaveBeenCalled();
       expect(eventDispatcher.dispatchInactive).not.toHaveBeenCalled();
@@ -95,7 +88,7 @@ describe('FontWatcher', function () {
       activeFonts = [font1];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontActive).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontInactive).not.toHaveBeenCalled();
@@ -109,7 +102,7 @@ describe('FontWatcher', function () {
       activeFonts = [];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontActive).not.toHaveBeenCalled();
       expect(eventDispatcher.dispatchFontInactive).toHaveBeenCalledWith(font1);
@@ -123,7 +116,7 @@ describe('FontWatcher', function () {
       activeFonts = [font1, font2, font3];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1, font2, font3], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontActive).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontInactive).not.toHaveBeenCalled();
@@ -137,7 +130,7 @@ describe('FontWatcher', function () {
       activeFonts = [];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1, font2, font3], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font1);
       expect(eventDispatcher.dispatchFontActive).not.toHaveBeenCalled();
       expect(eventDispatcher.dispatchFontInactive).toHaveBeenCalledWith(font1);
@@ -151,7 +144,7 @@ describe('FontWatcher', function () {
       activeFonts = [font1, font3];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([font1, font2, font3], {}, FakeFontWatchRunner, true);
+      fontWatcher.watchFonts([font1, font2, font3], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading.callCount).toEqual(3);
       expect(eventDispatcher.dispatchFontLoading.calls[0].args[0]).toEqual(font1);
       expect(eventDispatcher.dispatchFontLoading.calls[1].args[0]).toEqual(font2);
@@ -180,8 +173,7 @@ describe('FontWatcher', function () {
       activeFonts = [font5, font6];
       var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher);
 
-      fontWatcher.watchFonts([font5, font6, font7, font8, font9], {}, FakeFontWatchRunner, true);
-
+      fontWatcher.watchFonts([font5, font6, font7, font8, font9], {}, null, true);
       expect(eventDispatcher.dispatchFontLoading.callCount).toEqual(5);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font5);
       expect(eventDispatcher.dispatchFontLoading).toHaveBeenCalledWith(font6);
@@ -214,18 +206,20 @@ describe('FontWatcher', function () {
         'font2': null,
         'font3': 'testString2',
         'font4': null
-      }, FakeFontWatchRunner, true);
+      }, null, true);
 
-      expect(testStrings.callCount).toEqual(2);
-      expect(testStrings).toHaveBeenCalledWith('testString1');
-      expect(testStrings).toHaveBeenCalledWith('testString2');
+      expect(testStrings.callCount).toEqual(4);
+      expect(testStrings.calls[0].args[0]).toEqual('testString1');
+      expect(testStrings.calls[1].args[0]).toEqual(FontWatchRunner.DEFAULT_TEST_STRING);
+      expect(testStrings.calls[2].args[0]).toEqual('testString2');
+      expect(testStrings.calls[3].args[0]).toEqual(FontWatchRunner.DEFAULT_TEST_STRING);
     });
   });
 
   it('should pass on the timeout to FontWatchRunner', function () {
     var fontWatcher = new FontWatcher(userAgent, domHelper, eventDispatcher, 4000);
 
-    fontWatcher.watchFonts([font1], {}, FakeFontWatchRunner, true);
+    fontWatcher.watchFonts([font1], {}, null, true);
 
     expect(timeout).toHaveBeenCalledWith(4000);
   });

data/spec/core/fontwatchrunner_spec.js

@@ -189,8 +189,7 @@ describe('FontWatchRunner', function () {
         timesToGetTimeBeforeTimeout = 2;
 
         var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-            domHelper, font, fallbackBugBrowserInfo,
-            0, { 'My Other Family': true });
+            domHelper, font, fallbackBugBrowserInfo, 0, { 'My Other Family': true });
 
         fontWatchRunner.start();
 
@@ -207,13 +206,12 @@ describe('FontWatchRunner', function () {
         timesToGetTimeBeforeTimeout = 2;
 
         var fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-            domHelper, font, fallbackBugBrowserInfo,
-            0, { 'My Family': true });
+            domHelper, new Font('Arimo'), fallbackBugBrowserInfo, 0, { 'Arimo': true });
 
         fontWatchRunner.start();
 
         jasmine.Clock.tick(1 * 25);
-        expect(activeCallback).toHaveBeenCalledWith(font);
+        expect(activeCallback).toHaveBeenCalledWith(new Font('Arimo'));
       });
     });
 
@@ -243,7 +241,7 @@ describe('FontWatchRunner', function () {
         ];
 
         fontWatchRunner = new FontWatchRunner(activeCallback, inactiveCallback,
-            domHelper, font, browserInfo, 0, {}, 'TestString');
+            domHelper, font, browserInfo, 0, null, 'TestString');
 
         fontWatchRunner.start();
 

data/spec/core/useragentparser_spec.js

@@ -277,6 +277,22 @@ describe('UserAgentParser', function () {
             hasWebKitMetricsBug: false
           }
         });
+
+        expect(parse('Mozilla/5.0 (Linux; Android 4.2.2; SGH-M919 Build/JDQ39) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.169 Mobile Safari/537.22'))
+        .toMatchUserAgent({
+          name: 'Chrome',
+          version: new Version(25, 0, 1364, 169),
+          platform: 'Android',
+          platformVersion: new Version(4, 2, 2),
+          engine: 'AppleWebKit',
+          engineVersion: new Version(537, 22),
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: false,
+            hasWebKitMetricsBug: false
+          }
+        });
       });
 
       it('should detect Chrome on iPad', function () {
@@ -617,6 +633,40 @@ describe('UserAgentParser', function () {
         });
       });
 
+      it('should detect Samsung Galaxy S4 builtin browser', function () {
+        expect(parse('Mozilla/5.0 (Linux; Android 4.2.2; sl-si; SAMSUNG GT-I9505 Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Version/1.0 Chrome/18.0.1025.308 Mobile Safari/535.19'))
+        .toMatchUserAgent({
+          name: 'Chrome',
+          version: new Version(18, 0, 1025, 308),
+          platform: 'Android',
+          platformVersion: new Version(4, 2, 2),
+          engine: 'AppleWebKit',
+          engineVersion: new Version(535, 19),
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+
+        expect(parse('Mozilla/5.0 (Linux; Android 4.2.2; en-us; SAMSUNG SGH-M919 Build/JDQ39) AppleWebKit/535.19 (KHTML, like Gecko) Version/1.0 Chrome/18.0.1025.308 Mobile Safari/535.19'))
+        .toMatchUserAgent({
+          name: 'Chrome',
+          version: new Version(18, 0, 1025, 308),
+          platform: 'Android',
+          platformVersion: new Version(4, 2, 2),
+          engine: 'AppleWebKit',
+          engineVersion: new Version(535, 19),
+          documentMode: undefined,
+          browserInfo: {
+            hasWebFontSupport: true,
+            hasWebKitFallbackBug: true,
+            hasWebKitMetricsBug: false
+          }
+        });
+      });
+
       it('should detect Android builtin browser in Desktop mode (Nexus 7)', function () {
         expect(parse('Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.34 Safari/534.24'))
         .toMatchUserAgent({

data/spec/core/webfont_spec.js

@@ -1,6 +1,7 @@
 describe('WebFont', function () {
   var WebFont = webfont.WebFont,
       UserAgent = webfont.UserAgent,
+      FontWatchRunner = webfont.FontWatchRunner,
       BrowserInfo = webfont.BrowserInfo,
       Version = webfont.Version,
       Font = webfont.Font,
@@ -141,22 +142,13 @@ describe('WebFont', function () {
           this.fonts = [];
         };
 
-        testModule.getFontWatchRunnerCtor = function () {
-          function FakeFontWatchRunner(activeCallback, inactiveCallback) {
-            this.inactive = inactiveCallback;
-            this.active = activeCallback;
-          };
-
-          FakeFontWatchRunner.prototype.start = function () {
-            if (conf.id) {
-              this.active(font);
-            } else {
-              this.inactive(font);
-            }
-          };
-
-          return FakeFontWatchRunner;
-        };
+        spyOn(FontWatchRunner.prototype, 'start').andCallFake(function () {
+          if (conf.id) {
+            active(font);
+          } else {
+            inactive(font);
+          }
+        });
 
         testModule.supportUserAgent = function (userAgent, support) {
           if (conf.id) {
@@ -231,8 +223,8 @@ describe('WebFont', function () {
       });
 
       expect(font.onModuleReady_).toHaveBeenCalled();
-      expect(font.onModuleReady_.calls[0].args[3]).toEqual([new Font('Elena')]);
-      expect(font.onModuleReady_.calls[0].args[4]).toEqual({ 'Elena': '1234567' });
+      expect(font.onModuleReady_.calls[0].args[2]).toEqual([new Font('Elena')]);
+      expect(font.onModuleReady_.calls[0].args[3]).toEqual({ 'Elena': '1234567' });
     });
   });
 

data/spec/deps.js

@@ -19,9 +19,8 @@ goog.addDependency("../../src/core/webfont.js", ["webfont.WebFont"], ["webfont.D
 goog.addDependency("../../src/modules/ascender.js", ["webfont.modules.Ascender"], ["webfont.Font"]);
 goog.addDependency("../../src/modules/custom.js", ["webfont.modules.Custom"], ["webfont.Font"]);
 goog.addDependency("../../src/modules/fontdeck.js", ["webfont.modules.Fontdeck"], ["webfont.Font"]);
-goog.addDependency("../../src/modules/google/fontapiparser.js", ["webfont.modules.FontApiParser"], ["webfont.Font"]);
-goog.addDependency("../../src/modules/google/fontapiurlbuilder.js", ["webfont.modules.FontApiUrlBuilder"], []);
-goog.addDependency("../../src/modules/google/googlefontapi.js", ["webfont.modules.GoogleFontApi"], ["webfont.modules.FontApiUrlBuilder","webfont.modules.FontApiParser","webfont.FontWatchRunner","webfont.modules.LastResortWebKitFontWatchRunner"]);
-goog.addDependency("../../src/modules/google/lastresortwebkitfontwatchrunner.js", ["webfont.modules.LastResortWebKitFontWatchRunner"], ["webfont.Font","webfont.FontRuler"]);
+goog.addDependency("../../src/modules/google/fontapiparser.js", ["webfont.modules.google.FontApiParser"], ["webfont.Font"]);
+goog.addDependency("../../src/modules/google/fontapiurlbuilder.js", ["webfont.modules.google.FontApiUrlBuilder"], []);
+goog.addDependency("../../src/modules/google/googlefontapi.js", ["webfont.modules.google.GoogleFontApi"], ["webfont.modules.google.FontApiUrlBuilder","webfont.modules.google.FontApiParser","webfont.FontWatchRunner"]);
 goog.addDependency("../../src/modules/monotype.js", ["webfont.modules.Monotype"], ["webfont.Font"]);
 goog.addDependency("../../src/modules/typekit.js", ["webfont.modules.Typekit"], ["webfont.Font"]);

data/spec/index.html

@@ -30,7 +30,7 @@
       goog.require('webfont.modules.Fontdeck');
       goog.require('webfont.modules.Monotype');
       goog.require('webfont.modules.Custom');
-      goog.require('webfont.modules.GoogleFontApi');
+      goog.require('webfont.modules.google.GoogleFontApi');
     </script>
 
     <script src="../spec/core/domhelper_spec.js"></script>
@@ -47,7 +47,6 @@
     <script src="../spec/modules/google/fontapiparser_spec.js"></script>
     <script src="../spec/modules/google/fontapiurlbuilder_spec.js"></script>
     <script src="../spec/modules/google/googlefontapi_spec.js"></script>
-    <script src="../spec/modules/google/lastresortwebkitfontwatchrunner_spec.js"></script>
     <script src="../spec/modules/custom_spec.js"></script>
     <script src="../spec/modules/ascender_spec.js"></script>
     <script src="../spec/modules/fontdeck_spec.js"></script>

data/src/core/fontmodule.js

@@ -0,0 +1,22 @@
+goog.provide('webfont.FontModule');
+
+/**
+ * @interface
+ */
+webfont.FontModule = function () {};
+
+goog.scope(function () {
+  var FontModule = webfont.FontModule;
+
+  /**
+   * @param {webfont.UserAgent} userAgent
+   * @param {function(boolean)} support
+   */
+  FontModule.prototype.supportUserAgent = function (userAgent, support) {};
+
+  /**
+   * @param {function(Array.<webfont.Font>,  webfont.FontTestStrings=, Object.<string, boolean>=)} onReady
+   */
+  FontModule.prototype.load = function (onReady) {};
+});
+

data/src/core/fontmoduleloader.js

@@ -1,27 +1,6 @@
 goog.provide('webfont.FontModuleLoader');
-goog.provide('webfont.FontModule');
 goog.provide('webfont.FontModuleFactory');
 
-/**
- * @interface
- */
-webfont.FontModule = function () {};
-
-goog.scope(function () {
-  var FontModule = webfont.FontModule;
-
-  /**
-   * @param {webfont.UserAgent} userAgent
-   * @param {function(boolean)} support
-   */
-  FontModule.prototype.supportUserAgent = function (userAgent, support) {};
-
-  /**
-   * @param {function(Array.<webfont.Font>,  webfont.FontTestStrings=)} onReady
-   */
-  FontModule.prototype.load = function (onReady) {};
-});
-
 /** @typedef {function(Object, webfont.DomHelper): webfont.FontModule} */
 webfont.FontModuleFactory;
 

data/src/core/fontwatcher.js

@@ -21,26 +21,19 @@ webfont.FontWatcher = function(userAgent, domHelper, eventDispatcher, opt_timeou
 };
 
 goog.scope(function () {
-  var FontWatcher = webfont.FontWatcher;
+  var FontWatcher = webfont.FontWatcher,
+      FontWatchRunner = webfont.FontWatchRunner;
 
   /**
    * Watches a set of font families.
    * @param {Array.<webfont.Font>} fonts The fonts to watch.
    * @param {Object.<string, string>} fontTestStrings The font test strings for
    *     each family.
-   * @param {function(new:webfont.FontWatchRunner,
-   *                  function(webfont.Font),
-   *                  function(webfont.Font),
-   *                  webfont.DomHelper,
-   *                  webfont.Font,
-   *                  webfont.BrowserInfo,
-   *                  number=,
-   *                  Object.<string, boolean>=,
-   *                  string=)} fontWatchRunnerCtor The font watch runner constructor.
+   * @param {Object.<String, boolean>} metricCompatibleFonts
    * @param {boolean} last True if this is the last set of fonts to watch.
    */
   FontWatcher.prototype.watchFonts = function(fonts,
-      fontTestStrings, fontWatchRunnerCtor, last) {
+      fontTestStrings, metricCompatibleFonts, last) {
     var length = fonts.length;
 
     if (length === 0 && last) {
@@ -48,23 +41,28 @@ goog.scope(function () {
       return;
     }
 
-    this.currentlyWatched_ += length;
+    this.currentlyWatched_ += fonts.length;
 
     if (last) {
       this.last_ = last;
     }
 
-    for (var i = 0; i < length; i++) {
-      var font = fonts[i];
-      var fontTestString  = fontTestStrings[font.getName()];
+    for (var i = 0; i < fonts.length; i++) {
+      var font = fonts[i],
+          fontTestString = fontTestStrings[font.getName()];
 
       this.eventDispatcher_.dispatchFontLoading(font);
 
-      var activeCallback = goog.bind(this.fontActive_, this);
-      var inactiveCallback = goog.bind(this.fontInactive_, this);
-      var fontWatchRunner = new fontWatchRunnerCtor(activeCallback,
-          inactiveCallback, this.domHelper_, font,
-          this.browserInfo_, this.timeout_, null, fontTestString);
+      var fontWatchRunner = new FontWatchRunner(
+            goog.bind(this.fontActive_, this),
+            goog.bind(this.fontInactive_, this),
+            this.domHelper_,
+            font,
+            this.browserInfo_,
+            this.timeout_,
+            metricCompatibleFonts,
+            fontTestString
+          );
 
       fontWatchRunner.start();
     }

data/src/core/useragentparser.js

@@ -313,10 +313,10 @@ goog.scope(function () {
       browserVersion = new Version();
     } else if (browserName == "Silk") {
       browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Silk\/([\d\._]+)/, 1));
-    } else if (this.userAgent_.indexOf("Version/") != -1) {
-      browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Version\/([\d\.\w]+)/, 1));
     } else if (browserName == "Chrome") {
       browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /(Chrome|CrMo|CriOS)\/([\d\.]+)/, 2));
+    } else if (this.userAgent_.indexOf("Version/") != -1) {
+      browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Version\/([\d\.\w]+)/, 1));
     } else if (browserName == "AdobeAIR") {
       browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /AdobeAIR\/([\d\.]+)/, 1));
     }

data/src/core/webfont.js

@@ -58,9 +58,7 @@ goog.scope(function () {
    */
   WebFont.prototype.isModuleSupportingUserAgent_ = function(module, eventDispatcher,
       fontWatcher, support) {
-    var fontWatchRunnerCtor = module.getFontWatchRunnerCtor ?
-        module.getFontWatchRunnerCtor() : webfont.FontWatchRunner,
-        that = this;
+    var that = this;
 
     if (!support) {
       var allModulesLoaded = --this.moduleLoading_ == 0;
@@ -73,32 +71,23 @@ goog.scope(function () {
           eventDispatcher.dispatchLoading();
         }
       }
-      fontWatcher.watchFonts([], {}, fontWatchRunnerCtor, allModulesLoaded);
+      fontWatcher.watchFonts([], {}, null, allModulesLoaded);
       return;
     }
 
-    module.load(function (fonts, opt_fontTestStrings) {
-      that.onModuleReady_(eventDispatcher, fontWatcher, fontWatchRunnerCtor, fonts, opt_fontTestStrings);
+    module.load(function (fonts, opt_fontTestStrings, opt_metricCompatibleFonts) {
+      that.onModuleReady_(eventDispatcher, fontWatcher, fonts, opt_fontTestStrings, opt_metricCompatibleFonts);
     });
   };
 
   /**
    * @param {webfont.EventDispatcher} eventDispatcher
    * @param {webfont.FontWatcher} fontWatcher
-   * @param {function(new:webfont.FontWatchRunner,
-   *                  function(webfont.Font),
-   *                  function(webfont.Font),
-   *                  webfont.DomHelper,
-   *                  webfont.Font,
-   *                  webfont.BrowserInfo,
-   *                  number=,
-   *                  Object.<string, boolean>=,
-   *                  string=)} fontWatchRunnerCtor
    * @param {Array.<webfont.Font>} fonts
    * @param {webfont.FontTestStrings=} opt_fontTestStrings
+   * @param {Object.<string, boolean>=} opt_metricCompatibleFonts
    */
-  WebFont.prototype.onModuleReady_ = function(eventDispatcher, fontWatcher,
-      fontWatchRunnerCtor, fonts, opt_fontTestStrings) {
+  WebFont.prototype.onModuleReady_ = function(eventDispatcher, fontWatcher, fonts, opt_fontTestStrings, opt_metricCompatibleFonts) {
     var allModulesLoaded = --this.moduleLoading_ == 0;
 
     if (allModulesLoaded) {
@@ -106,7 +95,7 @@ goog.scope(function () {
     }
 
     setTimeout(function () {
-      fontWatcher.watchFonts(fonts, opt_fontTestStrings || {}, fontWatchRunnerCtor, allModulesLoaded);
+      fontWatcher.watchFonts(fonts, opt_fontTestStrings || {}, opt_metricCompatibleFonts || null, allModulesLoaded);
     }, 0);
   };
 

data/src/modules.yml

@@ -8,6 +8,7 @@ core:
   - core/cssclassname.js
   - core/font.js
   - core/eventdispatcher.js
+  - core/fontmodule.js
   - core/fontmoduleloader.js
   - core/fontruler.js
   - core/fontwatchrunner.js
@@ -19,7 +20,6 @@ ascender:
   - modules/ascender.js
 
 google:
-  - modules/google/lastresortwebkitfontwatchrunner.js
   - modules/google/fontapiurlbuilder.js
   - modules/google/fontapiparser.js
   - modules/google/googlefontapi.js

data/src/modules/google/googlefontapi.js

@@ -3,7 +3,6 @@ goog.provide('webfont.modules.google.GoogleFontApi');
 goog.require('webfont.modules.google.FontApiUrlBuilder');
 goog.require('webfont.modules.google.FontApiParser');
 goog.require('webfont.FontWatchRunner');
-goog.require('webfont.modules.google.LastResortWebKitFontWatchRunner');
 
 /**
  * @constructor
@@ -20,19 +19,17 @@ webfont.modules.google.GoogleFontApi.NAME = 'google';
 goog.scope(function () {
   var GoogleFontApi = webfont.modules.google.GoogleFontApi,
       FontWatchRunner = webfont.FontWatchRunner,
-      LastResortWebKitFontWatchRunner = webfont.modules.google.LastResortWebKitFontWatchRunner,
       FontApiUrlBuilder = webfont.modules.google.FontApiUrlBuilder,
       FontApiParser = webfont.modules.google.FontApiParser;
 
-  GoogleFontApi.prototype.supportUserAgent = function(userAgent, support) {
-    support(userAgent.getBrowserInfo().hasWebFontSupport());
+  GoogleFontApi.METRICS_COMPATIBLE_FONTS = {
+    "Arimo": true,
+    "Cousine": true,
+    "Tinos": true
   };
 
-  GoogleFontApi.prototype.getFontWatchRunnerCtor = function() {
-    if (this.userAgent_.getEngine() == "AppleWebKit") {
-      return LastResortWebKitFontWatchRunner;
-    }
-    return FontWatchRunner;
+  GoogleFontApi.prototype.supportUserAgent = function(userAgent, support) {
+    support(userAgent.getBrowserInfo().hasWebFontSupport());
   };
 
   GoogleFontApi.prototype.load = function(onReady) {
@@ -59,7 +56,7 @@ goog.scope(function () {
 
     domHelper.insertInto('head', domHelper.createCssLink(
         fontApiUrlBuilder.build()));
-    onReady(fontApiParser.getFonts(), fontApiParser.getFontTestStrings());
+    onReady(fontApiParser.getFonts(), fontApiParser.getFontTestStrings(), GoogleFontApi.METRICS_COMPATIBLE_FONTS);
   };
 });
 

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.4.5'
-  s.date              = '2013-05-23'
+  s.version           = '1.4.6'
+  s.date              = '2013-05-29'
 
   ## Make sure your summary is short. The description may be as long
   ## as you like.
@@ -142,7 +142,6 @@ DESC
     spec/modules/google/fontapiparser_spec.js
     spec/modules/google/fontapiurlbuilder_spec.js
     spec/modules/google/googlefontapi_spec.js
-    spec/modules/google/lastresortwebkitfontwatchrunner_spec.js
     spec/modules/monotype_spec.js
     spec/modules/typekit_spec.js
     src/async_load.js
@@ -152,6 +151,7 @@ DESC
     src/core/domhelper.js
     src/core/eventdispatcher.js
     src/core/font.js
+    src/core/fontmodule.js
     src/core/fontmoduleloader.js
     src/core/fontruler.js
     src/core/fontwatcher.js
@@ -169,7 +169,6 @@ DESC
     src/modules/google/fontapiparser.js
     src/modules/google/fontapiurlbuilder.js
     src/modules/google/googlefontapi.js
-    src/modules/google/lastresortwebkitfontwatchrunner.js
     src/modules/monotype.js
     src/modules/typekit.js
     tools/compiler/base.js

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: webfontloader
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
   - 4
-  - 5
-  version: 1.4.5
+  - 6
+  version: 1.4.6
 platform: ruby
 authors: 
 - Ryan Carver
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-05-23 00:00:00 Z
+date: 2013-05-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -170,7 +170,6 @@ files:
 - spec/modules/google/fontapiparser_spec.js
 - spec/modules/google/fontapiurlbuilder_spec.js
 - spec/modules/google/googlefontapi_spec.js
-- spec/modules/google/lastresortwebkitfontwatchrunner_spec.js
 - spec/modules/monotype_spec.js
 - spec/modules/typekit_spec.js
 - src/async_load.js
@@ -180,6 +179,7 @@ files:
 - src/core/domhelper.js
 - src/core/eventdispatcher.js
 - src/core/font.js
+- src/core/fontmodule.js
 - src/core/fontmoduleloader.js
 - src/core/fontruler.js
 - src/core/fontwatcher.js
@@ -197,7 +197,6 @@ files:
 - src/modules/google/fontapiparser.js
 - src/modules/google/fontapiurlbuilder.js
 - src/modules/google/googlefontapi.js
-- src/modules/google/lastresortwebkitfontwatchrunner.js
 - src/modules/monotype.js
 - src/modules/typekit.js
 - tools/compiler/base.js

data/spec/modules/google/lastresortwebkitfontwatchrunner_spec.js

@@ -1,137 +0,0 @@
-describe('modules.google.LastResortWebKitFontWatchRunner', function () {
-  var LastResortWebKitFontWatchRunner = webfont.modules.google.LastResortWebKitFontWatchRunner,
-      BrowserInfo = webfont.BrowserInfo,
-      DomHelper = webfont.DomHelper,
-      FontRuler = webfont.FontRuler,
-      Font = webfont.Font,
-      domHelper = new DomHelper(window),
-      font = new Font('My Family', 'n4');
-
-  var TARGET_SIZE = 3,
-      FALLBACK_SIZE_A = 1,
-      FALLBACK_SIZE_B = 2,
-      LAST_RESORT_SIZE = 4,
-
-      browserInfo = new BrowserInfo(true, true, false),
-      setupWidths = [FALLBACK_SIZE_A, FALLBACK_SIZE_B, LAST_RESORT_SIZE],
-      actualWidths = [],
-      timesToGetTimeBeforeTimeout = 10,
-      activeCallback = null,
-      inactiveCallback = null;
-
-  beforeEach(function () {
-    jasmine.Clock.useMock();
-
-    actualWidths = [];
-
-    activeCallback = jasmine.createSpy('activeCallback');
-    inactiveCallback = jasmine.createSpy('inactiveCallback');
-    timesToGetTimeBeforeTimeout = 10;
-
-    var setupFinished = false,
-        fakeGetWidthCount = 0;
-
-    spyOn(FontRuler.prototype, 'getWidth').andCallFake(function () {
-      var result = null;
-
-      if (setupFinished) {
-        // If you are getting an exception here your tests does not specify enough
-        // size data to run properly.
-        if (fakeGetWidthCount >= actualWidths.length) {
-          throw 'Invalid test data';
-        }
-        result = actualWidths[fakeGetWidthCount];
-        fakeGetWidthCount += 1;
-      } else {
-        result = setupWidths[Math.min(fakeGetWidthCount, setupWidths.length - 1)];
-        fakeGetWidthCount += 1;
-      }
-      return result;
-    });
-
-    spyOn(goog, 'now').andCallFake(function () {
-      if (timesToGetTimeBeforeTimeout <= 0) {
-        return 6000;
-      } else {
-        timesToGetTimeBeforeTimeout -= 1;
-        return 1;
-      }
-    });
-
-    var originalStart = LastResortWebKitFontWatchRunner.prototype.start;
-
-    spyOn(LastResortWebKitFontWatchRunner.prototype, 'start').andCallFake(function () {
-      setupFinished = true;
-      fakeGetWidthCount = 0;
-      originalStart.apply(this);
-    });
-  });
-
-  it('should ignore fallback size and call active', function () {
-    actualWidths = [
-      LAST_RESORT_SIZE, LAST_RESORT_SIZE,
-      TARGET_SIZE, TARGET_SIZE
-    ];
-
-    var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, font, browserInfo);
-
-    fontWatchRunner.start();
-
-    jasmine.Clock.tick(1 * 25);
-    expect(activeCallback).toHaveBeenCalledWith(font);
-  });
-
-  it('should consider last resort font as having identical metrics and call active', function () {
-    actualWidths = [
-      LAST_RESORT_SIZE, LAST_RESORT_SIZE,
-      LAST_RESORT_SIZE, LAST_RESORT_SIZE
-    ];
-
-    timesToGetTimeBeforeTimeout = 2;
-
-    var arimo = new Font('Arimo');
-
-    var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, arimo, browserInfo);
-
-    fontWatchRunner.start();
-
-    jasmine.Clock.tick(1 * 25);
-    expect(activeCallback).toHaveBeenCalledWith(arimo);
-  });
-
-  it('should fail to load font and call inactive', function () {
-    actualWidths = [
-      LAST_RESORT_SIZE, LAST_RESORT_SIZE,
-      LAST_RESORT_SIZE, LAST_RESORT_SIZE,
-      FALLBACK_SIZE_A, FALLBACK_SIZE_B
-    ];
-
-    timesToGetTimeBeforeTimeout = 3;
-
-    var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, font, browserInfo);
-
-    fontWatchRunner.start();
-
-    jasmine.Clock.tick(2 * 25);
-    expect(inactiveCallback).toHaveBeenCalledWith(font);
-  });
-
-  it('should call inactive when we are loading a metric incompatible font', function () {
-    actualWidths = [
-      LAST_RESORT_SIZE, LAST_RESORT_SIZE,
-      LAST_RESORT_SIZE, LAST_RESORT_SIZE
-    ];
-
-    timesToGetTimeBeforeTimeout = 2;
-
-    var fontWatchRunner = new LastResortWebKitFontWatchRunner(activeCallback, inactiveCallback,
-        domHelper, font, browserInfo);
-
-    fontWatchRunner.start();
-    jasmine.Clock.tick(1 * 25);
-    expect(inactiveCallback).toHaveBeenCalledWith(font);
-  });
-});

data/src/modules/google/lastresortwebkitfontwatchrunner.js

@@ -1,115 +0,0 @@
-goog.provide('webfont.modules.google.LastResortWebKitFontWatchRunner');
-
-goog.require('webfont.Font');
-goog.require('webfont.FontRuler');
-
-/**
- * @constructor
- * @param {function(webfont.Font)} activeCallback
- * @param {function(webfont.Font)} inactiveCallback
- * @param {webfont.DomHelper} domHelper
- * @param {webfont.Font} font
- * @param {webfont.BrowserInfo} browserInfo
- * @param {number=} opt_timeout
- * @param {Object.<string, boolean>=} opt_metricCompatibleFonts
- * @param {string=} opt_fontTestString
- * @extends webfont.FontWatchRunner
- */
-webfont.modules.google.LastResortWebKitFontWatchRunner = function(activeCallback,
-    inactiveCallback, domHelper, font,
-    browserInfo, opt_timeout, opt_metricCompatibleFonts, opt_fontTestString) {
-
-  goog.base(this, activeCallback, inactiveCallback, domHelper,
-            font, browserInfo, opt_timeout, opt_metricCompatibleFonts, opt_fontTestString);
-
-  this.webKitLastResortFontWidths_ = this.setUpWebKitLastResortFontWidths_();
-  this.webKitLastResortWidthChange_ = false;
-  this.lastObservedWidthA_ = this.lastResortWidths_[webfont.FontWatchRunner.LastResortFonts.SERIF];
-  this.lastObservedWidthB_ = this.lastResortWidths_[webfont.FontWatchRunner.LastResortFonts.SANS_SERIF];;
-};
-
-goog.inherits(webfont.modules.google.LastResortWebKitFontWatchRunner, webfont.FontWatchRunner)
-
-webfont.modules.google.LastResortWebKitFontWatchRunner.METRICS_COMPATIBLE_FONTS = {
-    "Arimo": true,
-    "Cousine": true,
-    "Tinos": true
-};
-
-goog.scope(function () {
-  var LastResortWebKitFontWatchRunner = webfont.modules.google.LastResortWebKitFontWatchRunner,
-      Font = webfont.Font,
-      FontRuler = webfont.FontRuler;
-
-  /**
-   * While loading a web font webkit applies a last resort fallback font to the
-   * element on which the web font is applied.
-   * See file: WebKit/Source/WebCore/css/CSSFontFaceSource.cpp.
-   * Looking at the different implementation for the different platforms,
-   * the last resort fallback font is different. This code uses the default
-   * OS/browsers values.
-   */
-  LastResortWebKitFontWatchRunner.prototype
-      .setUpWebKitLastResortFontWidths_ = function() {
-    var lastResortFonts = ['Times New Roman', 'Arial', 'Times', 'Sans', 'Serif'];
-    var variation = this.font_.getVariation();
-    var lastResortFontWidths = lastResortFonts.length;
-    var webKitLastResortFontWidths = {};
-    var fontRuler = new FontRuler(this.domHelper_, this.fontTestString_);
-
-    fontRuler.insert();
-    fontRuler.setFont(new Font(lastResortFonts[0], variation));
-
-    webKitLastResortFontWidths[fontRuler.getWidth()] = true;
-    for (var i = 1; i < lastResortFontWidths; i++) {
-      var font = lastResortFonts[i];
-      fontRuler.setFont(new Font(font, variation));
-      webKitLastResortFontWidths[fontRuler.getWidth()] = true;
-
-      // Another WebKit quirk if the normal weight/style is loaded first,
-      // the size of the normal weight is returned when loading another weight.
-      if (variation.toString().charAt(1) != '4') {
-        fontRuler.setFont(new Font(font, variation.charAt(0) + '4'));
-        webKitLastResortFontWidths[fontRuler.getWidth()] = true;
-      }
-    }
-    fontRuler.remove();
-    return webKitLastResortFontWidths;
-  };
-
-  /**
-   * @override
-   */
-  LastResortWebKitFontWatchRunner.prototype.check_ = function() {
-    var widthA = this.fontRulerA_.getWidth();
-    var widthB = this.fontRulerB_.getWidth();
-
-    if (!this.webKitLastResortWidthChange_ && widthA == widthB &&
-        this.webKitLastResortFontWidths_[widthA]) {
-      this.webKitLastResortFontWidths_ = {};
-      this.webKitLastResortFontWidths_[widthA] = true;
-      this.webKitLastResortWidthChange_ = true;
-    }
-    if ((this.lastObservedWidthA_ != widthA || this.lastObservedWidthB_ != widthB) &&
-        (!this.webKitLastResortFontWidths_[widthA] &&
-         !this.webKitLastResortFontWidths_[widthB])) {
-      this.finish_(this.activeCallback_);
-    } else if (this.hasTimedOut_()) {
-
-      // In order to handle the fact that a font could be the same size as the
-      // default browser font on a webkit browser, mark the font as active
-      // after 5 seconds if the latest 2 widths are in webKitLastResortFontWidths_
-      // and the font name is known to be metrics compatible.
-      if (this.webKitLastResortFontWidths_[widthA]
-          && this.webKitLastResortFontWidths_[widthB] &&
-          LastResortWebKitFontWatchRunner.METRICS_COMPATIBLE_FONTS[
-            this.font_.getName()]) {
-        this.finish_(this.activeCallback_);
-      } else {
-        this.finish_(this.inactiveCallback_);
-      }
-    } else {
-      this.asyncCheck_();
-    }
-  };
-});