webfontloader 1.4.2 → 1.4.3

data/spec/core/version_spec.js

@@ -0,0 +1,143 @@
+describe('Version', function () {
+  var Version = webfont.Version;
+
+  describe('parse', function () {
+    it('should ignore non versions', function () {
+      expect(Version.parse('abcedf')).toEqual(new Version());
+      expect(Version.parse('...')).toEqual(new Version());
+      expect(Version.parse('Unknown')).toEqual(new Version());
+    });
+
+    it('should parse single digit versions', function () {
+      expect(Version.parse('0')).toEqual(new Version(0));
+      expect(Version.parse('1')).toEqual(new Version(1));
+    });
+
+    it('should parse two digit versions', function () {
+      expect(Version.parse('1.0')).toEqual(new Version(1, 0));
+      expect(Version.parse('12.9')).toEqual(new Version(12, 9));
+    });
+
+    it('should parse three digit versions', function () {
+      expect(Version.parse('1.2.5')).toEqual(new Version(1, 2, 5));
+      expect(Version.parse('10.0.2')).toEqual(new Version(10, 0, 2));
+    });
+
+    it('should accept alternate separators', function () {
+      expect(Version.parse('10_8_2')).toEqual(new Version(10, 8, 2));
+      expect(Version.parse('5-46-2')).toEqual(new Version(5, 46, 2));
+    });
+
+    it('should accept build strings', function () {
+      expect(Version.parse('1.3.5+alpha')).toEqual(new Version(1, 3, 5, 'alpha'));
+      expect(Version.parse('1.3.5-askdsj')).toEqual(new Version(1, 3, 5, 'askdsj'));
+    });
+
+    it('should parse real version strings', function () {
+      expect(Version.parse('5.0')).toEqual(new Version(5, 0));
+      expect(Version.parse('531.9')).toEqual(new Version(531, 9));
+      expect(Version.parse('1.9.2.3')).toEqual(new Version(1, 9, 2, 3));
+      expect(Version.parse('3.6.3')).toEqual(new Version(3, 6, 3));
+      expect(Version.parse('1.9.2a1pre')).toEqual(new Version(1, 9, 2, 'a1pre'));
+      expect(Version.parse('3.6a1pre')).toEqual(new Version(3, 6, null, 'a1pre'));
+      expect(Version.parse('2.0b1')).toEqual(new Version(2, 0, null, 'b1'));
+      expect(Version.parse('5.0.342.9')).toEqual(new Version(5, 0, 342, 9));
+      expect(Version.parse('10_5_8')).toEqual(new Version(10, 5, 8));
+      expect(Version.parse('18.0.1025.46')).toEqual(new Version(18, 0, 1025, 46));
+      expect(Version.parse('4.0dp1')).toEqual(new Version(4, 0, null, 'dp1'));
+      expect(Version.parse('528.4+')).toEqual(new Version(528, 4));
+      expect(Version.parse('2.1-update1')).toEqual(new Version(2, 1, null, 'update1'));
+      expect(Version.parse('10.0.22.79_1003310')).toEqual(new Version(10, 0, 22, '79_1003310'));
+      expect(Version.parse('1.b')).toEqual(new Version(1, null, null, 'b'));
+      expect(Version.parse('0.10.1')).toEqual(new Version(0, 10, 1));
+    });
+  });
+
+  describe('#compare', function () {
+    it('should return zero when two versions are equal', function () {
+      expect(new Version(1, 2, 3).compare(new Version(1, 2, 3))).toEqual(0);
+    });
+
+    it('should return one when one version is greater', function () {
+      expect(new Version(1, 2, 3).compare(new Version(0, 1, 3))).toEqual(1);
+      expect(new Version(1, 2, 3).compare(new Version(1, 2, 2))).toEqual(1);
+      expect(new Version(1, 2, 3).compare(new Version(1, 1, 3))).toEqual(1);
+    });
+
+    it('should return minus one when one version is smaller', function () {
+      expect(new Version(1, 2, 3).compare(new Version(1, 2, 4))).toEqual(-1);
+      expect(new Version(1, 2, 3).compare(new Version(1, 3, 3))).toEqual(-1);
+      expect(new Version(1, 2, 3).compare(new Version(2, 2, 3))).toEqual(-1);
+    });
+  });
+
+  describe('#eq', function () {
+    it('should return true when two versions are equal', function () {
+      expect(new Version(1, 2, 3).eq(new Version(1, 2, 3))).toBe(true);
+    });
+
+    it('should return false when two versions are unequal', function () {
+      expect(new Version(3, 2, 1).eq(new Version(1, 2, 3))).toBe(false);
+    });
+  });
+
+  describe('#gt', function () {
+    it('should return true when one version is greater than another', function () {
+      expect(new Version(3, 2, 1).gt(new Version(1, 2, 3))).toBe(true);
+    });
+
+    it('should return false when one version is not greater than another', function () {
+      expect(new Version(1, 2, 3).gt(new Version(3, 2, 1))).toBe(false)
+    });
+  });
+
+  describe('#ge', function () {
+    it('should return true when one version is greater than another', function () {
+      expect(new Version(3, 2, 1).ge(new Version(1, 2, 3))).toBe(true);
+    });
+
+    it('should return false when one version is not greater than another', function () {
+      expect(new Version(1, 2, 3).ge(new Version(3, 2, 1))).toBe(false)
+    });
+
+    it('should return true when one version is equal to another', function () {
+      expect(new Version(1, 2, 3).ge(new Version(1, 2, 3))).toBe(true);
+    });
+  });
+
+  describe('#lt', function () {
+    it('should return true when one version is less than another', function () {
+      expect(new Version(1, 2, 3).lt(new Version(3, 2, 1))).toBe(true);
+    });
+
+    it('should return false when one version is not less than another', function () {
+      expect(new Version(3, 2, 1).lt(new Version(1, 2, 3))).toBe(false)
+    });
+  });
+
+  describe('#le', function () {
+    it('should return true when one version is less than another', function () {
+      expect(new Version(1, 2, 3).le(new Version(3, 2, 1))).toBe(true);
+    });
+
+    it('should return false when one version is not less than another', function () {
+      expect(new Version(3, 2, 1).le(new Version(1, 2, 3))).toBe(false)
+    });
+
+    it('should return true when one version is equal to another', function () {
+      expect(new Version(1, 2, 3).le(new Version(1, 2, 3))).toBe(true);
+    });
+  });
+
+  describe('#isValid', function () {
+    it('should return true when the version is valid', function () {
+      expect(new Version(1).isValid()).toBe(true);
+      expect(new Version(1, 2).isValid()).toBe(true);
+    });
+
+    it('should return false when the version is not valid', function () {
+      expect(new Version().isValid()).toBe(false);
+      expect(new Version(null, 1).isValid()).toBe(false);
+    });
+  });
+});

data/spec/deps.js

@@ -14,7 +14,8 @@ goog.addDependency("../../src/core/fontwatchrunner.js", ["webfont.FontWatchRunne
 goog.addDependency("../../src/core/initialize.js", ["webfont"], ["webfont.UserAgentParser","webfont.FontModuleLoader","webfont.WebFont"]);
 goog.addDependency("../../src/core/namespace.js", [], []);
 goog.addDependency("../../src/core/useragent.js", ["webfont.UserAgent"], []);
-goog.addDependency("../../src/core/useragentparser.js", ["webfont.UserAgentParser"], ["webfont.BrowserInfo","webfont.UserAgent"]);
+goog.addDependency("../../src/core/useragentparser.js", ["webfont.UserAgentParser"], ["webfont.BrowserInfo","webfont.UserAgent","webfont.Version"]);
+goog.addDependency("../../src/core/version.js", ["webfont.Version"], []);
 goog.addDependency("../../src/core/webfont.js", ["webfont.WebFont"], ["webfont.DomHelper","webfont.EventDispatcher","webfont.FontWatcher"]);
 goog.addDependency("../../src/custom/customcss.js", ["webfont.CustomCss"], ["webfont.Font"]);
 goog.addDependency("../../src/fontdeck/fontdeck_script.js", ["webfont.FontdeckScript"], ["webfont.Font"]);

data/spec/index.html

@@ -43,6 +43,7 @@
     <script src="../spec/core/fontwatchrunner_spec.js"></script>
     <script src="../spec/core/fontwatcher_spec.js"></script>
     <script src="../spec/core/webfont_spec.js"></script>
+    <script src="../spec/core/version_spec.js"></script>
     <script src="../spec/google/fontapiparser_spec.js"></script>
     <script src="../spec/google/fontapiurlbuilder_spec.js"></script>
     <script src="../spec/google/googlefontapi_spec.js"></script>

data/src/core/useragent.js

@@ -3,11 +3,11 @@ goog.provide('webfont.UserAgent');
 /**
  * @export
  * @param {string} name
- * @param {string} version
+ * @param {webfont.Version} version
  * @param {string} engine
- * @param {string} engineVersion
+ * @param {webfont.Version} engineVersion
  * @param {string} platform
- * @param {string} platformVersion
+ * @param {webfont.Version} platformVersion
  * @param {number|undefined} documentMode
  * @param {!webfont.BrowserInfo} browserInfo
  * @constructor
@@ -37,7 +37,7 @@ goog.scope(function () {
 
   /**
    * @export
-   * @return {string}
+   * @return {webfont.Version}
    */
   UserAgent.prototype.getVersion = function() {
     return this.version_;
@@ -53,7 +53,7 @@ goog.scope(function () {
 
   /**
    * @export
-   * @return {string}
+   * @return {webfont.Version}
    */
   UserAgent.prototype.getEngineVersion = function() {
     return this.engineVersion_;
@@ -69,7 +69,7 @@ goog.scope(function () {
 
   /**
    * @export
-   * @return {string}
+   * @return {webfont.Version}
    */
   UserAgent.prototype.getPlatformVersion = function() {
     return this.platformVersion_;

data/src/core/useragentparser.js

@@ -2,6 +2,7 @@ goog.provide('webfont.UserAgentParser');
 
 goog.require('webfont.BrowserInfo');
 goog.require('webfont.UserAgent');
+goog.require('webfont.Version');
 
 /**
  * @param {string} userAgent The browser userAgent string to parse.
@@ -34,11 +35,11 @@ webfont.UserAgentParser.BUILTIN_BROWSER = "BuiltinBrowser";
  */
 webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(
     webfont.UserAgentParser.UNKNOWN,
+    new webfont.Version(),
     webfont.UserAgentParser.UNKNOWN,
+    new webfont.Version(),
     webfont.UserAgentParser.UNKNOWN,
-    webfont.UserAgentParser.UNKNOWN,
-    webfont.UserAgentParser.UNKNOWN,
-    webfont.UserAgentParser.UNKNOWN,
+    new webfont.Version(),
     undefined,
     new webfont.BrowserInfo(false, false, false));
 
@@ -46,7 +47,8 @@ webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(
 goog.scope(function () {
   var UserAgentParser = webfont.UserAgentParser,
       BrowserInfo = webfont.BrowserInfo,
-      UserAgent = webfont.UserAgent;
+      UserAgent = webfont.UserAgent,
+      Version = webfont.Version;
 
   /**
    * Parses the user agent string and returns an object.
@@ -93,10 +95,11 @@ goog.scope(function () {
 
   /**
    * @private
+   * @return {string}
    */
-  UserAgentParser.prototype.getPlatformVersion_ = function() {
+  UserAgentParser.prototype.getPlatformVersionString_ = function() {
     var genericVersion = this.getMatchingGroup_(this.userAgent_,
-        /(OS X|Windows NT|Android|CrOS) ([^;)]+)/, 2);
+        /(OS X|Windows NT|Android) ([^;)]+)/, 2);
     if (genericVersion) {
       return genericVersion;
     }
@@ -110,10 +113,15 @@ goog.scope(function () {
     if (iVersion) {
       return iVersion;
     }
-    var linuxVersion = this.getMatchingGroup_(this.userAgent_,
-        /Linux ([i\d]+)/, 1);
-    if (linuxVersion) {
-      return linuxVersion;
+    var linuxOrCrOsVersion = this.getMatchingGroup_(this.userAgent_,
+        /(?:Linux|CrOS) ([^;)]+)/, 1);
+    if (linuxOrCrOsVersion) {
+      var parts = linuxOrCrOsVersion.split(/\s/);
+      for (var i = 0; i < parts.length; i += 1) {
+        if (/^[\d\._]+$/.test(parts[i])) {
+          return parts[i];
+        }
+      }
     }
     var blackBerryVersion = this.getMatchingGroup_(this.userAgent_,
         /(BB\d{2}|BlackBerry).*?Version\/([^\s]*)/, 2);
@@ -135,31 +143,17 @@ goog.scope(function () {
    * @private
    */
   UserAgentParser.prototype.parseIeUserAgentString_ = function() {
+    var platform = this.getPlatform_(),
+        platformVersion = Version.parse(this.getPlatformVersionString_()),
+        browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /MSIE ([\d\w\.]+)/, 1)),
+        documentMode = this.getDocumentMode_(this.doc_),
+        supportWebFont = (platform == "Windows" && browserVersion.major >= 6) ||
+                         (platform == "Windows Phone" && platformVersion.major >= 8);
+
     // For IE we give MSIE as the engine name and the version of IE
     // instead of the specific Trident engine name and version
-
-    var platform = this.getPlatform_();
-    var platformVersionString = this.getPlatformVersion_();
-
-    var browser = this.getMatchingGroup_(this.userAgent_, /(MSIE [\d\w\.]+)/, 1);
-
-    if (browser != "") {
-      var pair = browser.split(' ');
-      var name = pair[0];
-      var version = pair[1];
-      var browserVersion = this.parseVersion_(version);
-      var platformVersion = this.parseVersion_(platformVersionString);
-      var supportWebFont = (platform == "Windows" && browserVersion.major >= 6) ||
-          (platform == "Windows Phone" && platformVersion.major >= 8);
-
-      return new UserAgent(name, version, name, version,
-          platform, platformVersionString, this.getDocumentMode_(this.doc_), new BrowserInfo(supportWebFont, false, false));
-
-    }
-
-    return new UserAgent("MSIE", webfont.UserAgentParser.UNKNOWN,
-        "MSIE", webfont.UserAgentParser.UNKNOWN,
-        platform, platformVersionString, this.getDocumentMode_(this.doc_), new BrowserInfo(false, false, false));
+    return new UserAgent("MSIE", browserVersion, "MSIE", browserVersion,
+          platform, platformVersion, documentMode, new BrowserInfo(supportWebFont, false, false));
   };
 
   /**
@@ -173,62 +167,46 @@ goog.scope(function () {
    * @private
    */
   UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
-    var engineName = UserAgentParser.UNKNOWN;
-    var engineVersion = UserAgentParser.UNKNOWN;
-    var enginePair = this.getMatchingGroup_(this.userAgent_,
-        /(Presto\/[\d\w\.]+)/, 1);
+    var engineName = UserAgentParser.UNKNOWN,
+        engineVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Presto\/([\d\w\.]+)/, 1)),
+        platformVersion = Version.parse(this.getPlatformVersionString_()),
+        documentMode = this.getDocumentMode_(this.doc_);
 
-    if (enginePair != "") {
-      var splittedEnginePair = enginePair.split('/');
-
-      engineName = splittedEnginePair[0];
-      engineVersion = splittedEnginePair[1];
+    if (engineVersion.isValid()) {
+      engineName = "Presto";
     } else {
       if (this.userAgent_.indexOf("Gecko") != -1) {
         engineName = "Gecko";
       }
-      var geckoVersion = this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1);
-
-      if (geckoVersion != "") {
-        engineVersion = geckoVersion;
-      }
+      engineVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1));
     }
 
     // Check for Opera Mini first, since it looks like normal Opera
     if (this.userAgent_.indexOf("Opera Mini/") != -1) {
-      var version = this.getMatchingGroup_(this.userAgent_, /Opera Mini\/([\d\.]+)/, 1);
-
-      if (version == "") {
-        version = UserAgentParser.UNKNOWN;
-      }
+      var browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Opera Mini\/([\d\.]+)/, 1));
 
-      return new UserAgent("OperaMini", version, engineName,
-          engineVersion, this.getPlatform_(), this.getPlatformVersion_(),
-          this.getDocumentMode_(this.doc_), new BrowserInfo(false, false, false));
+      return new UserAgent("OperaMini", browserVersion, engineName,
+          engineVersion, this.getPlatform_(), platformVersion,
+          documentMode, new BrowserInfo(false, false, false));
     }
 
     // Otherwise, find version information for normal Opera or Opera Mobile
     if (this.userAgent_.indexOf("Version/") != -1) {
-      var versionString = this.getMatchingGroup_(this.userAgent_, /Version\/([\d\.]+)/, 1);
+      var browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Version\/([\d\.]+)/, 1));
 
-      if (versionString != "") {
-        var version = this.parseVersion_(versionString);
-        return new UserAgent("Opera", versionString, engineName, engineVersion,
-            this.getPlatform_(), this.getPlatformVersion_(),
-            this.getDocumentMode_(this.doc_), new BrowserInfo(version.major >= 10, false, false));
+      if (browserVersion.isValid()) {
+        return new UserAgent("Opera", browserVersion, engineName, engineVersion, this.getPlatform_(),
+                             platformVersion, documentMode, new BrowserInfo(browserVersion.major >= 10, false, false));
       }
     }
-    var versionString = this.getMatchingGroup_(this.userAgent_, /Opera[\/ ]([\d\.]+)/, 1);
+    var browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Opera[\/ ]([\d\.]+)/, 1));
 
-    if (versionString != "") {
-      var version = this.parseVersion_(versionString);
-      return new UserAgent("Opera", versionString, engineName, engineVersion,
-          this.getPlatform_(), this.getPlatformVersion_(),
-          this.getDocumentMode_(this.doc_), new BrowserInfo(version.major >= 10, false, false));
+    if (browserVersion.isValid()) {
+      return new UserAgent("Opera", browserVersion, engineName, engineVersion, this.getPlatform_(),
+                           platformVersion, documentMode, new BrowserInfo(browserVersion.major >= 10, false, false));
     }
-    return new UserAgent("Opera", UserAgentParser.UNKNOWN,
-        engineName, engineVersion, this.getPlatform_(),
-        this.getPlatformVersion_(), this.getDocumentMode_(this.doc_), new BrowserInfo(false, false, false));
+    return new UserAgent("Opera", new Version(), engineName, engineVersion, this.getPlatform_(),
+                         platformVersion, documentMode, new BrowserInfo(false, false, false));
   };
 
   /**
@@ -242,49 +220,40 @@ goog.scope(function () {
    * @private
    */
   UserAgentParser.prototype.parseWebKitUserAgentString_ = function() {
-    var platform = this.getPlatform_();
-    var platformVersionString = this.getPlatformVersion_();
-    var webKitVersionString = this.getMatchingGroup_(this.userAgent_,
-        /AppleWeb(?:K|k)it\/([\d\.\+]+)/, 1);
-    var supportWebFont = false;
-
-    if (webKitVersionString == "") {
-      webKitVersionString = UserAgentParser.UNKNOWN;
-    }
-    var webKitVersion = this.parseVersion_(webKitVersionString);
-    var platformVersion = this.parseVersion_(platformVersionString);
-    var name = UserAgentParser.UNKNOWN;
-
-    if (this.userAgent_.indexOf("Chrome") != -1 || this.userAgent_.indexOf("CrMo") != -1 || this.userAgent_.indexOf("CriOS") != -1) {
-      name = "Chrome";
+    var platform = this.getPlatform_(),
+        platformVersion = Version.parse(this.getPlatformVersionString_()),
+        webKitVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /AppleWeb(?:K|k)it\/([\d\.\+]+)/, 1)),
+        browserName = UserAgentParser.UNKNOWN,
+        browserVersion = new Version(),
+        supportWebFont = false;
+
+    if (this.userAgent_.indexOf("Chrome") != -1 ||
+        this.userAgent_.indexOf("CrMo") != -1 ||
+        this.userAgent_.indexOf("CriOS") != -1) {
+      browserName = "Chrome";
     } else if (/Silk\/\d/.test(this.userAgent_)) {
-      name = "Silk";
+      browserName = "Silk";
     } else if (platform == "BlackBerry" || platform == "Android") {
-      name = UserAgentParser.BUILTIN_BROWSER;
+      browserName = UserAgentParser.BUILTIN_BROWSER;
     } else if (this.userAgent_.indexOf("Safari") != -1) {
-      name = "Safari";
+      browserName = "Safari";
     } else if (this.userAgent_.indexOf("AdobeAIR") != -1) {
-      name = "AdobeAIR";
+      browserName = "AdobeAIR";
     }
-    var version = UserAgentParser.UNKNOWN;
 
-    if (name == UserAgentParser.BUILTIN_BROWSER) {
-      version = UserAgentParser.UNKNOWN;
-    } else if (/Silk\/\d/.test(this.userAgent_)) {
-      version = this.getMatchingGroup_(this.userAgent_,
-          /Silk\/([\d\._]+)/, 1);
+    if (browserName == UserAgentParser.BUILTIN_BROWSER) {
+      browserVersion = new Version();
+    } else if (browserName == "Silk") {
+      browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /Silk\/([\d\._]+)/, 1));
     } else if (this.userAgent_.indexOf("Version/") != -1) {
-      version = this.getMatchingGroup_(this.userAgent_,
-          /Version\/([\d\.\w]+)/, 1);
-    } else if (name == "Chrome") {
-      version = this.getMatchingGroup_(this.userAgent_,
-          /(Chrome|CrMo|CriOS)\/([\d\.]+)/, 2);
-    } else if (name == "AdobeAIR") {
-      version = this.getMatchingGroup_(this.userAgent_,
-          /AdobeAIR\/([\d\.]+)/, 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 (browserName == "AdobeAIR") {
+      browserVersion = Version.parse(this.getMatchingGroup_(this.userAgent_, /AdobeAIR\/([\d\.]+)/, 1));
     }
-    if (name == "AdobeAIR") {
-      var browserVersion = this.parseVersion_(version);
+
+    if (browserName == "AdobeAIR") {
       supportWebFont = browserVersion.major > 2 || browserVersion.major == 2 && browserVersion.minor >= 5;
     } else if (platform == "BlackBerry") {
       supportWebFont = platformVersion.major >= 10;
@@ -293,11 +262,12 @@ goog.scope(function () {
     } else {
       supportWebFont = webKitVersion.major >= 526 || webKitVersion.major >= 525 && webKitVersion.minor >= 13;
     }
+
     var hasWebKitFallbackBug = webKitVersion.major < 536 || (webKitVersion.major == 536 && webKitVersion.minor < 11),
         hasWebKitMetricsBug = platform == 'iPhone' || platform == 'iPad' || platform == 'iPod' || platform == 'Macintosh';
 
-    return new UserAgent(name, version, "AppleWebKit", webKitVersionString,
-        platform, platformVersionString, this.getDocumentMode_(this.doc_), new BrowserInfo(supportWebFont, hasWebKitFallbackBug, hasWebKitMetricsBug));
+    return new UserAgent(browserName, browserVersion, "AppleWebKit", webKitVersion, platform, platformVersion,
+                         this.getDocumentMode_(this.doc_), new BrowserInfo(supportWebFont, hasWebKitFallbackBug, hasWebKitMetricsBug));
   };
 
   /**
@@ -311,57 +281,31 @@ goog.scope(function () {
    * @private
    */
   UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
-    var name = UserAgentParser.UNKNOWN;
-    var version = UserAgentParser.UNKNOWN;
-    var supportWebFont = false;
+    var name = UserAgentParser.UNKNOWN,
+        version = new Version(),
+        platformVersion = Version.parse(this.getPlatformVersionString_()),
+        supportWebFont = false;
 
     if (this.userAgent_.indexOf("Firefox") != -1) {
       name = "Firefox";
-      var versionNum = this.getMatchingGroup_(this.userAgent_,
-          /Firefox\/([\d\w\.]+)/, 1);
-
-      if (versionNum != "") {
-        var firefoxVersion = this.parseVersion_(versionNum);
-
-        version = versionNum;
-        supportWebFont = firefoxVersion.major >= 3 &&
-                         firefoxVersion.minor >= 5;
-      }
+      version = Version.parse(this.getMatchingGroup_(this.userAgent_, /Firefox\/([\d\w\.]+)/, 1));
+      supportWebFont = version.major >= 3 && version.minor >= 5;
     } else if (this.userAgent_.indexOf("Mozilla") != -1) {
       name = "Mozilla";
     }
-    var geckoVersionString = this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1);
 
-    if (geckoVersionString == "") {
-      geckoVersionString = UserAgentParser.UNKNOWN;
-    } else {
-      if (!supportWebFont) {
-        var geckoVersion = this.parseVersion_(geckoVersionString);
-
-        supportWebFont = geckoVersion.major > 1 ||
-                         geckoVersion.major == 1 && geckoVersion.minor > 9 ||
-                         geckoVersion.major == 1 && geckoVersion.minor == 9 && geckoVersion.patch >= 2 ||
-                         geckoVersionString.match(/1\.9\.1b[123]/) != null ||
-                         geckoVersionString.match(/1\.9\.1\.[\d\.]+/) != null;
-      }
-    }
-    return new UserAgent(name, version, "Gecko", geckoVersionString,
-        this.getPlatform_(), this.getPlatformVersion_(), this.getDocumentMode_(this.doc_), new BrowserInfo(supportWebFont, false, false));
-  };
+    var engineVersionString = this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1),
+        engineVersion = Version.parse(engineVersionString);
 
-  /**
-   * @private
-   */
-  UserAgentParser.prototype.parseVersion_ = function(version) {
-    var m = /([0-9]+)(?:\.([0-9]+)(?:\.([0-9]+)?)?)?/.exec(version),
-        result = {};
-
-    if (m) {
-      result.major = parseInt(m[1] || -1, 10);
-      result.minor = parseInt(m[2] || -1, 10);
-      result.patch = parseInt(m[3] || -1, 10);
+    if (!supportWebFont) {
+      supportWebFont = engineVersion.major > 1 ||
+                       engineVersion.major == 1 && engineVersion.minor > 9 ||
+                       engineVersion.major == 1 && engineVersion.minor == 9 && engineVersion.patch >= 2 ||
+                       engineVersionString.match(/1\.9\.1b[123]/) != null ||
+                       engineVersionString.match(/1\.9\.1\.[\d\.]+/) != null;
     }
-    return result;
+    return new UserAgent(name, version, "Gecko", engineVersion,
+        this.getPlatform_(), platformVersion, this.getDocumentMode_(this.doc_), new BrowserInfo(supportWebFont, false, false));
   };
 
   /**