webfontloader 1.3.0 → 1.3.1

data/src/core/useragent.js

@@ -1,4 +1,7 @@
+goog.provide('webfont.UserAgent');
+
 /**
+ * @export
  * @param {string} name
  * @param {string} version
  * @param {string} engine
@@ -21,58 +24,70 @@ webfont.UserAgent = function(name, version, engine, engineVersion, platform,
   this.browserInfo_ = browserInfo;
 };
 
-/**
- * @return {string}
- */
-webfont.UserAgent.prototype.getName = function() {
-  return this.name_;
-};
+goog.scope(function () {
+  var UserAgent = webfont.UserAgent;
 
-/**
- * @return {string}
- */
-webfont.UserAgent.prototype.getVersion = function() {
-  return this.version_;
-};
+  /**
+   * @export
+   * @return {string}
+   */
+  UserAgent.prototype.getName = function() {
+    return this.name_;
+  };
 
-/**
- * @return {string}
- */
-webfont.UserAgent.prototype.getEngine = function() {
-  return this.engine_;
-};
+  /**
+   * @export
+   * @return {string}
+   */
+  UserAgent.prototype.getVersion = function() {
+    return this.version_;
+  };
 
-/**
- * @return {string}
- */
-webfont.UserAgent.prototype.getEngineVersion = function() {
-  return this.engineVersion_;
-};
+  /**
+   * @export
+   * @return {string}
+   */
+  UserAgent.prototype.getEngine = function() {
+    return this.engine_;
+  };
 
-/**
- * @return {string}
- */
-webfont.UserAgent.prototype.getPlatform = function() {
-  return this.platform_;
-};
+  /**
+   * @export
+   * @return {string}
+   */
+  UserAgent.prototype.getEngineVersion = function() {
+    return this.engineVersion_;
+  };
 
-/**
- * @return {string}
- */
-webfont.UserAgent.prototype.getPlatformVersion = function() {
-  return this.platformVersion_;
-};
+  /**
+   * @export
+   * @return {string}
+   */
+  UserAgent.prototype.getPlatform = function() {
+    return this.platform_;
+  };
 
-/**
- * @return {number|undefined}
- */
-webfont.UserAgent.prototype.getDocumentMode = function() {
-  return this.documentMode_;
-};
+  /**
+   * @export
+   * @return {string}
+   */
+  UserAgent.prototype.getPlatformVersion = function() {
+    return this.platformVersion_;
+  };
 
-/**
- * @return {webfont.BrowserInfo}
- */
-webfont.UserAgent.prototype.getBrowserInfo = function() {
-  return this.browserInfo_;
-};
+  /**
+   * @export
+   * @return {number|undefined}
+   */
+  UserAgent.prototype.getDocumentMode = function() {
+    return this.documentMode_;
+  };
+
+  /**
+   * @export
+   * @return {webfont.BrowserInfo}
+   */
+  UserAgent.prototype.getBrowserInfo = function() {
+    return this.browserInfo_;
+  };
+});

data/src/core/useragentparser.js

@@ -1,3 +1,8 @@
+goog.provide('webfont.UserAgentParser');
+
+goog.require('webfont.BrowserInfo');
+goog.require('webfont.UserAgent');
+
 /**
  * @param {string} userAgent The browser userAgent string to parse.
  * @constructor
@@ -37,336 +42,342 @@ webfont.UserAgentParser.UNKNOWN_USER_AGENT = new webfont.UserAgent(
     undefined,
     new webfont.BrowserInfo(false, false, false));
 
-/**
- * Parses the user agent string and returns an object.
- * @return {webfont.UserAgent}
- */
-webfont.UserAgentParser.prototype.parse = function() {
-  if (this.isIe_()) {
-    return this.parseIeUserAgentString_();
-  } else if (this.isOpera_()) {
-    return this.parseOperaUserAgentString_();
-  } else if (this.isWebKit_()) {
-    return this.parseWebKitUserAgentString_();
-  } else if (this.isGecko_()) {
-    return this.parseGeckoUserAgentString_();
-  } else {
-    return webfont.UserAgentParser.UNKNOWN_USER_AGENT;
-  }
-};
 
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.getPlatform_ = function() {
-  var mobileOs = this.getMatchingGroup_(this.userAgent_,
-      /(iPod|iPad|iPhone|Android|Windows Phone|BB\d{2}|BlackBerry)/, 1);
-
-  if (mobileOs != "") {
-    if (/BB\d{2}/.test(mobileOs)) {
-      mobileOs = "BlackBerry";
+goog.scope(function () {
+  var UserAgentParser = webfont.UserAgentParser,
+      BrowserInfo = webfont.BrowserInfo,
+      UserAgent = webfont.UserAgent;
+
+  /**
+   * Parses the user agent string and returns an object.
+   * @return {webfont.UserAgent}
+   */
+  UserAgentParser.prototype.parse = function() {
+    if (this.isIe_()) {
+      return this.parseIeUserAgentString_();
+    } else if (this.isOpera_()) {
+      return this.parseOperaUserAgentString_();
+    } else if (this.isWebKit_()) {
+      return this.parseWebKitUserAgentString_();
+    } else if (this.isGecko_()) {
+      return this.parseGeckoUserAgentString_();
+    } else {
+      return webfont.UserAgentParser.UNKNOWN_USER_AGENT;
     }
-    return mobileOs;
-  }
-  var os = this.getMatchingGroup_(this.userAgent_,
-      /(Linux|Mac_PowerPC|Macintosh|Windows|CrOS)/, 1);
-
-  if (os != "") {
-    if (os == "Mac_PowerPC") {
-      os = "Macintosh";
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.getPlatform_ = function() {
+    var mobileOs = this.getMatchingGroup_(this.userAgent_,
+        /(iPod|iPad|iPhone|Android|Windows Phone|BB\d{2}|BlackBerry)/, 1);
+
+    if (mobileOs != "") {
+      if (/BB\d{2}/.test(mobileOs)) {
+        mobileOs = "BlackBerry";
+      }
+      return mobileOs;
+    }
+    var os = this.getMatchingGroup_(this.userAgent_,
+        /(Linux|Mac_PowerPC|Macintosh|Windows|CrOS)/, 1);
+
+    if (os != "") {
+      if (os == "Mac_PowerPC") {
+        os = "Macintosh";
+      }
+      return os;
+    }
+    return webfont.UserAgentParser.UNKNOWN;
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.getPlatformVersion_ = function() {
+    var genericVersion = this.getMatchingGroup_(this.userAgent_,
+        /(OS X|Windows NT|Android|CrOS) ([^;)]+)/, 2);
+    if (genericVersion) {
+      return genericVersion;
+    }
+    var winPhoneVersion = this.getMatchingGroup_(this.userAgent_,
+        /Windows Phone( OS)? ([^;)]+)/, 2);
+    if (winPhoneVersion) {
+      return winPhoneVersion;
+    }
+    var iVersion = this.getMatchingGroup_(this.userAgent_,
+        /(iPhone )?OS ([\d_]+)/, 2);
+    if (iVersion) {
+      return iVersion;
+    }
+    var linuxVersion = this.getMatchingGroup_(this.userAgent_,
+        /Linux ([i\d]+)/, 1);
+    if (linuxVersion) {
+      return linuxVersion;
+    }
+    var blackBerryVersion = this.getMatchingGroup_(this.userAgent_,
+        /(BB\d{2}|BlackBerry).*?Version\/([^\s]*)/, 2);
+    if (blackBerryVersion) {
+      return blackBerryVersion;
     }
-    return os;
-  }
-  return webfont.UserAgentParser.UNKNOWN;
-};
-
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.getPlatformVersion_ = function() {
-  var genericVersion = this.getMatchingGroup_(this.userAgent_,
-      /(OS X|Windows NT|Android|CrOS) ([^;)]+)/, 2);
-  if (genericVersion) {
-    return genericVersion;
-  }
-  var winPhoneVersion = this.getMatchingGroup_(this.userAgent_,
-      /Windows Phone( OS)? ([^;)]+)/, 2);
-  if (winPhoneVersion) {
-    return winPhoneVersion;
-  }
-  var iVersion = this.getMatchingGroup_(this.userAgent_,
-      /(iPhone )?OS ([\d_]+)/, 2);
-  if (iVersion) {
-    return iVersion;
-  }
-  var linuxVersion = this.getMatchingGroup_(this.userAgent_,
-      /Linux ([i\d]+)/, 1);
-  if (linuxVersion) {
-    return linuxVersion;
-  }
-  var blackBerryVersion = this.getMatchingGroup_(this.userAgent_,
-      /(BB\d{2}|BlackBerry).*?Version\/([^\s]*)/, 2);
-  if (blackBerryVersion) {
-    return blackBerryVersion;
-  }
-
-  return webfont.UserAgentParser.UNKNOWN;
-};
-
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.isIe_ = function() {
-  return this.userAgent_.indexOf("MSIE") != -1;
-};
 
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.parseIeUserAgentString_ = function() {
-  // For IE we give MSIE as the engine name and the version of IE
-  // instead of the specific Trident engine name and version
+    return UserAgentParser.UNKNOWN;
+  };
 
-  var platform = this.getPlatform_();
-  var platformVersionString = this.getPlatformVersion_();
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.isIe_ = function() {
+    return this.userAgent_.indexOf("MSIE") != -1;
+  };
 
-  var browser = this.getMatchingGroup_(this.userAgent_, /(MSIE [\d\w\.]+)/, 1);
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.parseIeUserAgentString_ = function() {
+    // For IE we give MSIE as the engine name and the version of IE
+    // instead of the specific Trident engine name and version
 
-  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);
+    var platform = this.getPlatform_();
+    var platformVersionString = this.getPlatformVersion_();
 
-    return new webfont.UserAgent(name, version, name, version,
-        platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, false, false));
-  }
+    var browser = this.getMatchingGroup_(this.userAgent_, /(MSIE [\d\w\.]+)/, 1);
 
-  return new webfont.UserAgent("MSIE", webfont.UserAgentParser.UNKNOWN,
-      "MSIE", webfont.UserAgentParser.UNKNOWN,
-      platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(false, false, false));
-};
+    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);
 
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.isOpera_ = function() {
-  return this.userAgent_.indexOf("Opera") != -1;
-};
+      return new UserAgent(name, version, name, version,
+          platform, platformVersionString, this.getDocumentMode_(this.doc_), new BrowserInfo(supportWebFont, false, false));
 
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
-  var engineName = webfont.UserAgentParser.UNKNOWN;
-  var engineVersion = webfont.UserAgentParser.UNKNOWN;
-  var enginePair = this.getMatchingGroup_(this.userAgent_,
-      /(Presto\/[\d\w\.]+)/, 1);
-
-  if (enginePair != "") {
-    var splittedEnginePair = enginePair.split('/');
-
-    engineName = splittedEnginePair[0];
-    engineVersion = splittedEnginePair[1];
-  } else {
-    if (this.userAgent_.indexOf("Gecko") != -1) {
-      engineName = "Gecko";
     }
-    var geckoVersion = this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1);
 
-    if (geckoVersion != "") {
-      engineVersion = geckoVersion;
+    return new UserAgent("MSIE", webfont.UserAgentParser.UNKNOWN,
+        "MSIE", webfont.UserAgentParser.UNKNOWN,
+        platform, platformVersionString, this.getDocumentMode_(this.doc_), new BrowserInfo(false, false, false));
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.isOpera_ = function() {
+    return this.userAgent_.indexOf("Opera") != -1;
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.parseOperaUserAgentString_ = function() {
+    var engineName = UserAgentParser.UNKNOWN;
+    var engineVersion = UserAgentParser.UNKNOWN;
+    var enginePair = this.getMatchingGroup_(this.userAgent_,
+        /(Presto\/[\d\w\.]+)/, 1);
+
+    if (enginePair != "") {
+      var splittedEnginePair = enginePair.split('/');
+
+      engineName = splittedEnginePair[0];
+      engineVersion = splittedEnginePair[1];
+    } else {
+      if (this.userAgent_.indexOf("Gecko") != -1) {
+        engineName = "Gecko";
+      }
+      var geckoVersion = this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1);
+
+      if (geckoVersion != "") {
+        engineVersion = geckoVersion;
+      }
     }
-  }
 
-  // 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);
+    // 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;
+      }
 
-    if (version == "") {
-      version = webfont.UserAgentParser.UNKNOWN;
+      return new UserAgent("OperaMini", version, engineName,
+          engineVersion, this.getPlatform_(), this.getPlatformVersion_(),
+          this.getDocumentMode_(this.doc_), new BrowserInfo(false, false, false));
     }
 
-    return new webfont.UserAgent("OperaMini", version, engineName,
-        engineVersion, this.getPlatform_(), this.getPlatformVersion_(),
-        this.getDocumentMode_(this.doc_), new webfont.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);
 
-  // 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);
+      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));
+      }
+    }
+    var versionString = this.getMatchingGroup_(this.userAgent_, /Opera[\/ ]([\d\.]+)/, 1);
 
     if (versionString != "") {
       var version = this.parseVersion_(versionString);
-      return new webfont.UserAgent("Opera", versionString, engineName, engineVersion,
+      return new UserAgent("Opera", versionString, engineName, engineVersion,
           this.getPlatform_(), this.getPlatformVersion_(),
-          this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(version.major >= 10, false, false));
+          this.getDocumentMode_(this.doc_), new BrowserInfo(version.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));
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.isWebKit_ = function() {
+    return /AppleWeb(K|k)it/.test(this.userAgent_);
+  };
+
+  /**
+   * @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 versionString = this.getMatchingGroup_(this.userAgent_, /Opera[\/ ]([\d\.]+)/, 1);
-
-  if (versionString != "") {
-    var version = this.parseVersion_(versionString);
-    return new webfont.UserAgent("Opera", versionString, engineName, engineVersion,
-        this.getPlatform_(), this.getPlatformVersion_(),
-        this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(version.major >= 10, false, false));
-  }
-  return new webfont.UserAgent("Opera", webfont.UserAgentParser.UNKNOWN,
-      engineName, engineVersion, this.getPlatform_(),
-      this.getPlatformVersion_(), this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(false, false, false));
-};
-
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.isWebKit_ = function() {
-  return /AppleWeb(K|k)it/.test(this.userAgent_);
-};
-
-/**
- * @private
- */
-webfont.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 = webfont.UserAgentParser.UNKNOWN;
-  }
-
-  var webKitVersion = this.parseVersion_(webKitVersionString);
-  var platformVersion = this.parseVersion_(platformVersionString);
-
-  var name = webfont.UserAgentParser.UNKNOWN;
-
-  if (this.userAgent_.indexOf("Chrome") != -1 || this.userAgent_.indexOf("CrMo") != -1 || this.userAgent_.indexOf("CriOS") != -1) {
-    name = "Chrome";
-  } else if (platform == "BlackBerry" || platform == "Android") {
-    name = webfont.UserAgentParser.BUILTIN_BROWSER;
-  } else if (this.userAgent_.indexOf("Safari") != -1) {
-    name = "Safari";
-  } else if (this.userAgent_.indexOf("AdobeAIR") != -1) {
-    name = "AdobeAIR";
-  }
-  var version = webfont.UserAgentParser.UNKNOWN;
-
-  if (name == webfont.UserAgentParser.BUILTIN_BROWSER) {
-    version = webfont.UserAgentParser.UNKNOWN;
-  } 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);
-  }
-  if (name == "AdobeAIR") {
-    var browserVersion = this.parseVersion_(version);
-    supportWebFont = browserVersion.major > 2 || browserVersion.major == 2 && browserVersion.minor >= 5;
-  } else if (platform == "BlackBerry") {
-    supportWebFont = platformVersion.major >= 10;
-  } else if (platform == "Android") {
-    supportWebFont = platformVersion.major > 2 || (platformVersion.major == 2 && platformVersion.minor > 1);
-  } 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 webfont.UserAgent(name, version, "AppleWebKit", webKitVersionString,
-      platform, platformVersionString, this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, hasWebKitFallbackBug, hasWebKitMetricsBug));
-};
-
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.isGecko_ = function() {
-  return this.userAgent_.indexOf("Gecko") != -1;
-};
 
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
-  var name = webfont.UserAgentParser.UNKNOWN;
-  var version = webfont.UserAgentParser.UNKNOWN;
-  var 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;
+    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";
+    } else if (platform == "BlackBerry" || platform == "Android") {
+      name = UserAgentParser.BUILTIN_BROWSER;
+    } else if (this.userAgent_.indexOf("Safari") != -1) {
+      name = "Safari";
+    } else if (this.userAgent_.indexOf("AdobeAIR") != -1) {
+      name = "AdobeAIR";
     }
-  } else if (this.userAgent_.indexOf("Mozilla") != -1) {
-    name = "Mozilla";
-  }
-  var geckoVersionString = this.getMatchingGroup_(this.userAgent_, /rv:([^\)]+)/, 1);
-
-  if (geckoVersionString == "") {
-    geckoVersionString = webfont.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;
+    var version = UserAgentParser.UNKNOWN;
+
+    if (name == UserAgentParser.BUILTIN_BROWSER) {
+      version = UserAgentParser.UNKNOWN;
+    } 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);
     }
-  }
-  return new webfont.UserAgent(name, version, "Gecko", geckoVersionString,
-      this.getPlatform_(), this.getPlatformVersion_(), this.getDocumentMode_(this.doc_), new webfont.BrowserInfo(supportWebFont, false, false));
-};
-
-/**
- * @private
- */
-webfont.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);
-  }
-  return result;
-};
-
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.getMatchingGroup_ = function(str,
-    regexp, index) {
-  var groups = str.match(regexp);
-
-  if (groups && groups[index]) {
-    return groups[index];
-  }
-  return "";
-};
-
-/**
- * @private
- */
-webfont.UserAgentParser.prototype.getDocumentMode_ = function(doc) {
-  if (doc.documentMode) return doc.documentMode;
-  return undefined;
-};
+    if (name == "AdobeAIR") {
+      var browserVersion = this.parseVersion_(version);
+      supportWebFont = browserVersion.major > 2 || browserVersion.major == 2 && browserVersion.minor >= 5;
+    } else if (platform == "BlackBerry") {
+      supportWebFont = platformVersion.major >= 10;
+    } else if (platform == "Android") {
+      supportWebFont = platformVersion.major > 2 || (platformVersion.major == 2 && platformVersion.minor > 1);
+    } 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));
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.isGecko_ = function() {
+    return this.userAgent_.indexOf("Gecko") != -1;
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.parseGeckoUserAgentString_ = function() {
+    var name = UserAgentParser.UNKNOWN;
+    var version = UserAgentParser.UNKNOWN;
+    var 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;
+      }
+    } 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));
+  };
+
+  /**
+   * @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);
+    }
+    return result;
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.getMatchingGroup_ = function(str,
+      regexp, index) {
+    var groups = str.match(regexp);
+
+    if (groups && groups[index]) {
+      return groups[index];
+    }
+    return "";
+  };
+
+  /**
+   * @private
+   */
+  UserAgentParser.prototype.getDocumentMode_ = function(doc) {
+    if (doc.documentMode) return doc.documentMode;
+    return undefined;
+  };
+});