webfontloader 1.2.0 → 1.2.1

data/src-test/core/fontwatchertest.js

@@ -1,287 +0,0 @@
-var FontWatcherTest = TestCase('FontWatcherTest');
-
-FontWatcherTest.prototype.setUp = function() {
-  var self = this;
-
-  this.fontLoadingEventCalled_ = 0;
-  this.fontLoading_ = {};
-  this.fontActiveEventCalled_ = 0;
-  this.fontActive_ = {};
-  this.fontInactiveEventCalled_ = 0;
-  this.fontInactive_ = {};
-  this.activeEventCalled_ = 0;
-  this.inactiveEventCalled_ = 0;
-  this.fakeEventDispatcher_ = {
-    dispatchLoading: function() {
-      fail('dispatchLoading should not be called by FontWatcher.');
-    },
-    dispatchFontLoading: function(fontFamily, fontDescription) {
-      self.fontLoadingEventCalled_++;
-      self.fontLoading_[fontFamily + ' ' + fontDescription] = true;
-    },
-    dispatchFontActive: function(fontFamily, fontDescription) {
-      self.fontActiveEventCalled_++;
-      self.fontActive_[fontFamily + ' ' + fontDescription] = true;
-    },
-    dispatchFontInactive: function(fontFamily, fontDescription) {
-      self.fontInactiveEventCalled_++;
-      self.fontInactive_[fontFamily + ' ' + fontDescription] = true;
-    },
-    dispatchActive: function() {
-      self.activeEventCalled_++;
-    },
-    dispatchInactive: function() {
-      self.inactiveEventCalled_++;
-    }
-  };
-
-  this.fakeDomHelper_ = {
-    createElement: function(name, attrs, innerHtml) {
-      var element = document.createElement(name);
-      return element;
-    },
-    insertInto: function() {},
-    removeElement: function() {},
-    setStyle: function() {}
-  };
-
-  this.userAgent_ = new webfont.UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new webfont.BrowserInfo(false, false));
-
-  this.fakeFontSizer_ = {
-    getSize: function() {
-      fail('Fake getSize should not be called.');
-    }
-  };
-
-  this.fakeAsyncCall_ = function() {
-    fail('Fake asyncCall should not be called.');
-  };
-
-  this.fakeGetTime_ = function() {
-    fail('Fake getTime should not be called.');
-  };
-
-  // Mock out FontWatchRunner to return active/inactive for families we give it
-  this.originalFontWatchRunner_ = webfont.FontWatchRunner;
-  this.fontWatchRunnerActiveFamilies_ = [];
-  this.testStringCount_ = 0;
-  this.testStrings_ = {};
-  webfont.FontWatchRunner = function(activeCallback, inactiveCallback, domHelper,
-      fontSizer, asyncCall, getTime, fontFamily, fontDescription, hasWebkitFallbackBug, opt_metricCompatibleFonts, opt_fontTestString) {
-    if (opt_fontTestString) {
-      self.testStringCount_++;
-      self.testStrings_[fontFamily] = opt_fontTestString;
-    }
-    this.activeCallback_ = activeCallback;
-    this.inactiveCallback_ = inactiveCallback;
-    this.fontFamily_ = fontFamily;
-    this.fontDescription_ = fontDescription;
-  };
-
-  webfont.FontWatchRunner.prototype.start = function() {
-    if (self.fontWatchRunnerActiveFamilies_.indexOf(this.fontFamily_) > -1) {
-      this.activeCallback_(this.fontFamily_, this.fontDescription_);
-    } else {
-      this.inactiveCallback_(this.fontFamily_, this.fontDescription_);
-    }
-  };
-};
-
-FontWatcherTest.prototype.tearDown = function() {
-  // Replace the original FontWatchRunner implementation
-  webfont.FontWatchRunner = this.originalFontWatchRunner_;
-};
-
-FontWatcherTest.prototype.testWatchOneFontNotLast = function() {
-  var fontFamilies = [ 'fontFamily1' ];
-  this.fontWatchRunnerActiveFamilies_ = [ 'fontFamily1' ];
-
-  var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  fontWatcher.watch(fontFamilies, {}, {}, webfont.FontWatchRunner, false);
-
-  assertEquals(0, this.fontInactiveEventCalled_);
-  assertEquals(0, this.activeEventCalled_);
-  assertEquals(0, this.inactiveEventCalled_);
-};
-
-FontWatcherTest.prototype.testWatchOneFontActive = function() {
-  var fontFamilies = [ 'fontFamily1' ];
-  this.fontWatchRunnerActiveFamilies_ = [ 'fontFamily1' ];
-
-  var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  fontWatcher.watch(fontFamilies, {}, {}, webfont.FontWatchRunner, true);
-
-  assertEquals(1, this.fontLoadingEventCalled_);
-  assertEquals(true, this.fontLoading_['fontFamily1 n4']);
-  assertEquals(1, this.fontActiveEventCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-  assertEquals(0, this.fontInactiveEventCalled_);
-  assertEquals(1, this.activeEventCalled_);
-  assertEquals(0, this.inactiveEventCalled_);
-};
-
-FontWatcherTest.prototype.testWatchOneFontInactive = function() {
-  var fontFamilies = [ 'fontFamily1' ];
-  this.fontWatchRunnerActiveFamilies_ = [];
-
-  var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  fontWatcher.watch(fontFamilies, {}, {}, webfont.FontWatchRunner, true);
-
-  assertEquals(1, this.fontLoadingEventCalled_);
-  assertEquals(true, this.fontLoading_['fontFamily1 n4']);
-  assertEquals(0, this.fontActiveEventCalled_);
-  assertEquals(1, this.fontInactiveEventCalled_);
-  assertEquals(true, this.fontInactive_['fontFamily1 n4']);
-  assertEquals(0, this.activeEventCalled_);
-  assertEquals(1, this.inactiveEventCalled_);
-};
-
-FontWatcherTest.prototype.testWatchMultipleFontsActive = function() {
-  var fontFamilies = [ 'fontFamily1', 'fontFamily2', 'fontFamily3' ];
-  this.fontWatchRunnerActiveFamilies_ = [ 'fontFamily1', 'fontFamily2', 'fontFamily3' ];
-
-  var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  fontWatcher.watch(fontFamilies, {}, {}, webfont.FontWatchRunner, true);
-
-  assertEquals(3, this.fontLoadingEventCalled_);
-  assertEquals(true, this.fontLoading_['fontFamily1 n4']);
-  assertEquals(true, this.fontLoading_['fontFamily2 n4']);
-  assertEquals(true, this.fontLoading_['fontFamily3 n4']);
-  assertEquals(3, this.fontActiveEventCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-  assertEquals(true, this.fontActive_['fontFamily2 n4']);
-  assertEquals(true, this.fontActive_['fontFamily3 n4']);
-  assertEquals(0, this.fontInactiveEventCalled_);
-  assertEquals(1, this.activeEventCalled_);
-  assertEquals(0, this.inactiveEventCalled_);
-};
-
-FontWatcherTest.prototype.testWatchMultipleFontsInactive = function() {
-  var fontFamilies = [ 'fontFamily1', 'fontFamily2', 'fontFamily3' ];
-  this.fontWatchRunnerActiveFamilies_ = [];
-
-  var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  fontWatcher.watch(fontFamilies, {}, {}, webfont.FontWatchRunner, true);
-
-  assertEquals(3, this.fontLoadingEventCalled_);
-  assertEquals(true, this.fontLoading_['fontFamily1 n4']);
-  assertEquals(true, this.fontLoading_['fontFamily2 n4']);
-  assertEquals(true, this.fontLoading_['fontFamily3 n4']);
-  assertEquals(0, this.fontActiveEventCalled_);
-  assertEquals(3, this.fontInactiveEventCalled_);
-  assertEquals(true, this.fontInactive_['fontFamily1 n4']);
-  assertEquals(true, this.fontInactive_['fontFamily2 n4']);
-  assertEquals(true, this.fontInactive_['fontFamily3 n4']);
-  assertEquals(0, this.activeEventCalled_);
-  assertEquals(1, this.inactiveEventCalled_);
-};
-
-FontWatcherTest.prototype.testWatchMultipleFontsMixed = function() {
-  var fontFamilies = [ 'fontFamily1', 'fontFamily2', 'fontFamily3' ];
-  this.fontWatchRunnerActiveFamilies_ = [ 'fontFamily1', 'fontFamily3' ];
-
-  var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  fontWatcher.watch(fontFamilies, {}, {}, webfont.FontWatchRunner, true);
-
-  assertEquals(3, this.fontLoadingEventCalled_);
-  assertEquals(true, this.fontLoading_['fontFamily1 n4']);
-  assertEquals(true, this.fontLoading_['fontFamily2 n4']);
-  assertEquals(true, this.fontLoading_['fontFamily3 n4']);
-  assertEquals(2, this.fontActiveEventCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-  assertEquals(true, this.fontActive_['fontFamily3 n4']);
-  assertEquals(1, this.fontInactiveEventCalled_);
-  assertEquals(true, this.fontInactive_['fontFamily2 n4']);
-  assertEquals(1, this.activeEventCalled_);
-  assertEquals(0, this.inactiveEventCalled_);
-};
-
-FontWatcherTest.prototype.testWatchMultipleFontsWithDescriptions = function() {
-  var fontFamilies = [ 'fontFamily1', 'fontFamily2', 'fontFamily3' ];
-  this.fontWatchRunnerActiveFamilies_ = [ 'fontFamily1', 'fontFamily2' ];
-
-  var fontDescriptions = {
-    'fontFamily1': ['i7'],
-    'fontFamily2': null,
-    'fontFamily3': ['n4', 'i4', 'n7']
-  };
-
-  var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  fontWatcher.watch(fontFamilies, fontDescriptions, {}, webfont.FontWatchRunner, true);
-
-  assertEquals(5, this.fontLoadingEventCalled_);
-  assertEquals(true, this.fontLoading_['fontFamily1 i7']);
-  assertEquals(true, this.fontLoading_['fontFamily2 n4']);
-  assertEquals(true, this.fontLoading_['fontFamily3 n4']);
-  assertEquals(true, this.fontLoading_['fontFamily3 i4']);
-  assertEquals(true, this.fontLoading_['fontFamily3 n7']);
-  assertEquals(2, this.fontActiveEventCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 i7']);
-  assertEquals(true, this.fontActive_['fontFamily2 n4']);
-  assertEquals(3, this.fontInactiveEventCalled_);
-  assertEquals(true, this.fontInactive_['fontFamily3 n4']);
-  assertEquals(true, this.fontInactive_['fontFamily3 i4']);
-  assertEquals(true, this.fontInactive_['fontFamily3 n7']);
-  assertEquals(1, this.activeEventCalled_);
-  assertEquals(0, this.inactiveEventCalled_);
-};
-
-FontWatcherTest.prototype.testWatchMultipleFontsWithTestStrings = function() {
-  var fontFamilies = [ 'fontFamily1', 'fontFamily2', 'fontFamily3', 'fontFamily4' ];
-  this.fontWatchRunnerActiveFamilies_ = [ 'fontFamily1', 'fontFamily2' ];
-
-  var fontTestStrings = {
-    'fontFamily1': 'testString1',
-    'fontFamily2': null,
-    'fontFamily3': 'testString3',
-    'fontFamily4': null
-  };
-
-  var fontWatcher = new webfont.FontWatcher(this.userAgent_, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  fontWatcher.watch(fontFamilies, {}, fontTestStrings, webfont.FontWatchRunner,
-      true);
-
-  assertEquals(2, this.testStringCount_);
-  assertEquals('testString1', this.testStrings_['fontFamily1']);
-  assertEquals('testString3', this.testStrings_['fontFamily3']);
-};
-
-FontWatcherTest.prototype.testNoWebkitBugDetectionOnNonWebkit = function() {
-  var ua = new webfont.UserAgent('Firefox', '3.6', 'Gecko', '1.9.2', 'Macintosh', '10.6', undefined, new webfont.BrowserInfo(true, false));
-  var fontWatcher = new webfont.FontWatcher(ua, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  assertEquals(false, fontWatcher.hasWebKitFallbackBug_);
-};
-
-FontWatcherTest.prototype.testNoWebkitBugDetectionOnNewWebkit = function() {
-  var ua = new webfont.UserAgent('Safari', '6.0.2', 'AppleWebKit', '537.6.17', 'Macintosh', '10_7_5', undefined, new webfont.BrowserInfo(true, false));
-  var fontWatcher = new webfont.FontWatcher(ua, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  assertEquals(false, fontWatcher.hasWebKitFallbackBug_);
-};
-
-FontWatcherTest.prototype.testYesWebkitBugDetectionOnOlderWebkit = function() {
-  var ua = new webfont.UserAgent('Chrome', '16.0.912.75', 'AppleWebKit', '535.7', 'Android', '4.0.3', undefined, new webfont.BrowserInfo(true, true));
-  var fontWatcher = new webfont.FontWatcher(ua, this.fakeDomHelper_, this.fakeEventDispatcher_,
-      this.fakeFontSizer_, this.fakeAsyncCall_, this.fakeGetTime_);
-
-  assertEquals(true, fontWatcher.hasWebKitFallbackBug_);
-};

data/src-test/core/fontwatchrunnertest.js

@@ -1,454 +0,0 @@
-var FontWatchRunnerTest = TestCase('FontWatchRunnerTest');
-
-FontWatchRunnerTest.prototype.setUp = function() {
-  var self = this;
-
-  this.fontFamily_ = 'fontFamily1';
-  this.fontDescription_ = 'n4';
-
-  this.fontActiveCalled_ = 0;
-  this.fontActive_ = {};
-  this.fontInactiveCalled_ = 0;
-  this.fontInactive_ = {};
-  this.activeCallback_ = function(fontFamily, fontDescription) {
-    self.fontActiveCalled_++;
-    self.fontActive_[fontFamily + ' ' + fontDescription] = true;
-  };
-  this.inactiveCallback_ = function(fontFamily, fontDescription) {
-    self.fontInactiveCalled_++;
-    self.fontInactive_[fontFamily + ' ' + fontDescription] = true;
-  };
-
-  this.createElementCalled_ = 0;
-  this.createdElements_ = [];
-  this.insertIntoCalled_ = 0;
-  this.removeElementCalled_ = 0;
-  this.fakeDomHelper_ = {
-    createElement: function(name, attrs, innerHtml) {
-      self.createElementCalled_++;
-      var element = document.createElement(name);
-      self.createdElements_.push({
-        'name': name,
-        'attrs': attrs,
-        'innerHtml': innerHtml,
-        'element': element
-      });
-
-      for (var attr in attrs) {
-        element.setAttribute(attr, attrs[attr]);
-      }
-      element.innerHTML = innerHtml;
-      return element;
-    },
-    insertInto: function(name, el) {
-      self.insertIntoCalled_++;
-    },
-    removeElement: function(el) {
-      self.removeElementCalled_++;
-    },
-    setStyle: function(el, style) {
-      el.setAttribute('style', style);
-      for (var i = 0; i < self.createdElements_.length; i += 1) {
-        if (self.createdElements_[i].element === el) {
-          if (!self.createdElements_[i].attrs) {
-            self.createdElements_[i].attrs = {};
-          }
-          self.createdElements_[i].attrs.style = style;
-          break;
-        }
-      }
-    }
-  };
-
-  this.timesToCheckSizesBeforeChange_ = 0;
-  this.fakeFontSizer_ = {
-    getSize: function(el) {
-      if (el.style.fontFamily.indexOf(self.fontFamily_) != -1) {
-        // This is a font stack with fontFamily included (not just fallbacks)
-        if (self.timesToCheckSizesBeforeChange_ <= 0) {
-          // Decrement by 0.5 because we're checking two separate font stacks each iteration
-          self.timesToCheckSizesBeforeChange_ -= 0.5;
-          return new webfont.Size(2, 2);
-        } else {
-          // Decrement by 0.5 because we're checking two separate font stacks each iteration
-          self.timesToCheckSizesBeforeChange_ -= 0.5;
-          return new webfont.Size(1, 1);
-        }
-      } else {
-        return new webfont.Size(1, 1);
-      }
-    }
-  };
-
-  this.fakeFontSizerWithDifferentHeight_ = {
-    getSize: function(el) {
-      if (el.style.fontFamily.indexOf(self.fontFamily_) != -1) {
-        if (self.timesToCheckSizesBeforeChange_ <= 0) {
-          self.timesToCheckSizesBeforeChange_ -= 0.5;
-          return new webfont.Size(1, 2);
-        } else {
-          self.timesToCheckSizesBeforeChange_ -= 0.5;
-          return new webfont.Size(1, 1);
-        }
-      } else {
-        return new webfont.Size(1, 1);
-      }
-    }
-  };
-
-  /**
-   * This accurately models the way webkit used to handle
-   * fallback fonts while loading web fonts. Even though
-   * this Webkit bug is now patched, we still have a large
-   * portion of our users using old webkit builds.
-   *
-   * See: https://bugs.webkit.org/show_bug.cgi?id=76684
-   */
-  this.timesToDelayChangedSizeWebkit_ = 1;
-  this.firstCallToRetrieveSizeWebkit_ = true;
-  this.fakeWebkitFontSizer_ = {
-    getSize: function(el) {
-      if (el.style.fontFamily.indexOf(self.fontFamily_) !== -1) {
-        if (self.timesToDelayChangedSizeWebkit_ > 0) {
-          self.timesToDelayChangedSizeWebkit_ -= 0.5;
-          // Return the incorrect width for a certain number of cycles.
-          // The actual number depends on how fast or how slow the font
-          // is parsed and applied.
-          return new webfont.Size(2, 2);
-        } else {
-          // Return the correct width
-          return new webfont.Size(3, 3);
-        }
-      } else {
-        if (self.firstCallToRetrieveSizeWebkit_) {
-          self.firstCallToRetrieveSizeWebkit_ = false;
-          return new webfont.Size(2, 2);
-        } else {
-          // Return the default width
-          return new webfont.Size(1, 1);
-        }
-      }
-    }
-  };
-
-  this.fakeWebkitFontSizerFailedLoad_ = {
-    getSize: function(el) {
-      if (el.style.fontFamily.indexOf(self.fontFamily_) !== -1) {
-        if (self.timesToDelayChangedSizeWebkit_ > 0) {
-          self.timesToDelayChangedSizeWebkit_ -= 0.5;
-          return new webfont.Size(2, 2);
-        } else {
-          // Return the original width, indicating the font
-          // failed to load. This should incorrectly trigger `inactive`.
-          return new webfont.Size(1, 1);
-        }
-      } else {
-        if (self.firstCallToRetrieveSizeWebkit_) {
-          self.firstCallToRetrieveSizeWebkit_ = false;
-          return new webfont.Size(2, 2);
-        } else {
-          return new webfont.Size(1, 1);
-        }
-      }
-    }
-  };
-
-  this.fakeWebkitFontSizerWithEqualMetrics_ = {
-    getSize: function(el) {
-      if (el.style.fontFamily.indexOf(self.fontFamily_) !== -1) {
-        if (self.timesToDelayChangedSizeWebkit_ > 0) {
-          self.timesToDelayChangedSizeWebkit_ -= 0.5;
-          return new webfont.Size(2, 2);
-        } else {
-          // This time the fallback font picked by Webkit has the
-          // same metrics as the font being loaded. This is a rare
-          // case but we should be able to handle it.
-          return new webfont.Size(2, 2);
-        }
-      } else {
-        if (self.firstCallToRetrieveSizeWebkit_) {
-          self.firstCallToRetrieveSizeWebkit_ = false;
-          return new webfont.Size(2, 2);
-        } else {
-          return new webfont.Size(1, 1);
-        }
-      }
-    }
-  };
-
-  this.fakeWebkitFontSizeWithDifferentMetrics_ = {
-    getSize: function(el) {
-      if (el.style.fontFamily.indexOf(self.fontFamily_) !== -1) {
-        if (self.timesToDelayChangedSizeWebkit_ > 0) {
-          self.timesToDelayChangedSizeWebkit_ -= 0.5;
-          return new webfont.Size(2, 2);
-        } else {
-          // Even though the width is the same, the height
-          // is different, so this should trigger the active event.
-          return new webfont.Size(2, 3);
-        }
-      } else {
-        if (self.firstCallToRetrieveSizeWebkit_) {
-          self.firstCallToRetrieveSizeWebkit_ = false;
-          return new webfont.Size(2, 2);
-        } else {
-          return new webfont.Size(1, 1);
-        }
-      }
-    }
-  };
-
-  this.timesToGetTimeBeforeTimeout_ = 10;
-  this.fakeGetTime_ = function() {
-    if (self.timesToGetTimeBeforeTimeout_ <= 0) {
-      return 6000;
-    } else {
-      self.timesToGetTimeBeforeTimeout_--;
-      return 1;
-    }
-  };
-
-  this.asyncCount_ = 0;
-  this.fakeAsyncCall_ = function(func, timeout) {
-    self.asyncCount_++;
-    func();
-  };
-
-};
-
-FontWatchRunnerTest.prototype.testWatchFontAlreadyLoaded = function() {
-  this.timesToCheckSizesBeforeChange_ = 0;
-  this.timesToGetTimeBeforeTimeout_ = 10;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeFontSizer_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, false);
-
-  fontWatchRunner.start();
-
-  assertEquals(0, this.asyncCount_);
-
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-  assertEquals(0, this.fontInactiveCalled_);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWaitForLoadActive = function() {
-  this.timesToCheckSizesBeforeChange_ = 3;
-  this.timesToGetTimeBeforeTimeout_ = 10;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeFontSizer_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, false);
-
-  fontWatchRunner.start();
-
-  assertEquals(3, this.asyncCount_);
-
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-  assertEquals(0, this.fontInactiveCalled_);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWaitForLoadActiveWithDifferentHeight = function() {
-  this.timesToCheckSizesBeforeChange_ = 3;
-  this.timesToGetTimeBeforeTimeout_ = 10;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeFontSizerWithDifferentHeight_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, false);
-
-  fontWatchRunner.start();
-
-  assertEquals(3, this.asyncCount_);
-
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-  assertEquals(0, this.fontInactiveCalled_);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWaitForLoadInactive = function() {
-  this.timesToCheckSizesBeforeChange_ = 10;
-  this.timesToGetTimeBeforeTimeout_ = 5;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeFontSizer_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, false);
-
-  fontWatchRunner.start();
-
-  assertEquals(4, this.asyncCount_);
-
-  assertEquals(0, this.fontActiveCalled_);
-  assertEquals(1, this.fontInactiveCalled_);
-  assertEquals(true, this.fontInactive_['fontFamily1 n4']);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWebkitWithFastFont = function() {
-  this.timesToGetTimeBeforeTimeout_ = 10;
-  this.timesToDelayChangedSizeWebkit_ = 1;
-  this.firstCallToRetrieveSizeWebkit_ = true;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeWebkitFontSizer_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, true);
-
-  fontWatchRunner.start();
-  assertEquals(1, this.asyncCount_);
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWebkitWithSlowFont = function() {
-  this.timesToGetTimeBeforeTimeout_ = 10;
-  this.timesToDelayChangedSizeWebkit_ = 2;
-  this.firstCallToRetrieveSizeWebkit_ = true;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeWebkitFontSizer_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, true);
-
-  fontWatchRunner.start();
-  assertEquals(2, this.asyncCount_);
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWebkitWithEqualMetrics = function() {
-  this.timesToGetTimeBeforeTimeout_ = 10;
-  this.timesToDelayChangedSizeWebkit_ = 2;
-  this.firstCallToRetrieveSizeWebkit_ = true;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeWebkitFontSizerWithEqualMetrics_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, true);
-
-  fontWatchRunner.start();
-  assertEquals(9, this.asyncCount_);
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWebkitWithDifferentMetrics = function() {
-  this.timesToGetTimeBeforeTimeout_ = 10;
-  this.timesToDelayChangedSizeWebkit_ = 2;
-  this.firstCallToRetrieveSizeWebkit_ = true;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeWebkitFontSizeWithDifferentMetrics_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, true);
-
-  fontWatchRunner.start();
-  assertEquals(2, this.asyncCount_);
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWebkitFailedLoad = function() {
-  this.timesToGetTimeBeforeTimeout_ = 10;
-  this.timesToDelayChangedSizeWebkit_ = 5;
-  this.firstCallToRetrieveSizeWebkit_ = true;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeWebkitFontSizerFailedLoad_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, true);
-
-  fontWatchRunner.start();
-  assertEquals(9, this.asyncCount_);
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWebkitWithEqualMetricsIncompatibleFont = function() {
-  this.timesToGetTimeBeforeTimeout_ = 10;
-  this.timesToDelayChangedSizeWebkit_ = 2;
-  this.firstCallToRetrieveSizeWebkit_ = true;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeWebkitFontSizerWithEqualMetrics_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, true, { 'fontFamily2': true });
-
-  fontWatchRunner.start();
-  assertEquals(9, this.asyncCount_);
-  assertEquals(1, this.fontInactiveCalled_);
-  assertEquals(true, this.fontInactive_['fontFamily1 n4']);
-};
-
-FontWatchRunnerTest.prototype.testWatchFontWebkitWithEqualMetricsCompatibleFont = function() {
-  this.timesToGetTimeBeforeTimeout_ = 10;
-  this.timesToDelayChangedSizeWebkit_ = 2;
-  this.firstCallToRetrieveSizeWebkit_ = true;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeWebkitFontSizerWithEqualMetrics_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, true, { 'fontFamily1': true });
-
-  fontWatchRunner.start();
-  assertEquals(9, this.asyncCount_);
-  assertEquals(1, this.fontActiveCalled_);
-  assertEquals(true, this.fontActive_['fontFamily1 n4']);
-};
-
-
-FontWatchRunnerTest.prototype.testDomWithDefaultTestString = function() {
-  this.timesToCheckSizesBeforeChange_ = 3;
-  this.timesToGetTimeBeforeTimeout_ = 10;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeFontSizer_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, false);
-
-  fontWatchRunner.start();
-  assertEquals(3, this.createElementCalled_);
-  assertEquals('span', this.createdElements_[0]['name']);
-  assertNotEquals(-1, this.createdElements_[0]['attrs']['style'].indexOf('fontFamily1'));
-  assertNotEquals(-1, this.createdElements_[0]['attrs']['style'].indexOf(webfont.FontWatchRunner.LastResortFonts.SERIF));
-  assertEquals('BESbswy', this.createdElements_[0]['innerHtml']);
-
-  assertEquals('span', this.createdElements_[1]['name']);
-  assertNotEquals(-1, this.createdElements_[1]['attrs']['style'].indexOf('fontFamily1'));
-  assertNotEquals(-1, this.createdElements_[1]['attrs']['style'].indexOf(webfont.FontWatchRunner.LastResortFonts.SANS_SERIF));
-  assertEquals('BESbswy', this.createdElements_[1]['innerHtml']);
-
-  assertEquals(3, this.insertIntoCalled_);
-  assertEquals(3, this.removeElementCalled_);
-};
-
-FontWatchRunnerTest.prototype.testDomWithNotDefaultTestString = function() {
-  this.timesToCheckSizesBeforeChange_ = 3;
-  this.timesToGetTimeBeforeTimeout_ = 10;
-
-  var fontWatchRunner = new webfont.FontWatchRunner(this.activeCallback_,
-      this.inactiveCallback_, this.fakeDomHelper_, this.fakeFontSizer_,
-      this.fakeAsyncCall_, this.fakeGetTime_, this.fontFamily_,
-      this.fontDescription_, false, null, 'testString');
-
-  fontWatchRunner.start();
-
-  assertEquals(3, this.createElementCalled_);
-  assertEquals('span', this.createdElements_[0]['name']);
-  assertNotEquals(-1, this.createdElements_[0]['attrs']['style'].indexOf('fontFamily1'));
-  assertNotEquals(-1, this.createdElements_[0]['attrs']['style'].indexOf(webfont.FontWatchRunner.LastResortFonts.SERIF));
-  assertEquals('testString', this.createdElements_[0]['innerHtml']);
-
-  assertEquals('span', this.createdElements_[1]['name']);
-  assertNotEquals(-1, this.createdElements_[1]['attrs']['style'].indexOf('fontFamily1'));
-  assertNotEquals(-1, this.createdElements_[1]['attrs']['style'].indexOf(webfont.FontWatchRunner.LastResortFonts.SANS_SERIF));
-  assertEquals('testString', this.createdElements_[1]['innerHtml']);
-
-  assertEquals(3, this.insertIntoCalled_);
-  assertEquals(3, this.removeElementCalled_);
-
-};