From 88731e16c8639738a1375f8c2de1ec2a23fcb631 Mon Sep 17 00:00:00 2001
From: David Vieira <davidhsv@gmail.com>
Date: Sat, 2 May 2015 02:07:35 -0300
Subject: [PATCH 01/10] #149 Be able to evaluate page with iframes; disabling
 webSecurity in phantomJs -> so we can get the document root from frames.

---
 dist/js/axs_testing.js | 688 ++++++++++++++++++++++++++++++-----------
 src/js/AuditRule.js    |   8 +
 tools/runner/audit.js  |   3 +
 3 files changed, 527 insertions(+), 172 deletions(-)

diff --git a/dist/js/axs_testing.js b/dist/js/axs_testing.js
index f0e6f4a3..ceefb47c 100644
--- a/dist/js/axs_testing.js
+++ b/dist/js/axs_testing.js
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Google Inc.
+ * Copyright 2015 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/3d4893b4ecd0eb8f4765e04479213d04b240f3e0
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/f61fd0447d7ad90256597e6b1203e6495f430694
  *
  * See project README for build steps.
  */
@@ -62,7 +62,7 @@ goog.setTestOnly = function(a) {
 goog.forwardDeclare = function(a) {
 };
 COMPILED || (goog.isProvided_ = function(a) {
-  return!goog.implicitNamespaces_[a] && goog.isDefAndNotNull(goog.getObjectByName(a));
+  return !goog.implicitNamespaces_[a] && goog.isDefAndNotNull(goog.getObjectByName(a));
 }, goog.implicitNamespaces_ = {});
 goog.getObjectByName = function(a, b) {
   for (var c = a.split("."), d = b || goog.global, e;e = c.shift();) {
@@ -153,14 +153,14 @@ goog.DEPENDENCIES_ENABLED && (goog.included_ = {}, goog.dependencies_ = {pathToN
     var b = goog.global.document;
     if ("complete" == b.readyState) {
       if (/\bdeps.js$/.test(a)) {
-        return!1;
+        return !1;
       }
       throw Error('Cannot write "' + a + '" after document load');
     }
     b.write('<script type="text/javascript" src="' + a + '">\x3c/script>');
-    return!0;
+    return !0;
   }
-  return!1;
+  return !1;
 }, goog.writeScripts_ = function() {
   function a(e) {
     if (!(e in d.written)) {
@@ -258,7 +258,7 @@ goog.getUid = function(a) {
   return a[goog.UID_PROPERTY_] || (a[goog.UID_PROPERTY_] = ++goog.uidCounter_);
 };
 goog.hasUid = function(a) {
-  return!!a[goog.UID_PROPERTY_];
+  return !!a[goog.UID_PROPERTY_];
 };
 goog.removeUid = function(a) {
   "removeAttribute" in a && a.removeAttribute(goog.UID_PROPERTY_);
@@ -322,7 +322,7 @@ goog.mixin = function(a, b) {
   }
 };
 goog.now = goog.TRUSTED_SITE && Date.now || function() {
-  return+new Date;
+  return +new Date;
 };
 goog.globalEval = function(a) {
   if (goog.global.execScript) {
@@ -421,24 +421,24 @@ goog.scope = function(a) {
 var axs = {};
 axs.browserUtils = {};
 axs.browserUtils.matchSelector = function(a, b) {
-  return a.webkitMatchesSelector ? a.webkitMatchesSelector(b) : a.mozMatchesSelector ? a.mozMatchesSelector(b) : !1;
+  return a.webkitMatchesSelector ? a.webkitMatchesSelector(b) : a.mozMatchesSelector ? a.mozMatchesSelector(b) : a.msMatchesSelector ? a.msMatchesSelector(b) : !1;
 };
 axs.constants = {};
 axs.constants.ARIA_ROLES = {alert:{namefrom:["author"], parent:["region"]}, alertdialog:{namefrom:["author"], namerequired:!0, parent:["alert", "dialog"]}, application:{namefrom:["author"], namerequired:!0, parent:["landmark"]}, article:{namefrom:["author"], parent:["document", "region"]}, banner:{namefrom:["author"], parent:["landmark"]}, button:{childpresentational:!0, namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded", "aria-pressed"]}, checkbox:{namefrom:["contents", 
-"author"], namerequired:!0, parent:["input"], requiredProperties:["aria-checked"], properties:["aria-checked"]}, columnheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"]}, combobox:{mustcontain:["listbox", "textbox"], namefrom:["author"], namerequired:!0, parent:["select"], requiredProperties:["aria-expanded"], properties:["aria-expanded", "aria-autocomplete", "aria-required"]}, command:{"abstract":!0, namefrom:["author"], 
+"author"], namerequired:!0, parent:["input"], requiredProperties:["aria-checked"], properties:["aria-checked"]}, columnheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, combobox:{mustcontain:["listbox", "textbox"], namefrom:["author"], namerequired:!0, parent:["select"], requiredProperties:["aria-expanded"], properties:["aria-expanded", "aria-autocomplete", "aria-required"]}, command:{"abstract":!0, namefrom:["author"], 
 parent:["widget"]}, complementary:{namefrom:["author"], parent:["landmark"]}, composite:{"abstract":!0, childpresentational:!1, namefrom:["author"], parent:["widget"], properties:["aria-activedescendant"]}, contentinfo:{namefrom:["author"], parent:["landmark"]}, definition:{namefrom:["author"], parent:["section"]}, dialog:{namefrom:["author"], namerequired:!0, parent:["window"]}, directory:{namefrom:["contents", "author"], parent:["list"]}, document:{namefrom:[" author"], namerequired:!0, parent:["structure"], 
-properties:["aria-expanded"]}, form:{namefrom:["author"], parent:["landmark"]}, grid:{mustcontain:["row", "rowgroup"], namefrom:["author"], namerequired:!0, parent:["composite", "region"], properties:["aria-level", "aria-multiselectable", "aria-readonly"]}, gridcell:{namefrom:["contents", "author"], namerequired:!0, parent:["section", "widget"], properties:["aria-readonly", "aria-required", "aria-selected"]}, group:{namefrom:[" author"], parent:["section"], properties:["aria-activedescendant"]}, 
+properties:["aria-expanded"]}, form:{namefrom:["author"], parent:["landmark"]}, grid:{mustcontain:["row", "rowgroup"], namefrom:["author"], namerequired:!0, parent:["composite", "region"], properties:["aria-level", "aria-multiselectable", "aria-readonly"]}, gridcell:{namefrom:["contents", "author"], namerequired:!0, parent:["section", "widget"], properties:["aria-readonly", "aria-required", "aria-selected"], scope:["row"]}, group:{namefrom:[" author"], parent:["section"], properties:["aria-activedescendant"]}, 
 heading:{namerequired:!0, parent:["sectionhead"], properties:["aria-level"]}, img:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["section"]}, input:{"abstract":!0, namefrom:["author"], parent:["widget"]}, landmark:{"abstract":!0, namefrom:["contents", "author"], namerequired:!1, parent:["region"]}, link:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], properties:["aria-expanded"]}, list:{mustcontain:["group", "listitem"], namefrom:["author"], parent:["region"]}, 
-listbox:{mustcontain:["option"], namefrom:["author"], namerequired:!0, parent:["list", "select"], properties:["aria-multiselectable", "aria-required"]}, listitem:{namefrom:["contents", "author"], namerequired:!0, parent:["section"], properties:["aria-level", "aria-posinset", "aria-setsize"]}, log:{namefrom:[" author"], namerequired:!0, parent:["region"]}, main:{namefrom:["author"], parent:["landmark"]}, marquee:{namerequired:!0, parent:["section"]}, math:{childpresentational:!0, namefrom:["author"], 
-parent:["section"]}, menu:{mustcontain:["group", "menuitemradio", "menuitem", "menuitemcheckbox"], namefrom:["author"], namerequired:!0, parent:["list", "select"]}, menubar:{namefrom:["author"], parent:["menu"]}, menuitem:{namefrom:["contents", "author"], namerequired:!0, parent:["command"]}, menuitemcheckbox:{namefrom:["contents", "author"], namerequired:!0, parent:["checkbox", "menuitem"]}, menuitemradio:{namefrom:["contents", "author"], namerequired:!0, parent:["menuitemcheckbox", "radio"]}, navigation:{namefrom:["author"], 
-parent:["landmark"]}, note:{namefrom:["author"], parent:["section"]}, option:{namefrom:["contents", "author"], namerequired:!0, parent:["input"], properties:["aria-checked", "aria-posinset", "aria-selected", "aria-setsize"]}, presentation:{parent:["structure"]}, progressbar:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["range"]}, radio:{namefrom:["contents", "author"], namerequired:!0, parent:["checkbox", "option"]}, radiogroup:{mustcontain:["radio"], namefrom:["author"], 
-namerequired:!0, parent:["select"], properties:["aria-required"]}, range:{"abstract":!0, namefrom:["author"], parent:["widget"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-valuetext"]}, region:{namefrom:[" author"], parent:["section"]}, roletype:{"abstract":!0, properties:"aria-atomic aria-busy aria-controls aria-describedby aria-disabled aria-dropeffect aria-flowto aria-grabbed aria-haspopup aria-hidden aria-invalid aria-label aria-labelledby aria-live aria-owns aria-relevant".split(" ")}, 
-row:{mustcontain:["columnheader", "gridcell", "rowheader"], namefrom:["contents", "author"], parent:["group", "widget"], properties:["aria-level", "aria-selected"]}, rowgroup:{mustcontain:["row"], namefrom:["contents", "author"], parent:["group"]}, rowheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"]}, search:{namefrom:["author"], parent:["landmark"]}, section:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], 
-properties:["aria-expanded"]}, sectionhead:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, select:{"abstract":!0, namefrom:["author"], parent:["composite", "group", "input"]}, separator:{childpresentational:!0, namefrom:["author"], parent:["structure"], properties:["aria-expanded", "aria-orientation"]}, scrollbar:{childpresentational:!0, namefrom:["author"], namerequired:!1, parent:["input", "range"], requiredProperties:["aria-controls", "aria-orientation", 
-"aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"]}, slider:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-orientation"]}, spinbutton:{namefrom:["author"], namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", 
-"aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-required"]}, status:{parent:["region"]}, structure:{"abstract":!0, parent:["roletype"]}, tab:{namefrom:["contents", "author"], parent:["sectionhead", "widget"], properties:["aria-selected"]}, tablist:{mustcontain:["tab"], namefrom:["author"], parent:["composite", "directory"], properties:["aria-level"]}, tabpanel:{namefrom:["author"], namerequired:!0, parent:["region"]}, textbox:{namefrom:["author"], 
-namerequired:!0, parent:["input"], properties:["aria-activedescendant", "aria-autocomplete", "aria-multiline", "aria-readonly", "aria-required"]}, timer:{namefrom:["author"], namerequired:!0, parent:["status"]}, toolbar:{namefrom:["author"], parent:["group"]}, tooltip:{namerequired:!0, parent:["section"]}, tree:{mustcontain:["group", "treeitem"], namefrom:["author"], namerequired:!0, parent:["select"], properties:["aria-multiselectable", "aria-required"]}, treegrid:{mustcontain:["row"], namefrom:["author"], 
-namerequired:!0, parent:["grid", "tree"]}, treeitem:{namefrom:["contents", "author"], namerequired:!0, parent:["listitem", "option"]}, widget:{"abstract":!0, parent:["roletype"]}, window:{"abstract":!0, namefrom:[" author"], parent:["roletype"], properties:["aria-expanded"]}};
+listbox:{mustcontain:["option"], namefrom:["author"], namerequired:!0, parent:["list", "select"], properties:["aria-multiselectable", "aria-required"]}, listitem:{namefrom:["contents", "author"], namerequired:!0, parent:["section"], properties:["aria-level", "aria-posinset", "aria-setsize"], scope:["list"]}, log:{namefrom:[" author"], namerequired:!0, parent:["region"]}, main:{namefrom:["author"], parent:["landmark"]}, marquee:{namerequired:!0, parent:["section"]}, math:{childpresentational:!0, namefrom:["author"], 
+parent:["section"]}, menu:{mustcontain:["group", "menuitemradio", "menuitem", "menuitemcheckbox"], namefrom:["author"], namerequired:!0, parent:["list", "select"]}, menubar:{namefrom:["author"], parent:["menu"]}, menuitem:{namefrom:["contents", "author"], namerequired:!0, parent:["command"], scope:["menu", "menubar"]}, menuitemcheckbox:{namefrom:["contents", "author"], namerequired:!0, parent:["checkbox", "menuitem"], scope:["menu", "menubar"]}, menuitemradio:{namefrom:["contents", "author"], namerequired:!0, 
+parent:["menuitemcheckbox", "radio"], scope:["menu", "menubar"]}, navigation:{namefrom:["author"], parent:["landmark"]}, note:{namefrom:["author"], parent:["section"]}, option:{namefrom:["contents", "author"], namerequired:!0, parent:["input"], properties:["aria-checked", "aria-posinset", "aria-selected", "aria-setsize"]}, presentation:{parent:["structure"]}, progressbar:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["range"]}, radio:{namefrom:["contents", "author"], namerequired:!0, 
+parent:["checkbox", "option"]}, radiogroup:{mustcontain:["radio"], namefrom:["author"], namerequired:!0, parent:["select"], properties:["aria-required"]}, range:{"abstract":!0, namefrom:["author"], parent:["widget"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-valuetext"]}, region:{namefrom:[" author"], parent:["section"]}, roletype:{"abstract":!0, properties:"aria-atomic aria-busy aria-controls aria-describedby aria-disabled aria-dropeffect aria-flowto aria-grabbed aria-haspopup aria-hidden aria-invalid aria-label aria-labelledby aria-live aria-owns aria-relevant".split(" ")}, 
+row:{mustcontain:["columnheader", "gridcell", "rowheader"], namefrom:["contents", "author"], parent:["group", "widget"], properties:["aria-level", "aria-selected"], scope:["grid", "rowgroup", "treegrid"]}, rowgroup:{mustcontain:["row"], namefrom:["contents", "author"], parent:["group"], scope:["grid"]}, rowheader:{namefrom:["contents", "author"], namerequired:!0, parent:["gridcell", "sectionhead", "widget"], properties:["aria-sort"], scope:["row"]}, search:{namefrom:["author"], parent:["landmark"]}, 
+section:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, sectionhead:{"abstract":!0, namefrom:["contents", "author"], parent:["structure"], properties:["aria-expanded"]}, select:{"abstract":!0, namefrom:["author"], parent:["composite", "group", "input"]}, separator:{childpresentational:!0, namefrom:["author"], parent:["structure"], properties:["aria-expanded", "aria-orientation"]}, scrollbar:{childpresentational:!0, namefrom:["author"], namerequired:!1, 
+parent:["input", "range"], requiredProperties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-controls", "aria-orientation", "aria-valuemax", "aria-valuemin", "aria-valuenow"]}, slider:{childpresentational:!0, namefrom:["author"], namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-orientation"]}, spinbutton:{namefrom:["author"], 
+namerequired:!0, parent:["input", "range"], requiredProperties:["aria-valuemax", "aria-valuemin", "aria-valuenow"], properties:["aria-valuemax", "aria-valuemin", "aria-valuenow", "aria-required"]}, status:{parent:["region"]}, structure:{"abstract":!0, parent:["roletype"]}, tab:{namefrom:["contents", "author"], parent:["sectionhead", "widget"], properties:["aria-selected"]}, tablist:{mustcontain:["tab"], namefrom:["author"], parent:["composite", "directory"], properties:["aria-level"], scope:["tablist"]}, 
+tabpanel:{namefrom:["author"], namerequired:!0, parent:["region"]}, textbox:{namefrom:["author"], namerequired:!0, parent:["input"], properties:["aria-activedescendant", "aria-autocomplete", "aria-multiline", "aria-readonly", "aria-required"]}, timer:{namefrom:["author"], namerequired:!0, parent:["status"]}, toolbar:{namefrom:["author"], parent:["group"]}, tooltip:{namerequired:!0, parent:["section"]}, tree:{mustcontain:["group", "treeitem"], namefrom:["author"], namerequired:!0, parent:["select"], 
+properties:["aria-multiselectable", "aria-required"]}, treegrid:{mustcontain:["row"], namefrom:["author"], namerequired:!0, parent:["grid", "tree"]}, treeitem:{namefrom:["contents", "author"], namerequired:!0, parent:["listitem", "option"], scope:["group", "tree"]}, widget:{"abstract":!0, parent:["roletype"]}, window:{"abstract":!0, namefrom:[" author"], parent:["roletype"], properties:["aria-expanded"]}};
 axs.constants.WIDGET_ROLES = {};
 axs.constants.addAllParentRolesToSet_ = function(a, b) {
   if (a.parent) {
@@ -480,7 +480,7 @@ describedby:{type:"property", valueType:"idref_list"}, disabled:{defaultValue:"f
 multiline:{defaultValue:"false", type:"property", valueType:"boolean"}, multiselectable:{defaultValue:"false", type:"property", valueType:"boolean"}, orientation:{defaultValue:"vertical", type:"property", valueType:"token", values:["horizontal", "vertical"]}, owns:{type:"property", valueType:"idref_list"}, posinset:{type:"property", valueType:"integer"}, pressed:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "mixed", "undefined"]}, readonly:{defaultValue:"false", 
 type:"property", valueType:"boolean"}, relevant:{defaultValue:"additions text", type:"property", valueType:"token_list", values:["additions", "removals", "text", "all"]}, required:{defaultValue:"false", type:"property", valueType:"boolean"}, selected:{defaultValue:"undefined", type:"state", valueType:"token", values:["true", "false", "undefined"]}, setsize:{type:"property", valueType:"integer"}, sort:{defaultValue:"none", type:"property", valueType:"token", values:["ascending", "descending", "none", 
 "other"]}, valuemax:{type:"property", valueType:"decimal"}, valuemin:{type:"property", valueType:"decimal"}, valuenow:{type:"property", valueType:"decimal"}, valuetext:{type:"property", valueType:"string"}};
-axs.constants.GLOBAL_PROPERTIES = "aria-atomic aria-busy aria-controls aria-describedby aria-disabled aria-dropeffect aria-flowto aria-grabbed aria-haspopup aria-hidden aria-invalid aria-label aria-labelledby aria-live aria-owns aria-relevant".split(" ");
+axs.constants.GLOBAL_PROPERTIES = axs.constants.ARIA_ROLES.roletype.properties;
 axs.constants.NO_ROLE_NAME = " ";
 axs.constants.WIDGET_ROLE_TO_NAME = {alert:"aria_role_alert", alertdialog:"aria_role_alertdialog", button:"aria_role_button", checkbox:"aria_role_checkbox", columnheader:"aria_role_columnheader", combobox:"aria_role_combobox", dialog:"aria_role_dialog", grid:"aria_role_grid", gridcell:"aria_role_gridcell", link:"aria_role_link", listbox:"aria_role_listbox", log:"aria_role_log", marquee:"aria_role_marquee", menu:"aria_role_menu", menubar:"aria_role_menubar", menuitem:"aria_role_menuitem", menuitemcheckbox:"aria_role_menuitemcheckbox", 
 menuitemradio:"aria_role_menuitemradio", option:axs.constants.NO_ROLE_NAME, progressbar:"aria_role_progressbar", radio:"aria_role_radio", radiogroup:"aria_role_radiogroup", rowheader:"aria_role_rowheader", scrollbar:"aria_role_scrollbar", slider:"aria_role_slider", spinbutton:"aria_role_spinbutton", status:"aria_role_status", tab:"aria_role_tab", tabpanel:"aria_role_tabpanel", textbox:"aria_role_textbox", timer:"aria_role_timer", toolbar:"aria_role_toolbar", tooltip:"aria_role_tooltip", treeitem:"aria_role_treeitem"};
@@ -508,6 +508,21 @@ axs.constants.MIXED_VALUES = {"true":!0, "false":!0, mixed:!0};
 axs.constants.Severity = {INFO:"Info", WARNING:"Warning", SEVERE:"Severe"};
 axs.constants.AuditResult = {PASS:"PASS", FAIL:"FAIL", NA:"NA"};
 axs.constants.InlineElements = {TT:!0, I:!0, B:!0, BIG:!0, SMALL:!0, EM:!0, STRONG:!0, DFN:!0, CODE:!0, SAMP:!0, KBD:!0, VAR:!0, CITE:!0, ABBR:!0, ACRONYM:!0, A:!0, IMG:!0, OBJECT:!0, BR:!0, SCRIPT:!0, MAP:!0, Q:!0, SUB:!0, SUP:!0, SPAN:!0, BDO:!0, INPUT:!0, SELECT:!0, TEXTAREA:!0, LABEL:!0, BUTTON:!0};
+axs.constants.ARIA_TO_HTML_ATTRIBUTE = {"aria-checked":"checked", "aria-disabled":"disabled", "aria-hidden":"hidden", "aria-expanded":"open", "aria-valuemax":"max", "aria-valuemin":"min", "aria-readonly":"readonly", "aria-required":"required", "aria-selected":"selected", "aria-valuenow":"value"};
+axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO = {A:[{role:"link", allowed:"button checkbox menuitem menuitemcheckbox menuitemradio tab treeitem".split(" "), selector:"a[href]"}], ADDRESS:[{role:"", allowed:["contentinfo", "presentation"]}], AREA:[{role:"link", selector:"area[href]"}], ARTICLE:[{role:"article", allowed:["presentation", "article", "document", "application", "main"]}], ASIDE:[{role:"complementary", allowed:["note", "complementary", "search", "presentation"]}], AUDIO:[{role:"", allowed:["application", 
+"presentation"]}], BASE:[{role:"", reserved:!0}], BODY:[{role:"document", allowed:["presentation"]}], BUTTON:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button:not([aria-pressed]):not([type="menu"])'}, {role:"button", allowed:["button"], selector:"button[aria-pressed]"}, {role:"button", attributes:{"aria-haspopup":!0}, allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'button[type="menu"]'}], CAPTION:[{role:"", 
+allowed:["presentation"]}], COL:[{role:"", reserved:!0}], COLGROUP:[{role:"", reserved:!0}], DATALIST:[{role:"listbox", attributes:{"aria-multiselectable":!1}, allowed:["presentation"]}], DEL:[{role:"", allowed:["*"]}], DD:[{role:"", allowed:["presentation"]}], DT:[{role:"", allowed:["presentation"]}], DETAILS:[{role:"group", allowed:["group", "presentation"]}], DIALOG:[{role:"dialog", allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog[open]"}, {role:"dialog", 
+attributes:{"aria-hidden":!0}, allowed:"dialog alert alertdialog application log marquee status".split(" "), selector:"dialog:not([open])"}], DIV:[{role:"", allowed:["*"]}], DL:[{role:"list", allowed:["presentation"]}], EMBED:[{role:"", allowed:["application", "document", "img", "presentation"]}], FIGURE:[{role:"", allowed:["*"]}], FOOTER:[{role:"", allowed:["contentinfo", "presentation"]}], FORM:[{role:"form", allowed:["presentation"]}], P:[{role:"", allowed:["*"]}], PRE:[{role:"", allowed:["*"]}], 
+BLOCKQUOTE:[{role:"", allowed:["*"]}], H1:[{role:"heading"}], H2:[{role:"heading"}], H3:[{role:"heading"}], H4:[{role:"heading"}], H5:[{role:"heading"}], H6:[{role:"heading"}], HEAD:[{role:"", reserved:!0}], HEADER:[{role:"", allowed:["banner", "presentation"]}], HR:[{role:"separator", allowed:["presentation"]}], HTML:[{role:"", reserved:!0}], IFRAME:[{role:"", allowed:["application", "document", "img", "presentation"], selector:"iframe:not([seamless])"}, {role:"", allowed:["application", "document", 
+"img", "presentation", "group"], selector:"iframe[seamless]"}], IMG:[{role:"presentation", reserved:!0, selector:'img[alt=""]'}, {role:"img", allowed:["*"], selector:'img[alt]:not([alt=""])'}], INPUT:[{role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="button"]:not([aria-pressed])'}, {role:"button", allowed:["button"], selector:'input[type="button"][aria-pressed]'}, {role:"checkbox", allowed:["checkbox"], selector:'input[type="checkbox"]'}, 
+{role:"", selector:'input[type="color"]'}, {role:"", selector:'input[type="date"]'}, {role:"", selector:'input[type="datetime"]'}, {role:"textbox", selector:'input[type="email"]:not([list])'}, {role:"", selector:'input[type="file"]'}, {role:"", reserved:!0, selector:'input[type="hidden"]'}, {role:"button", allowed:["button"], selector:'input[type="image"][aria-pressed]'}, {role:"button", allowed:["link", "menuitem", "menuitemcheckbox", "menuitemradio", "radio"], selector:'input[type="image"]:not([aria-pressed])'}, 
+{role:"", selector:'input[type="month"]'}, {role:"", selector:'input[type="number"]'}, {role:"textbox", selector:'input[type="password"]'}, {role:"radio", allowed:["menuitemradio"], selector:'input[type="radio"]'}, {role:"slider", selector:'input[type="range"]'}, {role:"button", selector:'input[type="reset"]'}, {role:"combobox", selector:'input[type="search"][list]'}, {role:"textbox", selector:'input[type="search"]:not([list])'}, {role:"button", selector:'input[type="submit"]'}, {role:"combobox", 
+selector:'input[type="tel"][list]'}, {role:"textbox", selector:'input[type="tel"]:not([list])'}, {role:"combobox", selector:'input[type="text"][list]'}, {role:"", selector:'input[type="text"]:not([list])'}, {role:"", selector:'input[type="time"]'}, {role:"combobox", selector:'input[type="url"][list]'}, {role:"textbox", selector:'input[type="url"]:not([list])'}, {role:"", selector:'input[type="week"]'}], INS:[{role:"", allowed:["*"]}], KEYGEN:[{role:""}], LABEL:[{role:"", allowed:["presentation"]}], 
+LI:[{role:"listitem", allowed:"menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol:not([role="presentation"])>li, ul:not([role="presentation"])>li'}, {role:"listitem", allowed:"listitem menuitem menuitemcheckbox menuitemradio option tab treeitem presentation".split(" "), selector:'ol[role="presentation"]>li, ul[role="presentation"]>li'}], LINK:[{role:"link", reserved:!0, selector:"link[href]"}], MAIN:[{role:"", allowed:["main", "presentation"]}], MAP:[{role:"", 
+reserved:!0}], MATH:[{role:"", allowed:["presentation"]}], MENU:[{role:"toolbar", selector:'menu[type="toolbar"]'}], MENUITEM:[{role:"menuitem", selector:'menuitem[type="command"]'}, {role:"menuitemcheckbox", selector:'menuitem[type="checkbox"]'}, {role:"menuitemradio", selector:'menuitem[type="radio"]'}], META:[{role:"", reserved:!0}], METER:[{role:"progressbar", allowed:["presentation"]}], NAV:[{role:"navigation", allowed:["navigation", "presentation"]}], NOSCRIPT:[{role:"", reserved:!0}], OBJECT:[{role:"", 
+allowed:["application", "document", "img", "presentation"]}], OL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], OPTGROUP:[{role:"", allowed:["presentation"]}], OPTION:[{role:"option"}], OUTPUT:[{role:"status", allowed:["*"]}], PARAM:[{role:"", reserved:!0}], PICTURE:[{role:"", reserved:!0}], PROGRESS:[{role:"progressbar", allowed:["presentation"]}], SCRIPT:[{role:"", reserved:!0}], SECTION:[{role:"region", allowed:"alert alertdialog application contentinfo dialog document log marquee search status presentation".split(" ")}], 
+SELECT:[{role:"listbox"}], SOURCE:[{role:"", reserved:!0}], SPAN:[{role:"", allowed:["*"]}], STYLE:[{role:"", reserved:!0}], SVG:[{role:"", allowed:["application", "document", "img", "presentation"]}], SUMMARY:[{role:"", allowed:["presentation"]}], TABLE:[{role:"", allowed:["*"]}], TEMPLATE:[{role:"", reserved:!0}], TEXTAREA:[{role:"textbox"}], TBODY:[{role:"rowgroup", allowed:["*"]}], THEAD:[{role:"rowgroup", allowed:["*"]}], TFOOT:[{role:"rowgroup", allowed:["*"]}], TITLE:[{role:"", reserved:!0}], 
+TD:[{role:"", allowed:["*"]}], TH:[{role:"", allowed:["*"]}], TR:[{role:"", allowed:["*"]}], TRACK:[{role:"", reserved:!0}], UL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], VIDEO:[{role:"", allowed:["application", "presentation"]}]};
 axs.utils = {};
 axs.utils.FOCUSABLE_ELEMENTS_SELECTOR = "input:not([type=hidden]):not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href],iframe,[tabindex]";
 axs.utils.Color = function(a, b, c, d) {
@@ -522,10 +537,10 @@ axs.utils.calculateContrastRatio = function(a, b) {
   }
   1 > a.alpha && (a = axs.utils.flattenColors(a, b));
   var c = axs.utils.calculateLuminance(a), d = axs.utils.calculateLuminance(b);
-  return(Math.max(c, d) + .05) / (Math.min(c, d) + .05);
+  return (Math.max(c, d) + .05) / (Math.min(c, d) + .05);
 };
 axs.utils.luminanceRatio = function(a, b) {
-  return(Math.max(a, b) + .05) / (Math.min(a, b) + .05);
+  return (Math.max(a, b) + .05) / (Math.min(a, b) + .05);
 };
 axs.utils.parentElement = function(a) {
   if (!a) {
@@ -579,19 +594,19 @@ axs.utils.elementHasZeroArea = function(a) {
 axs.utils.elementIsOutsideScrollArea = function(a) {
   for (var b = axs.utils.parentElement(a), c = a.ownerDocument.defaultView;b != c.document.body;) {
     if (axs.utils.isClippedBy(a, b)) {
-      return!0;
+      return !0;
     }
     if (axs.utils.canScrollTo(a, b) && !axs.utils.elementIsOutsideScrollArea(b)) {
-      return!1;
+      return !1;
     }
     b = axs.utils.parentElement(b);
   }
-  return!axs.utils.canScrollTo(a, c.document.body);
+  return !axs.utils.canScrollTo(a, c.document.body);
 };
 axs.utils.canScrollTo = function(a, b) {
   var c = a.getBoundingClientRect(), d = b.getBoundingClientRect(), e = d.top, f = d.left, g = e - b.scrollTop, e = e - b.scrollTop + b.scrollHeight, h = f - b.scrollLeft + b.scrollWidth;
   if (c.right < f - b.scrollLeft || c.bottom < g || c.left > h || c.top > e) {
-    return!1;
+    return !1;
   }
   f = a.ownerDocument.defaultView;
   g = f.getComputedStyle(b);
@@ -599,7 +614,7 @@ axs.utils.canScrollTo = function(a, b) {
 };
 axs.utils.isClippedBy = function(a, b) {
   var c = a.getBoundingClientRect(), d = b.getBoundingClientRect(), e = d.top - b.scrollTop, f = d.left - b.scrollLeft, g = a.ownerDocument.defaultView.getComputedStyle(b);
-  return(c.right < d.left || c.bottom < d.top || c.left > d.right || c.top > d.bottom) && "hidden" == g.overflow ? !0 : c.right < f || c.bottom < e ? "visible" != g.overflow : !1;
+  return (c.right < d.left || c.bottom < d.top || c.left > d.right || c.top > d.bottom) && "hidden" == g.overflow ? !0 : c.right < f || c.bottom < e ? "visible" != g.overflow : !1;
 };
 axs.utils.isAncestor = function(a, b) {
   return null == b ? !1 : b === a ? !0 : axs.utils.isAncestor(a, b.parentNode);
@@ -648,10 +663,10 @@ axs.utils.isLargeFont = function(a) {
   }
   if (c = b.match(/(\d+)pt/)) {
     if (b = parseInt(c[1], 10), a && 14 <= b || 18 <= b) {
-      return!0;
+      return !0;
     }
   }
-  return!1;
+  return !1;
 };
 axs.utils.getBgColor = function(a, b) {
   var c = axs.utils.parseColor(a.backgroundColor);
@@ -700,10 +715,10 @@ axs.utils.parseColor = function(a) {
   var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
   if (b) {
     a = parseInt(b[1], 10);
-    var c = parseInt(b[2], 10), b = parseInt(b[3], 10), d;
-    return new axs.utils.Color(a, c, b, 1);
+    var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
+    return new axs.utils.Color(a, c, d, 1);
   }
-  return(b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d+(\.\d+)?)\)/)) ? (d = parseInt(b[4], 10), a = parseInt(b[1], 10), c = parseInt(b[2], 10), b = parseInt(b[3], 10), new axs.utils.Color(a, c, b, d)) : null;
+  return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.utils.Color(a, c, d, b)) : null;
 };
 axs.utils.colorChannelToString = function(a) {
   a = Math.round(a);
@@ -723,17 +738,15 @@ axs.utils.suggestColors = function(a, b, c, d) {
   if (!axs.utils.isLowContrast(c, d, !0)) {
     return null;
   }
-  var e = {}, f = axs.utils.calculateLuminance(a), g = axs.utils.calculateLuminance(b), h = axs.utils.isLargeFont(d) ? 3 : 4.5, k = axs.utils.isLargeFont(d) ? 4.5 : 7, m = g > f, l = axs.utils.luminanceFromContrastRatio(f, h + .02, m), n = axs.utils.luminanceFromContrastRatio(f, k + .02, m), q = axs.utils.toYCC(b);
+  var e = {}, f = axs.utils.calculateLuminance(a), g = axs.utils.calculateLuminance(b), h = axs.utils.isLargeFont(d) ? 3 : 4.5, k = axs.utils.isLargeFont(d) ? 4.5 : 7, m = g > f, l = axs.utils.luminanceFromContrastRatio(f, h + .02, m), n = axs.utils.luminanceFromContrastRatio(f, k + .02, m), p = axs.utils.toYCC(b);
   if (axs.utils.isLowContrast(c, d, !1) && 1 >= l && 0 <= l) {
-    var p = axs.utils.translateColor(q, l), l = axs.utils.calculateContrastRatio(p, a);
-    axs.utils.calculateLuminance(p);
-    f = {};
-    f.fg = axs.utils.colorToString(p);
+    var q = axs.utils.translateColor(p, l), l = axs.utils.calculateContrastRatio(q, a), f = {};
+    f.fg = axs.utils.colorToString(q);
     f.bg = axs.utils.colorToString(a);
     f.contrast = l.toFixed(2);
     e.AA = f;
   }
-  axs.utils.isLowContrast(c, d, !0) && 1 >= n && 0 <= n && (n = axs.utils.translateColor(q, n), l = axs.utils.calculateContrastRatio(n, a), f = {}, f.fg = axs.utils.colorToString(n), f.bg = axs.utils.colorToString(a), f.contrast = l.toFixed(2), e.AAA = f);
+  axs.utils.isLowContrast(c, d, !0) && 1 >= n && 0 <= n && (n = axs.utils.translateColor(p, n), l = axs.utils.calculateContrastRatio(n, a), f = {}, f.fg = axs.utils.colorToString(n), f.bg = axs.utils.colorToString(a), f.contrast = l.toFixed(2), e.AAA = f);
   h = axs.utils.luminanceFromContrastRatio(g, h + .02, !m);
   g = axs.utils.luminanceFromContrastRatio(g, k + .02, !m);
   a = axs.utils.toYCC(a);
@@ -749,7 +762,7 @@ axs.utils.calculateLuminance = function(a) {
   return axs.utils.toYCC(a)[0];
 };
 axs.utils.RGBToYCCMatrix = function(a, b) {
-  return[[a, 1 - a - b, b], [-a / (2 - 2 * b), (a + b - 1) / (2 - 2 * b), (1 - b) / (2 - 2 * b)], [(1 - a) / (2 - 2 * a), (a + b - 1) / (2 - 2 * a), -b / (2 - 2 * a)]];
+  return [[a, 1 - a - b, b], [-a / (2 - 2 * b), (a + b - 1) / (2 - 2 * b), (1 - b) / (2 - 2 * b)], [(1 - a) / (2 - 2 * a), (a + b - 1) / (2 - 2 * a), -b / (2 - 2 * a)]];
 };
 axs.utils.invert3x3Matrix = function(a) {
   var b = a[0][0], c = a[0][1], d = a[0][2], e = a[1][0], f = a[1][1], g = a[1][2], h = a[2][0], k = a[2][1];
@@ -770,7 +783,7 @@ axs.utils.YCC_MATRIX = axs.utils.RGBToYCCMatrix(axs.utils.kR, axs.utils.kB);
 axs.utils.INVERTED_YCC_MATRIX = axs.utils.invert3x3Matrix(axs.utils.YCC_MATRIX);
 axs.utils.convertColor = function(a, b) {
   var c = b[0], d = b[1], e = b[2];
-  return[a[0][0] * c + a[0][1] * d + a[0][2] * e, a[1][0] * c + a[1][1] * d + a[1][2] * e, a[2][0] * c + a[2][1] * d + a[2][2] * e];
+  return [a[0][0] * c + a[0][1] * d + a[0][2] * e, a[1][0] * c + a[1][1] * d + a[1][2] * e, a[2][0] * c + a[2][1] * d + a[2][2] * e];
 };
 axs.utils.multiplyMatrices = function(a, b) {
   for (var c = [[], [], []], d = 0;3 > d;d++) {
@@ -835,10 +848,10 @@ axs.utils.isNativeTextElement = function(a) {
   var b = a.tagName.toLowerCase();
   a = a.type ? a.type.toLowerCase() : "";
   if ("textarea" == b) {
-    return!0;
+    return !0;
   }
   if ("input" != b) {
-    return!1;
+    return !1;
   }
   switch(a) {
     case "email":
@@ -856,9 +869,9 @@ axs.utils.isNativeTextElement = function(a) {
     case "url":
     ;
     case "":
-      return!0;
+      return !0;
     default:
-      return!1;
+      return !1;
   }
 };
 axs.utils.isLowContrast = function(a, b, c) {
@@ -867,20 +880,20 @@ axs.utils.isLowContrast = function(a, b, c) {
 };
 axs.utils.hasLabel = function(a) {
   var b = a.tagName.toLowerCase(), c = a.type ? a.type.toLowerCase() : "";
-  if (a.hasAttribute("aria-label") || a.hasAttribute("title") || "img" == b && a.hasAttribute("alt") || "input" == b && "image" == c && a.hasAttribute("alt") || "input" == b && ("submit" == c || "reset" == c) || a.hasAttribute("aria-labelledby") || axs.utils.isNativeTextElement(a) && a.hasAttribute("placeholder") || a.hasAttribute("id") && 0 < document.querySelectorAll('label[for="' + a.id + '"]').length) {
-    return!0;
+  if (a.hasAttribute("aria-label") || a.hasAttribute("title") || "img" == b && a.hasAttribute("alt") || "input" == b && "image" == c && a.hasAttribute("alt") || "input" == b && ("submit" == c || "reset" == c) || a.hasAttribute("aria-labelledby") || a.hasAttribute("id") && 0 < document.querySelectorAll('label[for="' + a.id + '"]').length) {
+    return !0;
   }
   for (b = axs.utils.parentElement(a);b;) {
     if ("label" == b.tagName.toLowerCase() && b.control == a) {
-      return!0;
+      return !0;
     }
     b = axs.utils.parentElement(b);
   }
-  return!1;
+  return !1;
 };
 axs.utils.isElementHidden = function(a) {
   if (!(a instanceof a.ownerDocument.defaultView.HTMLElement)) {
-    return!1;
+    return !1;
   }
   if (a.hasAttribute("chromevoxignoreariahidden")) {
     var b = !0
@@ -895,16 +908,21 @@ axs.utils.isInlineElement = function(a) {
   a = a.tagName.toUpperCase();
   return axs.constants.InlineElements[a];
 };
-axs.utils.getRoles = function(a) {
-  if (!a.hasAttribute("role")) {
-    return!1;
+axs.utils.getRoles = function(a, b) {
+  if (!a || a.nodeType !== Node.ELEMENT_NODE || !a.hasAttribute("role") && !b) {
+    return null;
   }
-  a = a.getAttribute("role").split(" ");
-  for (var b = [], c = !0, d = 0;d < a.length;d++) {
-    var e = a[d];
-    axs.constants.ARIA_ROLES[e] ? b.push({name:e, details:axs.constants.ARIA_ROLES[e], valid:!0}) : (b.push({name:e, valid:!1}), c = !1);
+  var c = a.getAttribute("role");
+  !c && b && (c = axs.properties.getImplicitRole(a));
+  if (!c) {
+    return null;
   }
-  return{roles:b, valid:c};
+  for (var c = c.split(" "), d = [], e = !0, f = 0;f < c.length;f++) {
+    var g = c[f], h = axs.constants.ARIA_ROLES[g];
+    h && !h.abstract ? g = {name:g, details:axs.constants.ARIA_ROLES[g], valid:!0} : (g = {name:g, valid:!1}, e = !1);
+    d.push(g);
+  }
+  return {roles:d, valid:e};
 };
 axs.utils.getAriaPropertyValue = function(a, b, c) {
   var d = a.replace(/^aria-/, ""), e = axs.constants.ARIA_PROPERTIES[d], d = {name:a, rawValue:b};
@@ -978,7 +996,7 @@ axs.utils.isValidNumber = function(a) {
   try {
     var b = JSON.parse(a);
   } catch (c) {
-    return{valid:!1, value:a, reason:'"' + a + '" is not a number'};
+    return {valid:!1, value:a, reason:'"' + a + '" is not a number'};
   }
   return "number" != typeof b ? {valid:!1, value:a, reason:'"' + a + '" is not a number'} : {valid:!0, value:b};
 };
@@ -1027,7 +1045,9 @@ axs.utils.getQuerySelectorText = function(a) {
       } else {
         d = 1;
       }
-      return 1 == d ? axs.utils.getQuerySelectorText(a.parentNode) + " > " + b : axs.utils.getQuerySelectorText(a.parentNode) + " > " + b + ":nth-of-type(" + d + ")";
+      if (1 == d) {
+        return axs.utils.getQuerySelectorText(a.parentNode) + " > " + b;
+      }
     }
     if (a.parentNode) {
       b = a.parentNode.children;
@@ -1046,6 +1066,60 @@ axs.utils.getQuerySelectorText = function(a) {
   }
   return "";
 };
+axs.utils.getIdReferrers = function(a, b) {
+  if (!b) {
+    return null;
+  }
+  var c = b.id, d = a.replace(/^aria-/, ""), d = axs.constants.ARIA_PROPERTIES[d];
+  if (!c || !d) {
+    return null;
+  }
+  d = d.valueType;
+  return "idref_list" === d || "idref" === d ? (c = c.replace(/'/g, "\\'"), b.ownerDocument.querySelectorAll("[" + a + "~='" + c + "']")) : null;
+};
+axs.utils.getIdReferents = function(a, b) {
+  var c = [], d = a.replace(/^aria-/, ""), d = axs.constants.ARIA_PROPERTIES[d];
+  if (!d || !b.hasAttribute(a)) {
+    return c;
+  }
+  d = d.valueType;
+  if ("idref_list" === d || "idref" === d) {
+    for (var d = b.ownerDocument, e = b.getAttribute(a), e = e.split(/\s+/), f = 0, g = e.length;f < g;f++) {
+      var h = d.getElementById(e[f]);
+      h && (c[c.length] = h);
+    }
+  }
+  return c;
+};
+axs.utils.getAriaPropertiesByValueType = function(a) {
+  var b = {}, c;
+  for (c in axs.constants.ARIA_PROPERTIES) {
+    var d = axs.constants.ARIA_PROPERTIES[c];
+    d && 0 <= a.indexOf(d.valueType) && (b[c] = d);
+  }
+  return b;
+};
+axs.utils.getSelectorForAriaProperties = function(a) {
+  a = Object.keys(a).map(function(a) {
+    return "[aria-" + a + "]";
+  });
+  a.sort();
+  return a.join(",");
+};
+axs.utils.findDescendantsWithRole = function(a, b) {
+  if (!a || !b) {
+    return [];
+  }
+  var c = axs.properties.getSelectorForRole(b);
+  if (c && (c = a.querySelectorAll(c))) {
+    c = Array.prototype.map.call(c, function(a) {
+      return a;
+    });
+  } else {
+    return [];
+  }
+  return c;
+};
 axs.properties = {};
 axs.properties.TEXT_CONTENT_XPATH = './/text()[normalize-space(.)!=""]/parent::*[name()!="script"]';
 axs.properties.getFocusProperties = function(a) {
@@ -1086,13 +1160,26 @@ axs.properties.getColorProperties = function(a) {
   return 0 == Object.keys(b).length ? null : b;
 };
 axs.properties.hasDirectTextDescendant = function(a) {
-  for (var b = (a.nodeType == Node.DOCUMENT_NODE ? a : a.ownerDocument).evaluate(axs.properties.TEXT_CONTENT_XPATH, a, null, XPathResult.ANY_TYPE, null), c = !1, d = b.iterateNext();null != d;d = b.iterateNext()) {
-    if (d === a) {
-      c = !0;
-      break;
+  function b() {
+    for (var b = d.evaluate(axs.properties.TEXT_CONTENT_XPATH, a, null, XPathResult.ANY_TYPE, null), c = b.iterateNext();null != c;c = b.iterateNext()) {
+      if (c === a) {
+        return !0;
+      }
     }
+    return !1;
   }
-  return c;
+  function c() {
+    for (var b = d.createTreeWalker(a, NodeFilter.SHOW_TEXT, null, !1);b.nextNode();) {
+      var c = b.currentNode, g = c.parentNode.tagName.toLowerCase();
+      if (c.nodeValue.trim() && "script" !== g && a !== c) {
+        return !0;
+      }
+    }
+    return !1;
+  }
+  var d;
+  d = a.nodeType == Node.DOCUMENT_NODE ? a : a.ownerDocument;
+  return d.evaluate ? b() : c();
 };
 axs.properties.getContrastRatioProperties = function(a) {
   if (!axs.properties.hasDirectTextDescendant(a)) {
@@ -1330,7 +1417,7 @@ axs.properties.getTrackElements = function(a, b) {
 axs.properties.getAllProperties = function(a) {
   var b = axs.utils.asElement(a);
   if (!b) {
-    return{};
+    return {};
   }
   var c = {};
   c.ariaProperties = axs.properties.getAriaProperties(b);
@@ -1340,6 +1427,80 @@ axs.properties.getAllProperties = function(a) {
   c.videoProperties = axs.properties.getVideoProperties(b);
   return c;
 };
+(function() {
+  function a(a) {
+    if (!a) {
+      return null;
+    }
+    var c = a.tagName;
+    if (!c) {
+      return null;
+    }
+    c = c.toUpperCase();
+    c = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[c];
+    if (!c || !c.length) {
+      return null;
+    }
+    for (var d = null, e = 0, f = c.length;e < f;e++) {
+      var g = c[e];
+      if (g.selector) {
+        if (axs.browserUtils.matchSelector(a, g.selector)) {
+          return g;
+        }
+      } else {
+        d = g;
+      }
+    }
+    return d;
+  }
+  axs.properties.getImplicitRole = function(b) {
+    return (b = a(b)) ? b.role : "";
+  };
+  axs.properties.canTakeAriaAttributes = function(b) {
+    return (b = a(b)) ? !b.reserved : !0;
+  };
+})();
+axs.properties.getNativelySupportedAttributes = function(a) {
+  var b = [];
+  if (!a) {
+    return b;
+  }
+  a = a.cloneNode(!1);
+  for (var c = Object.keys(axs.constants.ARIA_TO_HTML_ATTRIBUTE), d = 0;d < c.length;d++) {
+    var e = c[d];
+    axs.constants.ARIA_TO_HTML_ATTRIBUTE[e] in a && (b[b.length] = e);
+  }
+  return b;
+};
+(function() {
+  var a = {};
+  axs.properties.getSelectorForRole = function(b) {
+    if (!b) {
+      return "";
+    }
+    if (a[b] && a.hasOwnProperty(b)) {
+      return a[b];
+    }
+    var c = ['[role="' + b + '"]'];
+    Object.keys(axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO).forEach(function(a) {
+      var e = axs.constants.TAG_TO_IMPLICIT_SEMANTIC_INFO[a];
+      if (e && e.length) {
+        for (var f = 0;f < e.length;f++) {
+          var g = e[f];
+          if (g.role === b) {
+            if (g.selector) {
+              c[c.length] = g.selector;
+            } else {
+              c[c.length] = a;
+              break;
+            }
+          }
+        }
+      }
+    });
+    return a[b] = c.join(",");
+  };
+})();
 axs.AuditRule = function(a) {
   for (var b = !0, c = [], d = 0;d < axs.AuditRule.requiredFields.length;d++) {
     var e = axs.AuditRule.requiredFields[d];
@@ -1375,17 +1536,23 @@ axs.AuditRule.collectMatchingElements = function(a, b, c, d) {
     }
   }
   if (e && "content" == e.localName) {
-    for (e = e.getDistributedNodes(), a = 0;a < e.length;a++) {
-      axs.AuditRule.collectMatchingElements(e[a], b, c, d);
+    for (var f = e.getDistributedNodes(), g = 0;g < f.length;g++) {
+      axs.AuditRule.collectMatchingElements(f[g], b, c, d);
     }
   } else {
     if (e && "shadow" == e.localName) {
-      a = e, d ? (d = d.olderShadowRoot || a.olderShadowRoot) && axs.AuditRule.collectMatchingElements(d, b, c, d) : console.warn("ShadowRoot not provided for", e);
-    } else {
-      for (e = a.firstChild;null != e;) {
-        axs.AuditRule.collectMatchingElements(e, b, c, d), e = e.nextSibling;
+      if (f = e, d) {
+        for (f = f.getDistributedNodes(), g = 0;g < f.length;g++) {
+          axs.AuditRule.collectMatchingElements(f[g], b, c, d);
+        }
+      } else {
+        console.warn("ShadowRoot not provided for", e);
       }
     }
+    e && "iframe" == e.localName && axs.AuditRule.collectMatchingElements(a.contentDocument, b, c, !1);
+    for (a = a.firstChild;null != a;) {
+      axs.AuditRule.collectMatchingElements(a, b, c, d), a = a.nextSibling;
+    }
   }
 };
 axs.AuditRule.prototype.run = function(a) {
@@ -1394,38 +1561,49 @@ axs.AuditRule.prototype.run = function(a) {
   axs.AuditRule.collectMatchingElements("scope" in a ? a.scope : document, this.relevantElementMatcher_, d);
   var e = [];
   if (!d.length) {
-    return{result:axs.constants.AuditResult.NA};
+    return {result:axs.constants.AuditResult.NA};
   }
-  for (a = 0;a < d.length && !(null != c && e.length >= c);a++) {
-    var f = d[a], g;
+  for (var f = 0;f < d.length && !(null != c && e.length >= c);f++) {
+    var g = d[f], h;
     a: {
-      g = f;
-      for (var h = 0;h < b.length;h++) {
-        if (axs.browserUtils.matchSelector(g, b[h])) {
-          g = !0;
+      h = g;
+      for (var k = 0;k < b.length;k++) {
+        if (axs.browserUtils.matchSelector(h, b[k])) {
+          h = !0;
           break a;
         }
       }
-      g = !1;
+      h = !1;
     }
-    !g && this.test_(f) && this.addElement(e, f);
+    !h && this.test_(g, a.config) && this.addElement(e, g);
   }
-  b = {result:e.length ? axs.constants.AuditResult.FAIL : axs.constants.AuditResult.PASS, elements:e};
-  a < d.length && (b.resultsTruncated = !0);
-  return b;
+  a = {result:e.length ? axs.constants.AuditResult.FAIL : axs.constants.AuditResult.PASS, elements:e};
+  f < d.length && (a.resultsTruncated = !0);
+  return a;
 };
-axs.AuditRule.specs = {};
 axs.AuditRules = {};
-axs.AuditRules.getRule = function(a) {
-  if (!axs.AuditRules.rules) {
-    axs.AuditRules.rules = {};
-    for (var b in axs.AuditRule.specs) {
-      var c = axs.AuditRule.specs[b], d = new axs.AuditRule(c);
-      axs.AuditRules.rules[c.name] = d;
+(function() {
+  var a = {}, b = {};
+  axs.AuditRules.addRule = function(c) {
+    c = new axs.AuditRule(c);
+    if (c.code in b) {
+      throw Error('Can not add audit rule with same code: "' + c.code + '"');
     }
-  }
-  return axs.AuditRules.rules[a];
-};
+    if (c.name in a) {
+      throw Error('Can not add audit rule with same name: "' + c.name + '"');
+    }
+    a[c.name] = b[c.code] = c;
+  };
+  axs.AuditRules.getRule = function(c) {
+    return a[c] || b[c] || null;
+  };
+  axs.AuditRules.getRules = function(b) {
+    var d = Object.keys(a);
+    return b ? d : d.map(function(a) {
+      return this.getRule(a);
+    }, axs.AuditRules);
+  };
+})();
 axs.AuditResults = function() {
   this.errors_ = [];
   this.warnings_ = [];
@@ -1490,21 +1668,26 @@ axs.AuditConfiguration.prototype = {ignoreSelectors:function(a, b) {
   this.rules_[a].severity = b;
 }, getSeverity:function(a) {
   return a in this.rules_ && "severity" in this.rules_[a] ? this.rules_[a].severity : null;
+}, setRuleConfig:function(a, b) {
+  a in this.rules_ || (this.rules_[a] = {});
+  this.rules_[a].config = b;
+}, getRuleConfig:function(a) {
+  return a in this.rules_ && "config" in this.rules_[a] ? this.rules_[a].config : null;
 }};
 goog.exportProperty(axs.AuditConfiguration.prototype, "ignoreSelectors", axs.AuditConfiguration.prototype.ignoreSelectors);
 goog.exportProperty(axs.AuditConfiguration.prototype, "getIgnoreSelectors", axs.AuditConfiguration.prototype.getIgnoreSelectors);
 axs.Audit.unsupportedRulesWarningShown = !1;
 axs.Audit.getRulesCannotRun = function(a) {
-  return a.withConsoleApi ? [] : Object.keys(axs.AuditRule.specs).filter(function(a) {
-    return axs.AuditRules.getRule(a).requiresConsoleAPI;
+  return a.withConsoleApi ? [] : axs.AuditRules.getRules().filter(function(a) {
+    return a.requiresConsoleAPI;
   }).map(function(a) {
-    return axs.AuditRules.getRule(a).code;
+    return a.code;
   });
 };
 axs.Audit.run = function(a) {
   a = a || new axs.AuditConfiguration;
   var b = a.withConsoleApi, c = [], d;
-  d = a.auditRulesToRun && 0 < a.auditRulesToRun.length ? a.auditRulesToRun : Object.keys(axs.AuditRule.specs);
+  d = a.auditRulesToRun && 0 < a.auditRulesToRun.length ? a.auditRulesToRun : axs.AuditRules.getRules(!0);
   if (a.auditRulesToIgnore) {
     for (var e = 0;e < a.auditRulesToIgnore.length;e++) {
       var f = a.auditRulesToIgnore[e];
@@ -1519,6 +1702,8 @@ axs.Audit.run = function(a) {
       if (0 < k.length || a.scope) {
         h.ignoreSelectors = k;
       }
+      k = a.getRuleConfig(g.name);
+      null != k && (h.config = k);
       a.scope && (h.scope = a.scope);
       a.maxResults && (h.maxResults = a.maxResults);
       h = g.run.call(g, h);
@@ -1559,17 +1744,76 @@ axs.Audit.accessibilityErrorMessage = function(a) {
   return b;
 };
 goog.exportSymbol("axs.Audit.accessibilityErrorMessage", axs.Audit.accessibilityErrorMessage);
-axs.AuditRule.specs.audioWithoutControls = {name:"audioWithoutControls", heading:"Audio elements should have controls", url:"", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "audio[autoplay]");
+axs.AuditRules.addRule({name:"ariaOnReservedElement", heading:"This element does not support ARIA roles, states and properties", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_12", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return !axs.properties.canTakeAriaAttributes(a);
 }, test:function(a) {
-  return!a.querySelectorAll("[controls]").length && 3 < a.duration;
-}, code:"AX_AUDIO_01"};
-axs.AuditRule.specs.badAriaAttributeValue = {name:"badAriaAttributeValue", heading:"ARIA state and property values must be valid", url:"", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  var b = "", c;
-  for (c in axs.constants.ARIA_PROPERTIES) {
-    b += "[aria-" + c + "],";
+  return null !== axs.properties.getAriaProperties(a);
+}, code:"AX_ARIA_12"});
+axs.AuditRules.addRule({name:"ariaOwnsDescendant", heading:"aria-owns should not be used if ownership is implicit in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_06", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[aria-owns]");
+}, test:function(a) {
+  return axs.utils.getIdReferents("aria-owns", a).some(function(b) {
+    return a.compareDocumentPosition(b) & Node.DOCUMENT_POSITION_CONTAINED_BY;
+  });
+}, code:"AX_ARIA_06"});
+axs.AuditRules.addRule({name:"ariaRoleNotScoped", heading:"Elements with ARIA roles must be in the correct scope", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_09", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[role]");
+}, test:function(a) {
+  var b = axs.utils.getRoles(a);
+  if (!b || !b.roles.length) {
+    return !1;
+  }
+  b = b.roles[0];
+  if (!b || !b.valid) {
+    return !1;
+  }
+  b = b.details.scope;
+  if (!b || 0 === b.length) {
+    return !1;
+  }
+  for (var c = a;c = c.parentNode;) {
+    var d = axs.utils.getRoles(c, !0);
+    if (d && d.roles.length && (d = d.roles[0], 0 <= b.indexOf(d.name))) {
+      return !1;
+    }
   }
-  b = b.substring(0, b.length - 1);
+  if (a = axs.utils.getIdReferrers("aria-owns", a)) {
+    for (c = 0;c < a.length;c++) {
+      if ((d = axs.utils.getRoles(a[c], !0)) && d.roles.length && (d = d.roles[0]), d && 0 <= b.indexOf(d.name)) {
+        return !1;
+      }
+    }
+  }
+  return !0;
+}, code:"AX_ARIA_09"});
+axs.AuditRules.addRule({name:"audioWithoutControls", heading:"Audio elements should have controls", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_audio_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "audio[autoplay]");
+}, test:function(a) {
+  return !a.querySelectorAll("[controls]").length && 3 < a.duration;
+}, code:"AX_AUDIO_01"});
+(function() {
+  var a = /^aria\-/;
+  axs.AuditRules.addRule({name:"badAriaAttribute", heading:"This element has an invalid ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_11", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(b) {
+    b = b.attributes;
+    for (var c = 0, d = b.length;c < d;c++) {
+      if (a.test(b[c].name)) {
+        return !0;
+      }
+    }
+    return !1;
+  }, test:function(b) {
+    b = b.attributes;
+    for (var c = 0, d = b.length;c < d;c++) {
+      var e = b[c].name;
+      if (a.test(e) && (e = e.replace(a, ""), !axs.constants.ARIA_PROPERTIES.hasOwnProperty(e))) {
+        return !0;
+      }
+    }
+    return !1;
+  }, code:"AX_ARIA_11"});
+})();
+axs.AuditRules.addRule({name:"badAriaAttributeValue", heading:"ARIA state and property values must be valid", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_04", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  var b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
   return axs.browserUtils.matchSelector(a, b);
 }, test:function(a) {
   for (var b in axs.constants.ARIA_PROPERTIES) {
@@ -1577,135 +1821,235 @@ axs.AuditRule.specs.badAriaAttributeValue = {name:"badAriaAttributeValue", headi
     if (a.hasAttribute(c)) {
       var d = a.getAttribute(c);
       if (!axs.utils.getAriaPropertyValue(c, d, a).valid) {
-        return!0;
+        return !0;
       }
     }
   }
-  return!1;
-}, code:"AX_ARIA_04"};
-axs.AuditRule.specs.badAriaRole = {name:"badAriaRole", heading:"Elements with ARIA roles must use a valid, non-abstract ARIA role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_aria_01--elements-with-aria-roles-must-use-a-valid-non-abstract-aria-role", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return !1;
+}, code:"AX_ARIA_04"});
+axs.AuditRules.addRule({name:"badAriaRole", heading:"Elements with ARIA roles must use a valid, non-abstract ARIA role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
   return axs.browserUtils.matchSelector(a, "[role]");
 }, test:function(a) {
-  return!axs.utils.getRoles(a).valid;
-}, code:"AX_ARIA_01"};
-axs.AuditRule.specs.controlsWithoutLabel = {name:"controlsWithoutLabel", heading:"Controls and media elements should have labels", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_text_01--controls-and-media-elements-should-have-labels", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
-  if (!axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])')) {
-    return!1;
+  return !axs.utils.getRoles(a).valid;
+}, code:"AX_ARIA_01"});
+axs.AuditRules.addRule({name:"controlsWithoutLabel", heading:"Controls and media elements should have labels", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_01", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  if (!axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') || "presentation" == a.getAttribute("role")) {
+    return !1;
   }
   if (0 <= a.tabIndex) {
-    return!0;
+    return !0;
   }
   for (a = axs.utils.parentElement(a);null != a;a = axs.utils.parentElement(a)) {
     if (axs.utils.elementIsAriaWidget(a)) {
-      return!1;
+      return !1;
     }
   }
-  return!0;
+  return !0;
 }, test:function(a) {
   return axs.utils.isElementOrAncestorHidden(a) || "input" == a.tagName.toLowerCase() && "button" == a.type && a.value.length || "button" == a.tagName.toLowerCase() && a.textContent.replace(/^\s+|\s+$/g, "").length ? !1 : axs.utils.hasLabel(a) ? !1 : !0;
-}, code:"AX_TEXT_01", ruleName:"Controls and media elements should have labels"};
-axs.AuditRule.specs.focusableElementNotVisibleAndNotAriaHidden = {name:"focusableElementNotVisibleAndNotAriaHidden", heading:"These elements are focusable but either invisible or obscured by another element", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_focus_01--these-elements-are-focusable-but-either-invisible-or-obscured-by-another-element", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+}, code:"AX_TEXT_01", ruleName:"Controls and media elements should have labels"});
+axs.AuditRules.addRule({name:"duplicateId", heading:"An element's ID must be unique in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_02", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[id]");
+}, test:function(a) {
+  var b = a.id;
+  if (!b) {
+    return !1;
+  }
+  b = "[id='" + b.replace(/'/g, "\\'") + "']";
+  return 1 < a.ownerDocument.querySelectorAll(b).length;
+}, code:"AX_HTML_02"});
+axs.AuditRules.addRule({name:"focusableElementNotVisibleAndNotAriaHidden", heading:"These elements are focusable but either invisible or obscured by another element", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   if (!axs.browserUtils.matchSelector(a, axs.utils.FOCUSABLE_ELEMENTS_SELECTOR)) {
-    return!1;
+    return !1;
   }
   if (0 <= a.tabIndex) {
-    return!0;
+    return !0;
   }
-  for (a = axs.utils.parentElement(a);null != a;a = axs.utils.parentElement(a)) {
-    if (axs.utils.elementIsAriaWidget(a)) {
-      return!1;
+  for (var b = axs.utils.parentElement(a);null != b;b = axs.utils.parentElement(b)) {
+    if (axs.utils.elementIsAriaWidget(b)) {
+      return !1;
     }
   }
-  return!0;
+  return "" === axs.properties.findTextAlternatives(a, {}).trim() ? !1 : !0;
 }, test:function(a) {
   if (axs.utils.isElementOrAncestorHidden(a)) {
-    return!1;
+    return !1;
   }
   a.focus();
-  return!axs.utils.elementIsVisible(a);
-}, code:"AX_FOCUS_01"};
-axs.AuditRule.specs.imagesWithoutAltText = {name:"imagesWithoutAltText", heading:"Images should have an alt attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_text_02--images-should-have-an-alt-attribute-unless-they-have-an-aria-role-of-presentation", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return !axs.utils.elementIsVisible(a);
+}, code:"AX_FOCUS_01"});
+axs.AuditRules.addRule({name:"humanLangMissing", heading:"The web page should have the content's human language indicated in the markup", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_html_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return a instanceof a.ownerDocument.defaultView.HTMLHtmlElement;
+}, test:function(a) {
+  return a.lang ? !1 : !0;
+}, code:"AX_HTML_01"});
+axs.AuditRules.addRule({name:"imagesWithoutAltText", heading:"Images should have an alt attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_02", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   return axs.browserUtils.matchSelector(a, "img") && !axs.utils.isElementOrAncestorHidden(a);
 }, test:function(a) {
-  return!a.hasAttribute("alt") && "presentation" != a.getAttribute("role");
-}, code:"AX_TEXT_02"};
-axs.AuditRule.specs.linkWithUnclearPurpose = {name:"linkWithUnclearPurpose", heading:"The purpose of each link should be clear from the link text", url:"", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return !a.hasAttribute("alt") && "presentation" != a.getAttribute("role");
+}, code:"AX_TEXT_02"});
+axs.AuditRules.addRule({name:"linkWithUnclearPurpose", heading:"The purpose of each link should be clear from the link text", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_text_04", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   return axs.browserUtils.matchSelector(a, "a");
-}, test:function(a) {
-  return/^\s*click\s*here\s*[^a-z]?$/i.test(a.textContent);
-}, code:"AX_TITLE_01"};
-axs.AuditRule.specs.lowContrastElements = {name:"lowContrastElements", heading:"Text elements should have a reasonable contrast ratio", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_color_01--text-elements-should-have-a-reasonable-contrast-ratio", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+}, test:function(a, b) {
+  for (var c = b || {}, d = c.blacklistPhrases || [], e = /\s+/, f = 0;f < d.length;f++) {
+    var g = "^\\s*" + d[f].trim().replace(e, "\\s*") + "s*[^a-z]$";
+    if ((new RegExp(g, "i")).test(a.textContent)) {
+      return !0;
+    }
+  }
+  c = c.stopwords || "click tap go here learn more this page link about".split(" ");
+  d = a.textContent;
+  d = d.replace(/[^a-zA-Z ]/g, "");
+  for (f = 0;f < c.length;f++) {
+    if (d = d.replace(new RegExp("\\b" + c[f] + "\\b", "ig"), ""), "" == d.trim()) {
+      return !0;
+    }
+  }
+  return !1;
+}, code:"AX_TEXT_04"});
+axs.AuditRules.addRule({name:"lowContrastElements", heading:"Text elements should have a reasonable contrast ratio", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_color_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   return axs.properties.hasDirectTextDescendant(a);
 }, test:function(a) {
   var b = window.getComputedStyle(a, null);
-  return(a = axs.utils.getContrastRatioForElementWithComputedStyle(b, a)) && axs.utils.isLowContrast(a, b);
-}, code:"AX_COLOR_01"};
-axs.AuditRule.specs.mainRoleOnInappropriateElement = {name:"mainRoleOnInappropriateElement", heading:"role=main should only appear on significant elements", url:"", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return (a = axs.utils.getContrastRatioForElementWithComputedStyle(b, a)) && axs.utils.isLowContrast(a, b);
+}, code:"AX_COLOR_01"});
+axs.AuditRules.addRule({name:"mainRoleOnInappropriateElement", heading:"role=main should only appear on significant elements", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_05", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   return axs.browserUtils.matchSelector(a, "[role~=main]");
 }, test:function(a) {
   if (axs.utils.isInlineElement(a)) {
-    return!0;
+    return !0;
   }
   a = axs.properties.getTextFromDescendantContent(a);
-  return!a || 50 > a.length ? !0 : !1;
-}, code:"AX_ARIA_04"};
-axs.AuditRule.specs.elementsWithMeaningfulBackgroundImage = {name:"elementsWithMeaningfulBackgroundImage", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return!axs.utils.isElementOrAncestorHidden(a);
-}, heading:"Meaningful images should not be used in element backgrounds", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_image_01--meaningful-images-should-not-be-used-in-element-backgrounds", test:function(a) {
+  return !a || 50 > a.length ? !0 : !1;
+}, code:"AX_ARIA_05"});
+axs.AuditRules.addRule({name:"elementsWithMeaningfulBackgroundImage", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return !axs.utils.isElementOrAncestorHidden(a);
+}, heading:"Meaningful images should not be used in element backgrounds", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_image_01", test:function(a) {
   if (a.textContent && 0 < a.textContent.length) {
-    return!1;
+    return !1;
   }
   a = window.getComputedStyle(a, null);
   var b = a.backgroundImage;
   if (!b || "undefined" === b || "none" === b || 0 != b.indexOf("url")) {
-    return!1;
+    return !1;
   }
   b = parseInt(a.width, 10);
   a = parseInt(a.height, 10);
   return 150 > b && 150 > a;
-}, code:"AX_IMAGE_01"};
-axs.AuditRule.specs.nonExistentAriaLabelledbyElement = {name:"nonExistentAriaLabelledbyElement", heading:"aria-labelledby attributes should refer to an element which exists in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_aria_02--aria-labelledby-attributes-should-refer-to-an-element-which-exists-in-the-dom", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
-  return axs.browserUtils.matchSelector(a, "[aria-labelledby]");
+}, code:"AX_IMAGE_01"});
+axs.AuditRules.addRule({name:"multipleAriaOwners", heading:"An element's ID must not be present in more that one aria-owns attribute at any time", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_07", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[aria-owns]");
+}, test:function(a) {
+  return axs.utils.getIdReferents("aria-owns", a).some(function(a) {
+    return 1 < axs.utils.getIdReferrers("aria-owns", a).length;
+  });
+}, code:"AX_ARIA_07"});
+axs.AuditRules.addRule({name:"nonExistentAriaRelatedElement", heading:"ARIA attributes which refer to other elements by ID should refer to elements which exist in the DOM", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_02", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+  var b = axs.utils.getAriaPropertiesByValueType(["idref", "idref_list"]), b = axs.utils.getSelectorForAriaProperties(b);
+  return axs.browserUtils.matchSelector(a, b);
 }, test:function(a) {
-  a = a.getAttribute("aria-labelledby").split(/\s+/);
-  for (var b = 0;b < a.length;b++) {
-    if (!document.getElementById(a[b])) {
-      return!0;
+  for (var b = axs.utils.getAriaPropertiesByValueType(["idref", "idref_list"]), b = axs.utils.getSelectorForAriaProperties(b).split(","), c = 0, d = b.length;c < d;c++) {
+    var e = b[c];
+    if (axs.browserUtils.matchSelector(a, e)) {
+      var e = e.match(/aria-[^\]]+/)[0], f = a.getAttribute(e);
+      if (!axs.utils.getAriaPropertyValue(e, f, a).valid) {
+        return !0;
+      }
     }
   }
-  return!1;
-}, code:"AX_ARIA_02"};
-axs.AuditRule.specs.pageWithoutTitle = {name:"pageWithoutTitle", heading:"The web page should have a title that describes topic or purpose", url:"", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return !1;
+}, code:"AX_ARIA_02"});
+axs.AuditRules.addRule({name:"pageWithoutTitle", heading:"The web page should have a title that describes topic or purpose", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_title_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   return "html" == a.tagName.toLowerCase();
 }, test:function(a) {
   a = a.querySelector("head");
   return a ? (a = a.querySelector("title")) ? !a.textContent : !0 : !0;
-}, code:"AX_TITLE_01"};
-axs.AuditRule.specs.requiredAriaAttributeMissing = {name:"requiredAriaAttributeMissing", heading:"Elements with ARIA roles must have all required attributes for that role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_aria_03--elements-with-aria-roles-must-have-all-required-attributes-for-that-role", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+}, code:"AX_TITLE_01"});
+axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements with ARIA roles must have all required attributes for that role", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_03", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
   return axs.browserUtils.matchSelector(a, "[role]");
 }, test:function(a) {
   var b = axs.utils.getRoles(a);
   if (!b.valid) {
-    return!1;
+    return !1;
   }
   for (var c = 0;c < b.roles.length;c++) {
     var d = b.roles[c].details.requiredPropertiesSet, e;
     for (e in d) {
-      if (d = e.replace(/^aria-/, ""), !("defaultValue" in axs.constants.ARIA_PROPERTIES[d] || a.hasAttribute(e))) {
-        return!0;
+      if (d = e.replace(/^aria-/, ""), !("defaultValue" in axs.constants.ARIA_PROPERTIES[d] || a.hasAttribute(e)) && 0 > axs.properties.getNativelySupportedAttributes(a).indexOf(e)) {
+        return !0;
       }
     }
   }
-}, code:"AX_ARIA_03"};
-axs.AuditRule.specs.unfocusableElementsWithOnClick = {name:"unfocusableElementsWithOnClick", heading:"Elements with onclick handlers must be focusable", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_focus_02--elements-with-onclick-handlers-must-be-focusable", severity:axs.constants.Severity.WARNING, opt_requiresConsoleAPI:!0, relevantElementMatcher:function(a) {
+}, code:"AX_ARIA_03"});
+(function() {
+  function a(a) {
+    a = axs.utils.getRoles(a);
+    if (!a || !a.roles.length) {
+      return [];
+    }
+    a = a.roles[0];
+    return a.valid ? a.details.mustcontain || [] : [];
+  }
+  axs.AuditRules.addRule({name:"requiredOwnedAriaRoleMissing", heading:"Elements with ARIA roles must ensure required owned elements are present", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_08", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
+    return axs.browserUtils.matchSelector(b, "[role]") ? 0 < a(b).length : !1;
+  }, test:function(b) {
+    if ("true" === b.getAttribute("aria-busy")) {
+      return !1;
+    }
+    for (var c = a(b), d = c.length - 1;0 <= d;d--) {
+      var e = axs.utils.findDescendantsWithRole(b, c[d]);
+      if (e && e.length) {
+        return !1;
+      }
+    }
+    b = axs.utils.getIdReferents("aria-owns", b);
+    for (d = b.length - 1;0 <= d;d--) {
+      if ((e = axs.utils.getRoles(b[d], !0)) && e.roles.length) {
+        for (var e = e.roles[0], f = c.length - 1;0 <= f;f--) {
+          if (e.name === c[f]) {
+            return !1;
+          }
+        }
+      }
+    }
+    return !0;
+  }, code:"AX_ARIA_08"});
+})();
+axs.AuditRules.addRule({name:"tabIndexGreaterThanZero", heading:"Avoid positive integer values for tabIndex", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_03", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return axs.browserUtils.matchSelector(a, "[tabindex]");
+}, test:function(a) {
+  if (0 < a.tabIndex) {
+    return !0;
+  }
+}, code:"AX_FOCUS_03"});
+axs.AuditRules.addRule({name:"unfocusableElementsWithOnClick", heading:"Elements with onclick handlers must be focusable", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_focus_02", severity:axs.constants.Severity.WARNING, opt_requiresConsoleAPI:!0, relevantElementMatcher:function(a) {
   return a instanceof a.ownerDocument.defaultView.HTMLBodyElement || axs.utils.isElementOrAncestorHidden(a) ? !1 : "click" in getEventListeners(a) ? !0 : !1;
 }, test:function(a) {
-  return!a.hasAttribute("tabindex") && !axs.utils.isElementImplicitlyFocusable(a) && !a.disabled;
-}, code:"AX_FOCUS_02"};
-axs.AuditRule.specs.videoWithoutCaptions = {name:"videoWithoutCaptions", heading:"Video elements should use <track> elements to provide captions", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#-ax_video_01--video-elements-should-use-track-elements-to-provide-captions", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
+  return !a.hasAttribute("tabindex") && !axs.utils.isElementImplicitlyFocusable(a) && !a.disabled;
+}, code:"AX_FOCUS_02"});
+(function() {
+  var a = /^aria\-/, b = axs.utils.getSelectorForAriaProperties(axs.constants.ARIA_PROPERTIES);
+  axs.AuditRules.addRule({name:"unsupportedAriaAttribute", heading:"This element has an unsupported ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
+    return axs.browserUtils.matchSelector(a, b);
+  }, test:function(b) {
+    var d = axs.utils.getRoles(b, !0), d = d && d.roles.length ? d.roles[0].details.propertiesSet : axs.constants.GLOBAL_PROPERTIES;
+    b = b.attributes;
+    for (var e = 0, f = b.length;e < f;e++) {
+      var g = b[e].name;
+      if (a.test(g)) {
+        var h = g.replace(a, "");
+        if (axs.constants.ARIA_PROPERTIES.hasOwnProperty(h) && !(g in d)) {
+          return !0;
+        }
+      }
+    }
+    return !1;
+  }, code:"AX_ARIA_10"});
+})();
+axs.AuditRules.addRule({name:"videoWithoutCaptions", heading:"Video elements should use <track> elements to provide captions", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_video_01", severity:axs.constants.Severity.WARNING, relevantElementMatcher:function(a) {
   return axs.browserUtils.matchSelector(a, "video");
 }, test:function(a) {
-  return!a.querySelectorAll("track[kind=captions]").length;
-}, code:"AX_VIDEO_01"};
+  return !a.querySelectorAll("track[kind=captions]").length;
+}, code:"AX_VIDEO_01"});
 
 
diff --git a/src/js/AuditRule.js b/src/js/AuditRule.js
index a6ef9594..3a2605fa 100644
--- a/src/js/AuditRule.js
+++ b/src/js/AuditRule.js
@@ -182,6 +182,14 @@ axs.AuditRule.collectMatchingElements = function(node, matcher, collection,
             }
         }
     }
+
+    //If it is a iframe, get the contentDocument
+    if (element && element.localName == 'iframe') {
+        axs.AuditRule.collectMatchingElements(node.contentDocument,
+                                              matcher,
+                                              collection,
+                                              false);
+    }
     // If it is neither the parent of a ShadowRoot, a <content> element, nor
     // a <shadow> element recurse normally.
     var child = node.firstChild;
diff --git a/tools/runner/audit.js b/tools/runner/audit.js
index 9e01b439..0bfabe0d 100644
--- a/tools/runner/audit.js
+++ b/tools/runner/audit.js
@@ -16,6 +16,9 @@ var page = require('webpage').create(),
     system = require('system'),
     url;
 
+// disabling so we can get the document root from iframes (http -> https)
+page.settings.webSecurityEnabled = false;
+
 if (system.args.length !== 2) {
   console.log('Usage: phantomjs audit.js URL');
   phantom.exit();

From 2fbd43405b03bfd13bf5efbaf9ad40dffff367c0 Mon Sep 17 00:00:00 2001
From: David Vieira <davidhsv@gmail.com>
Date: Sat, 2 May 2015 02:45:13 -0300
Subject: [PATCH 02/10] #149 Adding unit test and fixing the opt_shadowRoot
 param.

---
 dist/js/axs_testing.js     | 43 +++++++++++++++++---------------------
 src/js/AuditRule.js        |  2 +-
 test/js/audit-rule-test.js | 10 +++++++++
 3 files changed, 30 insertions(+), 25 deletions(-)

diff --git a/dist/js/axs_testing.js b/dist/js/axs_testing.js
index ceefb47c..bd131f92 100644
--- a/dist/js/axs_testing.js
+++ b/dist/js/axs_testing.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/f61fd0447d7ad90256597e6b1203e6495f430694
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/88731e16c8639738a1375f8c2de1ec2a23fcb631
  *
  * See project README for build steps.
  */
@@ -917,12 +917,12 @@ axs.utils.getRoles = function(a, b) {
   if (!c) {
     return null;
   }
-  for (var c = c.split(" "), d = [], e = !0, f = 0;f < c.length;f++) {
-    var g = c[f], h = axs.constants.ARIA_ROLES[g];
-    h && !h.abstract ? g = {name:g, details:axs.constants.ARIA_ROLES[g], valid:!0} : (g = {name:g, valid:!1}, e = !1);
-    d.push(g);
+  for (var c = c.split(" "), d = {roles:[], valid:!1}, e = 0;e < c.length;e++) {
+    var f = c[e], g = axs.constants.ARIA_ROLES[f], f = {name:f};
+    g && !g.abstract ? (f.details = g, d.applied || (d.applied = f), f.valid = d.valid = !0) : f.valid = !1;
+    d.roles.push(f);
   }
-  return {roles:d, valid:e};
+  return d;
 };
 axs.utils.getAriaPropertyValue = function(a, b, c) {
   var d = a.replace(/^aria-/, ""), e = axs.constants.ARIA_PROPERTIES[d], d = {name:a, rawValue:b};
@@ -1536,20 +1536,19 @@ axs.AuditRule.collectMatchingElements = function(a, b, c, d) {
     }
   }
   if (e && "content" == e.localName) {
-    for (var f = e.getDistributedNodes(), g = 0;g < f.length;g++) {
-      axs.AuditRule.collectMatchingElements(f[g], b, c, d);
+    for (e = e.getDistributedNodes(), f = 0;f < e.length;f++) {
+      axs.AuditRule.collectMatchingElements(e[f], b, c, d);
     }
   } else {
     if (e && "shadow" == e.localName) {
       if (f = e, d) {
-        for (f = f.getDistributedNodes(), g = 0;g < f.length;g++) {
-          axs.AuditRule.collectMatchingElements(f[g], b, c, d);
+        for (e = f.getDistributedNodes(), f = 0;f < e.length;f++) {
+          axs.AuditRule.collectMatchingElements(e[f], b, c, d);
         }
       } else {
         console.warn("ShadowRoot not provided for", e);
       }
     }
-    e && "iframe" == e.localName && axs.AuditRule.collectMatchingElements(a.contentDocument, b, c, !1);
     for (a = a.firstChild;null != a;) {
       axs.AuditRule.collectMatchingElements(a, b, c, d), a = a.nextSibling;
     }
@@ -1760,26 +1759,22 @@ axs.AuditRules.addRule({name:"ariaRoleNotScoped", heading:"Elements with ARIA ro
   return axs.browserUtils.matchSelector(a, "[role]");
 }, test:function(a) {
   var b = axs.utils.getRoles(a);
-  if (!b || !b.roles.length) {
-    return !1;
-  }
-  b = b.roles[0];
-  if (!b || !b.valid) {
+  if (!b || !b.applied) {
     return !1;
   }
-  b = b.details.scope;
+  b = b.applied.details.scope;
   if (!b || 0 === b.length) {
     return !1;
   }
   for (var c = a;c = c.parentNode;) {
     var d = axs.utils.getRoles(c, !0);
-    if (d && d.roles.length && (d = d.roles[0], 0 <= b.indexOf(d.name))) {
+    if (d && d.applied && 0 <= b.indexOf(d.applied.name)) {
       return !1;
     }
   }
   if (a = axs.utils.getIdReferrers("aria-owns", a)) {
     for (c = 0;c < a.length;c++) {
-      if ((d = axs.utils.getRoles(a[c], !0)) && d.roles.length && (d = d.roles[0]), d && 0 <= b.indexOf(d.name)) {
+      if ((d = axs.utils.getRoles(a[c], !0)) && d.applied && 0 <= b.indexOf(d.applied.name)) {
         return !1;
       }
     }
@@ -1984,10 +1979,10 @@ axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements w
 (function() {
   function a(a) {
     a = axs.utils.getRoles(a);
-    if (!a || !a.roles.length) {
+    if (!a || !a.applied) {
       return [];
     }
-    a = a.roles[0];
+    a = a.applied;
     return a.valid ? a.details.mustcontain || [] : [];
   }
   axs.AuditRules.addRule({name:"requiredOwnedAriaRoleMissing", heading:"Elements with ARIA roles must ensure required owned elements are present", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_08", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(b) {
@@ -2004,8 +1999,8 @@ axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements w
     }
     b = axs.utils.getIdReferents("aria-owns", b);
     for (d = b.length - 1;0 <= d;d--) {
-      if ((e = axs.utils.getRoles(b[d], !0)) && e.roles.length) {
-        for (var e = e.roles[0], f = c.length - 1;0 <= f;f--) {
+      if ((e = axs.utils.getRoles(b[d], !0)) && e.applied) {
+        for (var e = e.applied, f = c.length - 1;0 <= f;f--) {
           if (e.name === c[f]) {
             return !1;
           }
@@ -2032,7 +2027,7 @@ axs.AuditRules.addRule({name:"unfocusableElementsWithOnClick", heading:"Elements
   axs.AuditRules.addRule({name:"unsupportedAriaAttribute", heading:"This element has an unsupported ARIA attribute", url:"https://github.com/GoogleChrome/accessibility-developer-tools/wiki/Audit-Rules#ax_aria_10", severity:axs.constants.Severity.SEVERE, relevantElementMatcher:function(a) {
     return axs.browserUtils.matchSelector(a, b);
   }, test:function(b) {
-    var d = axs.utils.getRoles(b, !0), d = d && d.roles.length ? d.roles[0].details.propertiesSet : axs.constants.GLOBAL_PROPERTIES;
+    var d = axs.utils.getRoles(b, !0), d = d && d.applied ? d.applied.details.propertiesSet : axs.constants.GLOBAL_PROPERTIES;
     b = b.attributes;
     for (var e = 0, f = b.length;e < f;e++) {
       var g = b[e].name;
diff --git a/src/js/AuditRule.js b/src/js/AuditRule.js
index 3a2605fa..751d8b9f 100644
--- a/src/js/AuditRule.js
+++ b/src/js/AuditRule.js
@@ -188,7 +188,7 @@ axs.AuditRule.collectMatchingElements = function(node, matcher, collection,
         axs.AuditRule.collectMatchingElements(node.contentDocument,
                                               matcher,
                                               collection,
-                                              false);
+                                              opt_shadowRoot);
     }
     // If it is neither the parent of a ShadowRoot, a <content> element, nor
     // a <shadow> element recurse normally.
diff --git a/test/js/audit-rule-test.js b/test/js/audit-rule-test.js
index 57562c91..1770594e 100644
--- a/test/js/audit-rule-test.js
+++ b/test/js/audit-rule-test.js
@@ -41,6 +41,16 @@
         equal(matched.length, DIV_COUNT);
     });
 
+    test("Iframe with simple DOM", function () {
+        var ifrm = document.createElement("IFRAME");
+        var container = document.getElementById('qunit-fixture');
+        container.appendChild(ifrm);
+        ifrm.contentDocument.body.appendChild(buildTestDom());
+        var matched = [];
+        axs.AuditRule.collectMatchingElements(container, matcher, matched);
+        equal(matched.length, DIV_COUNT);
+    });
+
     test("With shadow DOM with no content insertion point", function () {
         var container = document.getElementById('qunit-fixture');
         container.appendChild(buildTestDom());

From 08b3be1e095d0203a094b370c27f77446a6c69e9 Mon Sep 17 00:00:00 2001
From: David Vieira <davidhsv@gmail.com>
Date: Sat, 2 May 2015 03:18:11 -0300
Subject: [PATCH 03/10] #149 Adding copy-dist...

---
 dist/js/axs_testing.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/dist/js/axs_testing.js b/dist/js/axs_testing.js
index bd131f92..eda2d713 100644
--- a/dist/js/axs_testing.js
+++ b/dist/js/axs_testing.js
@@ -1536,19 +1536,20 @@ axs.AuditRule.collectMatchingElements = function(a, b, c, d) {
     }
   }
   if (e && "content" == e.localName) {
-    for (e = e.getDistributedNodes(), f = 0;f < e.length;f++) {
-      axs.AuditRule.collectMatchingElements(e[f], b, c, d);
+    for (var f = e.getDistributedNodes(), g = 0;g < f.length;g++) {
+      axs.AuditRule.collectMatchingElements(f[g], b, c, d);
     }
   } else {
     if (e && "shadow" == e.localName) {
       if (f = e, d) {
-        for (e = f.getDistributedNodes(), f = 0;f < e.length;f++) {
-          axs.AuditRule.collectMatchingElements(e[f], b, c, d);
+        for (f = f.getDistributedNodes(), g = 0;g < f.length;g++) {
+          axs.AuditRule.collectMatchingElements(f[g], b, c, d);
         }
       } else {
         console.warn("ShadowRoot not provided for", e);
       }
     }
+    e && "iframe" == e.localName && axs.AuditRule.collectMatchingElements(a.contentDocument, b, c, d);
     for (a = a.firstChild;null != a;) {
       axs.AuditRule.collectMatchingElements(a, b, c, d), a = a.nextSibling;
     }

From dc66bb7ec54749fcff087ec3382f37062a71cc23 Mon Sep 17 00:00:00 2001
From: David Vieira <davidhsv@gmail.com>
Date: Mon, 4 May 2015 23:24:22 -0300
Subject: [PATCH 04/10] Checking if contentDocument exists (I iframe can point
 to a 404 URL...)

---
 dist/js/axs_testing.js                                   | 7 ++++---
 src/audits/FocusableElementNotVisibleAndNotAriaHidden.js | 3 ++-
 src/js/AuditRule.js                                      | 4 ++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/dist/js/axs_testing.js b/dist/js/axs_testing.js
index eda2d713..1fe815bc 100644
--- a/dist/js/axs_testing.js
+++ b/dist/js/axs_testing.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/88731e16c8639738a1375f8c2de1ec2a23fcb631
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/08b3be1e095d0203a094b370c27f77446a6c69e9
  *
  * See project README for build steps.
  */
@@ -1549,7 +1549,7 @@ axs.AuditRule.collectMatchingElements = function(a, b, c, d) {
         console.warn("ShadowRoot not provided for", e);
       }
     }
-    e && "iframe" == e.localName && axs.AuditRule.collectMatchingElements(a.contentDocument, b, c, d);
+    e && "iframe" == e.localName && e.contentDocument && axs.AuditRule.collectMatchingElements(e.contentDocument, b, c, d);
     for (a = a.firstChild;null != a;) {
       axs.AuditRule.collectMatchingElements(a, b, c, d), a = a.nextSibling;
     }
@@ -1866,7 +1866,8 @@ axs.AuditRules.addRule({name:"focusableElementNotVisibleAndNotAriaHidden", headi
       return !1;
     }
   }
-  return "" === axs.properties.findTextAlternatives(a, {}).trim() ? !1 : !0;
+  a = axs.properties.findTextAlternatives(a, {});
+  return null == a || "" === a.trim() ? !1 : !0;
 }, test:function(a) {
   if (axs.utils.isElementOrAncestorHidden(a)) {
     return !1;
diff --git a/src/audits/FocusableElementNotVisibleAndNotAriaHidden.js b/src/audits/FocusableElementNotVisibleAndNotAriaHidden.js
index f2726ac6..d4e07978 100644
--- a/src/audits/FocusableElementNotVisibleAndNotAriaHidden.js
+++ b/src/audits/FocusableElementNotVisibleAndNotAriaHidden.js
@@ -42,7 +42,8 @@ axs.AuditRules.addRule({
         }
         // Ignore elements which have a negative tabindex and no text content,
         // as they will be skipped by assistive technology
-        if (axs.properties.findTextAlternatives(element, {}).trim() === '')
+        var alternative = axs.properties.findTextAlternatives(element, {});
+        if (alternative == null || alternative.trim() === '')
             return false;
 
         return true;
diff --git a/src/js/AuditRule.js b/src/js/AuditRule.js
index 751d8b9f..275444cd 100644
--- a/src/js/AuditRule.js
+++ b/src/js/AuditRule.js
@@ -184,8 +184,8 @@ axs.AuditRule.collectMatchingElements = function(node, matcher, collection,
     }
 
     //If it is a iframe, get the contentDocument
-    if (element && element.localName == 'iframe') {
-        axs.AuditRule.collectMatchingElements(node.contentDocument,
+    if (element && element.localName == 'iframe' && element.contentDocument) {
+        axs.AuditRule.collectMatchingElements(element.contentDocument,
                                               matcher,
                                               collection,
                                               opt_shadowRoot);

From 7959b2ce5648a3e23fed5f123bcde435f7b66671 Mon Sep 17 00:00:00 2001
From: Xavier Spriet <linkadmin@gmail.com>
Date: Mon, 15 Jun 2015 16:27:04 -0400
Subject: [PATCH 05/10] =?UTF-8?q?Dry-run=20task=20enhancements=20*=20Add?=
 =?UTF-8?q?=20`=E2=80=94dry-run`=20option=20support=20for=20the=20`changel?=
 =?UTF-8?q?og`=20and=20`gh-release`=20tasks.=20*=20Skip=20the=20bundle=20c?=
 =?UTF-8?q?ompilation,=20unit=20testing=20and=20bundle=20distribution=20ta?=
 =?UTF-8?q?sks=20when=20`=E2=80=94dry-run`=20is=20specified.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Gruntfile.js | 57 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 43 insertions(+), 14 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 4313417b..2174c7fe 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -121,6 +121,7 @@ module.exports = function(grunt) {
   grunt.registerTask('changelog', function(type) {
     grunt.task.requires('bump-only:' + type);
 
+    var dryRun = grunt.option('dry-run');
     var config = {
       data: {
         version: grunt.config.get('pkg.version'),
@@ -136,6 +137,7 @@ module.exports = function(grunt) {
     var headerTpl = "## <%= version %> - <%= releaseDate %>\n\n";
     var header = grunt.template.process(headerTpl, config);
 
+    grunt.log.ok('changelog: Extracting release notes.');
     if (contents.length > 0) {
       if ((stopIndex = contents.search(stopRegex)) !== -1) {
         releaseNotes = contents.slice(0, stopIndex);
@@ -144,8 +146,15 @@ module.exports = function(grunt) {
 
     grunt.config.set("gh-release.release-notes", releaseNotes);
 
-    grunt.file.write(dest, "" + header + contents);
-    grunt.log.ok("Changelog updated, and release notes extracted.");
+    if (dryRun) {
+      grunt.log.ok('changelog (dry): Prepending header to ' + dest);
+      grunt.log.writeln(header);
+    } else {
+      grunt.file.write(dest, "" + header + contents);
+    }
+
+    grunt.log.writeln("Release Notes:\n" + releaseNotes);
+    grunt.log.ok('changelog: Task completed.');
   });
 
   grunt.registerTask('gh-release', function() {
@@ -153,6 +162,7 @@ module.exports = function(grunt) {
     grunt.task.requires('coffee:compile');
     var GHRepo = require('./.tmp/util/gh_repo');
 
+    var dryRun = grunt.option('dry-run');
     var done = this.async();
     var config = grunt.config.get('gh-release');
     var pkg = grunt.config.get('pkg');
@@ -168,20 +178,30 @@ module.exports = function(grunt) {
       draft: true
     };
 
-    grunt.log.writeln("Searching for existing GH release:", nextRelease);
+    grunt.log.writeln("gh-release: Searching for existing Github release:", nextRelease);
     repo.getReleaseByName(nextRelease)
       .then(function(release) {
         if (release) {
-          payload.body += "\n" + release.body;
-          repo.updateRelease(release, payload).then(function() {
-            grunt.log.ok('Github release ' + nextRelease + ' updated successfully.');
+          if (dryRun) {
+            grunt.log.ok('gh-release (dry): Updating existing Github release: ' + nextRelease);
             done();
-          });
+          } else {
+            payload.body += "\n" + release.body;
+            repo.updateRelease(release, payload).then(function() {
+              grunt.log.ok('Github release ' + nextRelease + ' updated successfully.');
+              done();
+            });
+          }
         } else {
-          repo.createRelease(payload).then(function() {
-            grunt.log.ok('Github release ' + nextRelease + ' created successfully');
+          if (dryRun) {
+            grunt.log.ok('gh-release (dry): Creating new Github release: ' + nextRelease);
             done();
-          });
+          } else {
+            repo.createRelease(payload).then(function() {
+              grunt.log.ok('Github release ' + nextRelease + ' created successfully');
+              done();
+            });
+          }
         }
       })
       .catch(function(err) {
@@ -216,17 +236,26 @@ module.exports = function(grunt) {
       grunt.fail.fatal('You must specify a release type. i.e. grunt release:prerelease');
     }
 
-    grunt.task.run([
-      'prompt:gh-release',
-      'build',
+    var dryRun = grunt.option('dry-run');
+
+    var tasks = ['prompt:gh-release'];
+
+    if (dryRun) {
+      grunt.log.ok('Skipping build and copy:dist tasks in dry-run');
+    } else {
+      tasks.push('build', 'copy:dist');
+    }
+
+    tasks = tasks.concat([
       'test:unit',
-      'copy:dist',
       'bump-only:' + releaseType,
       'changelog:' + releaseType,
       'bump-commit',
       'coffee:compile',
       'gh-release'
     ]);
+
+    grunt.task.run(tasks);
   });
 
   grunt.registerTask('save-revision', function() {

From 998d3266a1ff7764001ba55338666ab071231a1b Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Sat, 6 Jun 2015 15:41:37 -0700
Subject: [PATCH 06/10] Pull color utils out into separate file

---
 src/js/AccessibilityUtils.js | 455 ++---------------------------------
 src/js/Color.js              | 395 ++++++++++++++++++++++++++++++
 src/js/Properties.js         |  27 ++-
 test/index.html              |   1 +
 test/js/color-test.js        |  55 +++++
 test/js/utils-test.js        |  31 ---
 6 files changed, 486 insertions(+), 478 deletions(-)
 create mode 100644 src/js/Color.js
 create mode 100644 test/js/color-test.js

diff --git a/src/js/AccessibilityUtils.js b/src/js/AccessibilityUtils.js
index 8f457bad..ad5db16d 100644
--- a/src/js/AccessibilityUtils.js
+++ b/src/js/AccessibilityUtils.js
@@ -13,9 +13,10 @@
 // limitations under the License.
 
 goog.require('axs.browserUtils');
+goog.require('axs.color');
+goog.require('axs.color.Color');
 goog.require('axs.constants');
 goog.provide('axs.utils');
-goog.provide('axs.utils.Color');
 
 /**
  * @const
@@ -30,54 +31,6 @@ axs.utils.FOCUSABLE_ELEMENTS_SELECTOR =
     'iframe,' +
     '[tabindex]';
 
-/**
- * @constructor
- * @param {number} red
- * @param {number} green
- * @param {number} blue
- * @param {number} alpha
- */
-axs.utils.Color = function(red, green, blue, alpha) {
-    /** @type {number} */
-    this.red = red;
-
-    /** @type {number} */
-    this.green = green;
-
-    /** @type {number} */
-    this.blue = blue;
-
-    /** @type {number} */
-    this.alpha = alpha;
-};
-
-/**
- * Calculate the contrast ratio between the two given colors. Returns the ratio
- * to 1, for example for two two colors with a contrast ratio of 21:1, this
- * function will return 21.
- * @param {axs.utils.Color} fgColor
- * @param {axs.utils.Color} bgColor
- * @return {?number}
- */
-axs.utils.calculateContrastRatio = function(fgColor, bgColor) {
-    if (!fgColor || !bgColor)
-        return null;
-
-    if (fgColor.alpha < 1)
-        fgColor = axs.utils.flattenColors(fgColor, bgColor);
-
-    var fgLuminance = axs.utils.calculateLuminance(fgColor);
-    var bgLuminance = axs.utils.calculateLuminance(bgColor);
-    var contrastRatio = (Math.max(fgLuminance, bgLuminance) + 0.05) /
-        (Math.min(fgLuminance, bgLuminance) + 0.05);
-    return contrastRatio;
-};
-
-axs.utils.luminanceRatio = function(luminance1, luminance2) {
-    return (Math.max(luminance1, luminance2) + 0.05) /
-        (Math.min(luminance1, luminance2) + 0.05);
-};
-
 /**
  * Returns the nearest ancestor which is an Element.
  * @param {Node} node
@@ -403,11 +356,11 @@ axs.utils.isLargeFont = function(style) {
 /**
  * @param {CSSStyleDeclaration} style
  * @param {Element} element
- * @return {?axs.utils.Color}
+ * @return {?axs.color.Color}
  */
 axs.utils.getBgColor = function(style, element) {
     var bgColorString = style.backgroundColor;
-    var bgColor = axs.utils.parseColor(bgColorString);
+    var bgColor = axs.color.parseColor(bgColorString);
     if (!bgColor)
         return null;
 
@@ -419,7 +372,7 @@ axs.utils.getBgColor = function(style, element) {
         if (parentBg == null)
             return null;
 
-        bgColor = axs.utils.flattenColors(bgColor, parentBg);
+        bgColor = axs.color.flattenColors(bgColor, parentBg);
     }
     return bgColor;
 };
@@ -427,7 +380,7 @@ axs.utils.getBgColor = function(style, element) {
 /**
  * Gets the effective background color of the parent of |element|.
  * @param {Element} element
- * @return {?axs.utils.Color}
+ * @return {?axs.color.Color}
  */
 axs.utils.getParentBgColor = function(element) {
     /** @type {Element} */ var parent = element;
@@ -438,7 +391,7 @@ axs.utils.getParentBgColor = function(element) {
         if (!computedStyle)
             continue;
 
-        var parentBg = axs.utils.parseColor(computedStyle.backgroundColor);
+        var parentBg = axs.color.parseColor(computedStyle.backgroundColor);
         if (!parentBg)
             continue;
 
@@ -457,12 +410,12 @@ axs.utils.getParentBgColor = function(element) {
     }
 
     if (!foundSolidColor)
-        bgStack.push(new axs.utils.Color(255, 255, 255, 1));
+        bgStack.push(new axs.color.Color(255, 255, 255, 1));
 
     var bg = bgStack.pop();
     while (bgStack.length) {
         var fg = bgStack.pop();
-        bg = axs.utils.flattenColors(fg, bg);
+        bg = axs.color.flattenColors(fg, bg);
     }
     return bg;
 };
@@ -470,407 +423,29 @@ axs.utils.getParentBgColor = function(element) {
 /**
  * @param {CSSStyleDeclaration} style
  * @param {Element} element
- * @param {axs.utils.Color} bgColor The background color, which may come from
+ * @param {axs.color.Color} bgColor The background color, which may come from
  *    another element (such as a parent element), for flattening into the
  *    foreground color.
- * @return {?axs.utils.Color}
+ * @return {?axs.color.Color}
  */
 axs.utils.getFgColor = function(style, element, bgColor) {
     var fgColorString = style.color;
-    var fgColor = axs.utils.parseColor(fgColorString);
+    var fgColor = axs.color.parseColor(fgColorString);
     if (!fgColor)
         return null;
 
     if (fgColor.alpha < 1)
-        fgColor = axs.utils.flattenColors(fgColor, bgColor);
+        fgColor = axs.color.flattenColors(fgColor, bgColor);
 
     if (style.opacity < 1) {
         var parentBg = axs.utils.getParentBgColor(element);
         fgColor.alpha = fgColor.alpha * style.opacity;
-        fgColor = axs.utils.flattenColors(fgColor, parentBg);
+        fgColor = axs.color.flattenColors(fgColor, parentBg);
     }
 
     return fgColor;
 };
 
-/**
- * @param {string} colorString The color string from CSS.
- * @return {?axs.utils.Color}
- */
-axs.utils.parseColor = function(colorString) {
-    var rgbRegex = /^rgb\((\d+), (\d+), (\d+)\)$/;
-    var match = colorString.match(rgbRegex);
-
-    if (match) {
-        var r = parseInt(match[1], 10);
-        var g = parseInt(match[2], 10);
-        var b = parseInt(match[3], 10);
-        var a = 1;
-        return new axs.utils.Color(r, g, b, a);
-    }
-
-    var rgbaRegex = /^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/;
-    match = colorString.match(rgbaRegex);
-    if (match) {
-        var r = parseInt(match[1], 10);
-        var g = parseInt(match[2], 10);
-        var b = parseInt(match[3], 10);
-        var a = parseFloat(match[4]);
-        return new axs.utils.Color(r, g, b, a);
-    }
-
-    return null;
-};
-
-/**
- * @param {number} value The value of a color channel, 0 <= value <= 0xFF
- * @return {string}
- */
-axs.utils.colorChannelToString = function(value) {
-    value = Math.round(value);
-    if (value <= 0xF)
-        return '0' + value.toString(16);
-    return value.toString(16);
-};
-
-/**
- * @param {axs.utils.Color} color
- * @return {string}
- */
-axs.utils.colorToString = function(color) {
-    if (color.alpha == 1) {
-         return '#' + axs.utils.colorChannelToString(color.red) +
-         axs.utils.colorChannelToString(color.green) + axs.utils.colorChannelToString(color.blue);
-    }
-    else
-        return 'rgba(' + [color.red, color.green, color.blue, color.alpha].join(',') + ')';
-};
-
-axs.utils.luminanceFromContrastRatio = function(luminance, contrast, higher) {
-    if (higher) {
-        var newLuminance = (luminance + 0.05) * contrast - 0.05;
-        return newLuminance;
-    } else {
-        var newLuminance = (luminance + 0.05) / contrast - 0.05;
-        return newLuminance;
-    }
-};
-
-axs.utils.translateColor = function(ycc, luminance) {
-    var oldLuminance = ycc[0];
-    if (oldLuminance > luminance)
-        var endpoint = 0;
-    else
-        var endpoint = 1;
-
-    var d = luminance - oldLuminance;
-    var scale = d / (endpoint - oldLuminance);
-
-    /** @type {Array.<number>} */ var translatedColor = [ luminance,
-                                                          ycc[1] - ycc[1] * scale,
-                                                          ycc[2] - ycc[2] * scale ];
-    var rgb = axs.utils.fromYCC(translatedColor);
-    return rgb;
-};
-
-/**
- * @param {axs.utils.Color} bgColor
- * @param {axs.utils.Color} fgColor
- * @param {number} contrastRatio
- * @param {CSSStyleDeclaration} style
- * @return {Object}
- */
-axs.utils.suggestColors = function(bgColor, fgColor, contrastRatio, style) {
-    if (!axs.utils.isLowContrast(contrastRatio, style, true))
-        return null;
-    var colors = {};
-    var bgLuminance = axs.utils.calculateLuminance(bgColor);
-    var fgLuminance = axs.utils.calculateLuminance(fgColor);
-
-    var levelAAContrast = axs.utils.isLargeFont(style) ? 3.0 : 4.5;
-    var levelAAAContrast = axs.utils.isLargeFont(style) ? 4.5 : 7.0;
-    var fgLuminanceIsHigher = fgLuminance > bgLuminance;
-    var desiredFgLuminanceAA = axs.utils.luminanceFromContrastRatio(bgLuminance, levelAAContrast + 0.02, fgLuminanceIsHigher);
-    var desiredFgLuminanceAAA = axs.utils.luminanceFromContrastRatio(bgLuminance, levelAAAContrast + 0.02, fgLuminanceIsHigher);
-    var fgYCC = axs.utils.toYCC(fgColor);
-
-    if (axs.utils.isLowContrast(contrastRatio, style, false) &&
-        desiredFgLuminanceAA <= 1 && desiredFgLuminanceAA >= 0) {
-        var newFgColorAA = axs.utils.translateColor(fgYCC, desiredFgLuminanceAA);
-        var newContrastRatioAA = axs.utils.calculateContrastRatio(newFgColorAA, bgColor);
-        var suggestedColorsAA = {};
-        suggestedColorsAA['fg'] = axs.utils.colorToString(newFgColorAA);
-        suggestedColorsAA['bg'] = axs.utils.colorToString(bgColor);
-        suggestedColorsAA['contrast'] = newContrastRatioAA.toFixed(2);
-        colors['AA'] = suggestedColorsAA;
-    }
-    if (axs.utils.isLowContrast(contrastRatio, style, true) &&
-        desiredFgLuminanceAAA <= 1 && desiredFgLuminanceAAA >= 0) {
-        var newFgColorAAA = axs.utils.translateColor(fgYCC, desiredFgLuminanceAAA);
-        var newContrastRatioAAA = axs.utils.calculateContrastRatio(newFgColorAAA, bgColor);
-        var suggestedColorsAAA = {};
-        suggestedColorsAAA['fg'] = axs.utils.colorToString(newFgColorAAA);
-        suggestedColorsAAA['bg'] = axs.utils.colorToString(bgColor);
-        suggestedColorsAAA['contrast'] = newContrastRatioAAA.toFixed(2);
-        colors['AAA'] = suggestedColorsAAA;
-    }
-    var desiredBgLuminanceAA = axs.utils.luminanceFromContrastRatio(fgLuminance, levelAAContrast + 0.02, !fgLuminanceIsHigher);
-    var desiredBgLuminanceAAA = axs.utils.luminanceFromContrastRatio(fgLuminance, levelAAAContrast + 0.02, !fgLuminanceIsHigher);
-    var bgYCC = axs.utils.toYCC(bgColor);
-
-    if (!('AA' in colors) && axs.utils.isLowContrast(contrastRatio, style, false) &&
-        desiredBgLuminanceAA <= 1 && desiredBgLuminanceAA >= 0) {
-        var newBgColorAA = axs.utils.translateColor(bgYCC, desiredBgLuminanceAA);
-        var newContrastRatioAA = axs.utils.calculateContrastRatio(fgColor, newBgColorAA);
-        var suggestedColorsAA = {};
-        suggestedColorsAA['bg'] = axs.utils.colorToString(newBgColorAA);
-        suggestedColorsAA['fg'] = axs.utils.colorToString(fgColor);
-        suggestedColorsAA['contrast'] = newContrastRatioAA.toFixed(2);
-        colors['AA'] = suggestedColorsAA;
-    }
-    if (!('AAA' in colors) && axs.utils.isLowContrast(contrastRatio, style, true) &&
-        desiredBgLuminanceAAA <= 1 && desiredBgLuminanceAAA >= 0) {
-        var newBgColorAAA = axs.utils.translateColor(bgYCC, desiredBgLuminanceAAA);
-        var newContrastRatioAAA = axs.utils.calculateContrastRatio(fgColor, newBgColorAAA);
-        var suggestedColorsAAA = {};
-        suggestedColorsAAA['bg'] = axs.utils.colorToString(newBgColorAAA);
-        suggestedColorsAAA['fg'] = axs.utils.colorToString(fgColor);
-        suggestedColorsAAA['contrast'] = newContrastRatioAAA.toFixed(2);
-        colors['AAA'] = suggestedColorsAAA;
-    }
-    return colors;
-};
-
-/**
- * Combine the two given color according to alpha blending.
- * @param {axs.utils.Color} fgColor
- * @param {axs.utils.Color} bgColor
- * @return {axs.utils.Color}
- */
-axs.utils.flattenColors = function(fgColor, bgColor) {
-    var alpha = fgColor.alpha;
-    var r = ((1 - alpha) * bgColor.red) + (alpha * fgColor.red);
-    var g = ((1 - alpha) * bgColor.green) + (alpha * fgColor.green);
-    var b = ((1 - alpha) * bgColor.blue) + (alpha * fgColor.blue);
-    var a = fgColor.alpha + (bgColor.alpha * (1 - fgColor.alpha));
-
-    return new axs.utils.Color(r, g, b, a);
-};
-
-/**
- * Calculate the luminance of the given color using the WCAG algorithm.
- * @param {axs.utils.Color} color
- * @return {number}
- */
-axs.utils.calculateLuminance = function(color) {
-/*    var rSRGB = color.red / 255;
-    var gSRGB = color.green / 255;
-    var bSRGB = color.blue / 255;
-
-    var r = rSRGB <= 0.03928 ? rSRGB / 12.92 : Math.pow(((rSRGB + 0.055)/1.055), 2.4);
-    var g = gSRGB <= 0.03928 ? gSRGB / 12.92 : Math.pow(((gSRGB + 0.055)/1.055), 2.4);
-    var b = bSRGB <= 0.03928 ? bSRGB / 12.92 : Math.pow(((bSRGB + 0.055)/1.055), 2.4);
-
-    return 0.2126 * r + 0.7152 * g + 0.0722 * b; */
-    var ycc = axs.utils.toYCC(color);
-    return ycc[0];
-};
-
-/**
- * Returns an RGB to YCC conversion matrix for the given kR, kB constants.
- * @param {number} kR
- * @param {number} kB
- * @return {Array.<Array.<number>>}
- */
-axs.utils.RGBToYCCMatrix = function(kR, kB) {
-    return [
-        [
-            kR,
-            (1 - kR - kB),
-            kB
-        ],
-        [
-            -kR/(2 - 2*kB),
-            (kR + kB - 1)/(2 - 2*kB),
-            (1 - kB)/(2 - 2*kB)
-        ],
-        [
-            (1 - kR)/(2 - 2*kR),
-            (kR + kB - 1)/(2 - 2*kR),
-            -kB/(2 - 2*kR)
-        ]
-    ];
-};
-
-/**
- * Return the inverse of the given 3x3 matrix.
- * @param {Array.<Array.<number>>} matrix
- * @return Array.<Array.<number>> The inverse of the given matrix.
- */
-axs.utils.invert3x3Matrix = function(matrix) {
-    var a = matrix[0][0];
-    var b = matrix[0][1];
-    var c = matrix[0][2];
-    var d = matrix[1][0];
-    var e = matrix[1][1];
-    var f = matrix[1][2];
-    var g = matrix[2][0];
-    var h = matrix[2][1];
-    var k = matrix[2][2];
-
-    var A = (e*k - f*h);
-    var B = (f*g - d*k);
-    var C = (d*h - e*g);
-    var D = (c*h - b*k);
-    var E = (a*k - c*g);
-    var F = (g*b - a*h);
-    var G = (b*f - c*e);
-    var H = (c*d - a*f);
-    var K = (a*e - b*d);
-
-    var det = a * (e*k - f*h) - b * (k*d - f*g) + c * (d*h - e*g);
-    var z = 1/det;
-
-    return axs.utils.scalarMultiplyMatrix([
-        [ A, D, G ],
-        [ B, E, H ],
-        [ C, F, K ]
-    ], z);
-};
-
-axs.utils.scalarMultiplyMatrix = function(matrix, scalar) {
-    var result = [];
-    result[0] = [];
-    result[1] = [];
-    result[2] = [];
-
-    for (var i = 0; i < 3; i++) {
-        for (var j = 0; j < 3; j++) {
-            result[i][j] = matrix[i][j] * scalar;
-        }
-    }
-
-    return result;
-};
-
-axs.utils.kR = 0.2126;
-axs.utils.kB = 0.0722;
-axs.utils.YCC_MATRIX = axs.utils.RGBToYCCMatrix(axs.utils.kR, axs.utils.kB);
-axs.utils.INVERTED_YCC_MATRIX = axs.utils.invert3x3Matrix(axs.utils.YCC_MATRIX);
-
-/**
- * Multiply the given color vector by the given transformation matrix.
- * @param {Array.<Array.<number>>} matrix A 3x3 conversion matrix
- * @param {Array.<number>} vector A 3-element color vector
- * @return {Array.<number>} A 3-element color vector
- */
-axs.utils.convertColor = function(matrix, vector) {
-    var a = matrix[0][0];
-    var b = matrix[0][1];
-    var c = matrix[0][2];
-    var d = matrix[1][0];
-    var e = matrix[1][1];
-    var f = matrix[1][2];
-    var g = matrix[2][0];
-    var h = matrix[2][1];
-    var k = matrix[2][2];
-
-    var x = vector[0];
-    var y = vector[1];
-    var z = vector[2];
-
-    return [
-        a*x + b*y + c*z,
-        d*x + e*y + f*z,
-        g*x + h*y + k*z
-    ];
-};
-
-axs.utils.multiplyMatrices = function(matrix1, matrix2) {
-    var result = [];
-    result[0] = [];
-    result[1] = [];
-    result[2] = [];
-
-    for (var i = 0; i < 3; i++) {
-        for (var j = 0; j < 3; j++) {
-            result[i][j] = matrix1[i][0] * matrix2[0][j] +
-                           matrix1[i][1] * matrix2[1][j] +
-                           matrix1[i][2] * matrix2[2][j];
-        }
-    }
-    return result;
-};
-
-/**
- * Convert a given RGB color to YCC.
- * @param {axs.utils.Color} color
- */
-axs.utils.toYCC = function(color) {
-    var rSRGB = color.red / 255;
-    var gSRGB = color.green / 255;
-    var bSRGB = color.blue / 255;
-
-    var r = rSRGB <= 0.03928 ? rSRGB / 12.92 : Math.pow(((rSRGB + 0.055)/1.055), 2.4);
-    var g = gSRGB <= 0.03928 ? gSRGB / 12.92 : Math.pow(((gSRGB + 0.055)/1.055), 2.4);
-    var b = bSRGB <= 0.03928 ? bSRGB / 12.92 : Math.pow(((bSRGB + 0.055)/1.055), 2.4);
-
-    return axs.utils.convertColor(axs.utils.YCC_MATRIX, [r, g, b]);
-};
-
-/**
- * Convert a color from a YCC color (as a vector) to an RGB color
- * @param {Array.<number>} yccColor
- * @return {axs.utils.Color}
- */
-axs.utils.fromYCC = function(yccColor) {
-    var rgb = axs.utils.convertColor(axs.utils.INVERTED_YCC_MATRIX, yccColor);
-
-    var r = rgb[0];
-    var g = rgb[1];
-    var b = rgb[2];
-    var rSRGB = r <= 0.00303949 ? (r * 12.92) : (Math.pow(r, (1/2.4)) * 1.055) - 0.055;
-    var gSRGB = g <= 0.00303949 ? (g * 12.92) : (Math.pow(g, (1/2.4)) * 1.055) - 0.055;
-    var bSRGB = b <= 0.00303949 ? (b * 12.92) : (Math.pow(b, (1/2.4)) * 1.055) - 0.055;
-
-    var red = Math.min(Math.max(Math.round(rSRGB * 255), 0), 255);
-    var green = Math.min(Math.max(Math.round(gSRGB * 255), 0), 255);
-    var blue = Math.min(Math.max(Math.round(bSRGB * 255), 0), 255);
-
-    return new axs.utils.Color(red, green, blue, 1);
-};
-
-axs.utils.scalarMultiplyMatrix = function(matrix, scalar) {
-    var result = [];
-    result[0] = [];
-    result[1] = [];
-    result[2] = [];
-
-    for (var i = 0; i < 3; i++) {
-        for (var j = 0; j < 3; j++) {
-            result[i][j] = matrix[i][j] * scalar;
-        }
-    }
-
-    return result;
-};
-
-axs.utils.multiplyMatrices = function(matrix1, matrix2) {
-    var result = [];
-    result[0] = [];
-    result[1] = [];
-    result[2] = [];
-
-    for (var i = 0; i < 3; i++) {
-        for (var j = 0; j < 3; j++) {
-            result[i][j] = matrix1[i][0] * matrix2[0][j] +
-                           matrix1[i][1] * matrix2[1][j] +
-                           matrix1[i][2] * matrix2[2][j];
-        }
-    }
-    return result;
-};
-
 /**
  * @param {Element} element
  * @return {?number}
@@ -897,7 +472,7 @@ axs.utils.getContrastRatioForElementWithComputedStyle = function(style, element)
     if (!fgColor)
         return null;
 
-    return axs.utils.calculateContrastRatio(fgColor, bgColor);
+    return axs.color.calculateContrastRatio(fgColor, bgColor);
 };
 
 /**
diff --git a/src/js/Color.js b/src/js/Color.js
new file mode 100644
index 00000000..6e91e55e
--- /dev/null
+++ b/src/js/Color.js
@@ -0,0 +1,395 @@
+// Copyright 2015 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+goog.provide('axs.color');
+goog.provide('axs.color.Color');
+
+/**
+ * @constructor
+ * @param {number} red
+ * @param {number} green
+ * @param {number} blue
+ * @param {number} alpha
+ */
+axs.color.Color = function(red, green, blue, alpha) {
+    /** @type {number} */
+    this.red = red;
+
+    /** @type {number} */
+    this.green = green;
+
+    /** @type {number} */
+    this.blue = blue;
+
+    /** @type {number} */
+    this.alpha = alpha;
+};
+
+/**
+ * Calculate the contrast ratio between the two given colors. Returns the ratio
+ * to 1, for example for two two colors with a contrast ratio of 21:1, this
+ * function will return 21.
+ * @param {axs.color.Color} fgColor
+ * @param {axs.color.Color} bgColor
+ * @return {!number}
+ */
+axs.color.calculateContrastRatio = function(fgColor, bgColor) {
+    if (fgColor.alpha < 1)
+        fgColor = axs.color.flattenColors(fgColor, bgColor);
+
+    var fgLuminance = axs.color.calculateLuminance(fgColor);
+    var bgLuminance = axs.color.calculateLuminance(bgColor);
+    var contrastRatio = (Math.max(fgLuminance, bgLuminance) + 0.05) /
+        (Math.min(fgLuminance, bgLuminance) + 0.05);
+    return contrastRatio;
+};
+
+/**
+ * Calculate the luminance of the given color using the WCAG algorithm.
+ * @param {axs.color.Color} color
+ * @return {number}
+ */
+axs.color.calculateLuminance = function(color) {
+/*    var rSRGB = color.red / 255;
+    var gSRGB = color.green / 255;
+    var bSRGB = color.blue / 255;
+
+    var r = rSRGB <= 0.03928 ? rSRGB / 12.92 : Math.pow(((rSRGB + 0.055)/1.055), 2.4);
+    var g = gSRGB <= 0.03928 ? gSRGB / 12.92 : Math.pow(((gSRGB + 0.055)/1.055), 2.4);
+    var b = bSRGB <= 0.03928 ? bSRGB / 12.92 : Math.pow(((bSRGB + 0.055)/1.055), 2.4);
+
+    return 0.2126 * r + 0.7152 * g + 0.0722 * b; */
+    var ycc = axs.color.toYCC(color);
+    return ycc[0];
+};
+
+/**
+ * Compute the luminance ratio between two luminance values.
+ * @param {number} luminance1
+ * @param {number} luminance2
+ */
+axs.color.luminanceRatio = function(luminance1, luminance2) {
+    return (Math.max(luminance1, luminance2) + 0.05) /
+        (Math.min(luminance1, luminance2) + 0.05);
+};
+
+/**
+ * @param {string} colorString The color string from CSS.
+ * @return {?axs.color.Color}
+ */
+axs.color.parseColor = function(colorString) {
+    var rgbRegex = /^rgb\((\d+), (\d+), (\d+)\)$/;
+    var match = colorString.match(rgbRegex);
+
+    if (match) {
+        var r = parseInt(match[1], 10);
+        var g = parseInt(match[2], 10);
+        var b = parseInt(match[3], 10);
+        var a = 1;
+        return new axs.color.Color(r, g, b, a);
+    }
+
+    var rgbaRegex = /^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/;
+    match = colorString.match(rgbaRegex);
+    if (match) {
+        var r = parseInt(match[1], 10);
+        var g = parseInt(match[2], 10);
+        var b = parseInt(match[3], 10);
+        var a = parseFloat(match[4]);
+        return new axs.color.Color(r, g, b, a);
+    }
+
+    return null;
+};
+
+/**
+ * @param {number} value The value of a color channel, 0 <= value <= 0xFF
+ * @return {!string}
+ */
+axs.color.colorChannelToString = function(value) {
+    value = Math.round(value);
+    if (value <= 0xF)
+        return '0' + value.toString(16);
+    return value.toString(16);
+};
+
+/**
+ * @param {axs.color.Color} color
+ * @return {!string}
+ */
+axs.color.colorToString = function(color) {
+    if (color.alpha == 1) {
+         return '#' + axs.color.colorChannelToString(color.red) +
+         axs.color.colorChannelToString(color.green) + axs.color.colorChannelToString(color.blue);
+    }
+    else
+        return 'rgba(' + [color.red, color.green, color.blue, color.alpha].join(',') + ')';
+};
+
+/**
+ * Compute a desired luminance given a given luminance and a desired contrast ratio.
+ * @param {number} luminance The given luminance.
+ * @param {number} contrast The desired contrast ratio.
+ * @param {boolean} higher Whether the desired luminance is higher or lower than the given luminance.
+ * @return {number} The desired luminance.
+ */
+axs.color.luminanceFromContrastRatio = function(luminance, contrast, higher) {
+    if (higher) {
+        var newLuminance = (luminance + 0.05) * contrast - 0.05;
+        return newLuminance;
+    } else {
+        var newLuminance = (luminance + 0.05) / contrast - 0.05;
+        return newLuminance;
+    }
+};
+
+/**
+ * Given a color in YCC format and a desired luminance, pick a new color with the desired luminance which is
+ * a translation towards black or white of the old color.
+ * @param {Array.<number>} ycc A color in YCC as an array with three elements.
+ * @param {number} luminance The desired luminance
+ * @return {axs.color.Color} A new color in RGB.
+ */
+axs.color.translateColor = function(ycc, luminance) {
+    var oldLuminance = ycc[0];
+    if (oldLuminance > luminance)
+        var endpoint = 0;
+    else
+        var endpoint = 1;
+
+    var d = luminance - oldLuminance;
+    var scale = 0; // d / (endpoint - oldLuminance);
+
+    /** @type {Array.<number>} */ var translatedColor = [ luminance,
+                                                          ycc[1] - ycc[1] * scale,
+                                                          ycc[2] - ycc[2] * scale ];
+    var rgb = axs.color.fromYCC(translatedColor);
+    return rgb;
+};
+
+/** @typedef {{fg: string, bg: string, contrast: string}} */
+axs.color.SuggestedColors;
+
+/**
+ * @param {axs.color.Color} bgColor
+ * @param {axs.color.Color} fgColor
+ * @param {Object.<string, number>} desiredContrastRatios A map of label to desired contrast ratio.
+ * @return {Object.<string, axs.color.SuggestedColors>}
+ */
+axs.color.suggestColors = function(bgColor, fgColor, desiredContrastRatios) {
+    var colors = {};
+    var bgLuminance = axs.color.calculateLuminance(bgColor);
+    var fgLuminance = axs.color.calculateLuminance(fgColor);
+
+    var fgLuminanceIsHigher = fgLuminance > bgLuminance;
+    var fgYCC = axs.color.toYCC(fgColor);
+    var bgYCC = axs.color.toYCC(bgColor);
+    for (var desiredLabel in desiredContrastRatios) {
+        var desiredContrast = desiredContrastRatios[desiredLabel];
+
+        var desiredFgLuminance = axs.color.luminanceFromContrastRatio(bgLuminance, desiredContrast + 0.02, fgLuminanceIsHigher);
+        if (desiredFgLuminance <= 1 && desiredFgLuminance >= 0) {
+            var newFgColor = axs.color.translateColor(fgYCC, desiredFgLuminance);
+            var newContrastRatio = axs.color.calculateContrastRatio(newFgColor, bgColor);
+            var suggestedColors = {};
+            suggestedColors.fg = /** @type {!string} */ (axs.color.colorToString(newFgColor));
+            suggestedColors.bg = /** @type {!string} */ (axs.color.colorToString(bgColor));
+            suggestedColors.contrast = /** @type {!string} */ (newContrastRatio.toFixed(2));
+            colors[desiredLabel] = /** @type {axs.color.SuggestedColors} */ (suggestedColors);
+            continue;
+        }
+
+        var desiredBgLuminance = axs.color.luminanceFromContrastRatio(fgLuminance, desiredContrast + 0.02, !fgLuminanceIsHigher);
+        if (desiredBgLuminance <= 1 && desiredBgLuminance >= 0) {
+            var newBgColor = axs.color.translateColor(bgYCC, desiredBgLuminance);
+            var newContrastRatio = axs.color.calculateContrastRatio(fgColor, newBgColor);
+            var suggestedColors = {};
+            suggestedColors.bg = /** @type {!string} */ (axs.color.colorToString(newBgColor));
+            suggestedColors.fg = /** @type {!string} */ (axs.color.colorToString(fgColor));
+            suggestedColors.contrast = /** @type {!string} */ (newContrastRatio.toFixed(2));
+            colors[desiredLabel] = /** @type {axs.color.SuggestedColors} */ (suggestedColors);
+        }
+    }
+    return colors;
+};
+
+/**
+ * Combine the two given color according to alpha blending.
+ * @param {axs.color.Color} fgColor
+ * @param {axs.color.Color} bgColor
+ * @return {axs.color.Color}
+ */
+axs.color.flattenColors = function(fgColor, bgColor) {
+    var alpha = fgColor.alpha;
+    var r = ((1 - alpha) * bgColor.red) + (alpha * fgColor.red);
+    var g = ((1 - alpha) * bgColor.green) + (alpha * fgColor.green);
+    var b = ((1 - alpha) * bgColor.blue) + (alpha * fgColor.blue);
+    var a = fgColor.alpha + (bgColor.alpha * (1 - fgColor.alpha));
+
+    return new axs.color.Color(r, g, b, a);
+};
+
+/**
+ * Multiply the given color vector by the given transformation matrix.
+ * @param {Array.<Array.<number>>} matrix A 3x3 conversion matrix
+ * @param {Array.<number>} vector A 3-element color vector
+ * @return {Array.<number>} A 3-element color vector
+ */
+axs.color.convertColor = function(matrix, vector) {
+    var a = matrix[0][0];
+    var b = matrix[0][1];
+    var c = matrix[0][2];
+    var d = matrix[1][0];
+    var e = matrix[1][1];
+    var f = matrix[1][2];
+    var g = matrix[2][0];
+    var h = matrix[2][1];
+    var k = matrix[2][2];
+
+    var x = vector[0];
+    var y = vector[1];
+    var z = vector[2];
+
+    return [
+        a*x + b*y + c*z,
+        d*x + e*y + f*z,
+        g*x + h*y + k*z
+    ];
+};
+
+/**
+ * Convert a given RGB color to YCC.
+ * @param {axs.color.Color} color
+ */
+axs.color.toYCC = function(color) {
+    var rSRGB = color.red / 255;
+    var gSRGB = color.green / 255;
+    var bSRGB = color.blue / 255;
+
+    var r = rSRGB <= 0.03928 ? rSRGB / 12.92 : Math.pow(((rSRGB + 0.055)/1.055), 2.4);
+    var g = gSRGB <= 0.03928 ? gSRGB / 12.92 : Math.pow(((gSRGB + 0.055)/1.055), 2.4);
+    var b = bSRGB <= 0.03928 ? bSRGB / 12.92 : Math.pow(((bSRGB + 0.055)/1.055), 2.4);
+
+    return axs.color.convertColor(axs.color.YCC_MATRIX, [r, g, b]);
+};
+
+/**
+ * Convert a color from a YCC color (as a vector) to an RGB color
+ * @param {Array.<number>} yccColor
+ * @return {axs.color.Color}
+ */
+axs.color.fromYCC = function(yccColor) {
+    var rgb = axs.color.convertColor(axs.color.INVERTED_YCC_MATRIX, yccColor);
+
+    var r = rgb[0];
+    var g = rgb[1];
+    var b = rgb[2];
+    var rSRGB = r <= 0.00303949 ? (r * 12.92) : (Math.pow(r, (1/2.4)) * 1.055) - 0.055;
+    var gSRGB = g <= 0.00303949 ? (g * 12.92) : (Math.pow(g, (1/2.4)) * 1.055) - 0.055;
+    var bSRGB = b <= 0.00303949 ? (b * 12.92) : (Math.pow(b, (1/2.4)) * 1.055) - 0.055;
+
+    var red = Math.min(Math.max(Math.round(rSRGB * 255), 0), 255);
+    var green = Math.min(Math.max(Math.round(gSRGB * 255), 0), 255);
+    var blue = Math.min(Math.max(Math.round(bSRGB * 255), 0), 255);
+
+    return new axs.color.Color(red, green, blue, 1);
+};
+
+/**
+ * Returns an RGB to YCC conversion matrix for the given kR, kB constants.
+ * @param {number} kR
+ * @param {number} kB
+ * @return {Array.<Array.<number>>}
+ */
+axs.color.RGBToYCCMatrix = function(kR, kB) {
+    return [
+        [
+            kR,
+            (1 - kR - kB),
+            kB
+        ],
+        [
+            -kR/(2 - 2*kB),
+            (kR + kB - 1)/(2 - 2*kB),
+            (1 - kB)/(2 - 2*kB)
+        ],
+        [
+            (1 - kR)/(2 - 2*kR),
+            (kR + kB - 1)/(2 - 2*kR),
+            -kB/(2 - 2*kR)
+        ]
+    ];
+};
+
+/**
+ * Return the inverse of the given 3x3 matrix.
+ * @param {Array.<Array.<number>>} matrix
+ * @return Array.<Array.<number>> The inverse of the given matrix.
+ */
+axs.color.invert3x3Matrix = function(matrix) {
+    var a = matrix[0][0];
+    var b = matrix[0][1];
+    var c = matrix[0][2];
+    var d = matrix[1][0];
+    var e = matrix[1][1];
+    var f = matrix[1][2];
+    var g = matrix[2][0];
+    var h = matrix[2][1];
+    var k = matrix[2][2];
+
+    var A = (e*k - f*h);
+    var B = (f*g - d*k);
+    var C = (d*h - e*g);
+    var D = (c*h - b*k);
+    var E = (a*k - c*g);
+    var F = (g*b - a*h);
+    var G = (b*f - c*e);
+    var H = (c*d - a*f);
+    var K = (a*e - b*d);
+
+    var det = a * (e*k - f*h) - b * (k*d - f*g) + c * (d*h - e*g);
+    var z = 1/det;
+
+    return axs.color.scalarMultiplyMatrix([
+        [ A, D, G ],
+        [ B, E, H ],
+        [ C, F, K ]
+    ], z);
+};
+
+/**
+ * Multiply a matrix by a scalar.
+ * @param {Array.<Array.<number>>} matrix A 3x3 matrix.
+ * @param {number} scalar
+ * @return {Array.<Array.<number>>}
+ */
+axs.color.scalarMultiplyMatrix = function(matrix, scalar) {
+    var result = [];
+    result[0] = [];
+    result[1] = [];
+    result[2] = [];
+
+    for (var i = 0; i < 3; i++) {
+        for (var j = 0; j < 3; j++) {
+            result[i][j] = matrix[i][j] * scalar;
+        }
+    }
+
+    return result;
+};
+
+axs.color.kR = 0.2126;
+axs.color.kB = 0.0722;
+axs.color.YCC_MATRIX = axs.color.RGBToYCCMatrix(axs.color.kR, axs.color.kB);
+axs.color.INVERTED_YCC_MATRIX = axs.color.invert3x3Matrix(axs.color.YCC_MATRIX);
diff --git a/src/js/Properties.js b/src/js/Properties.js
index a6a40ed9..bc8e3901 100644
--- a/src/js/Properties.js
+++ b/src/js/Properties.js
@@ -13,6 +13,7 @@
 // limitations under the License.
 
 goog.require('axs.browserUtils');
+goog.require('axs.color');
 goog.require('axs.utils');
 
 goog.provide('axs.properties');
@@ -198,16 +199,28 @@ axs.properties.getContrastRatioProperties = function(element) {
     if (!bgColor)
         return null;
 
-    contrastRatioProperties['backgroundColor'] = axs.utils.colorToString(bgColor);
+    contrastRatioProperties['backgroundColor'] = axs.color.colorToString(bgColor);
     var fgColor = axs.utils.getFgColor(style, element, bgColor);
-    contrastRatioProperties['foregroundColor'] = axs.utils.colorToString(fgColor);
-    var value = axs.utils.getContrastRatioForElementWithComputedStyle(style, element);
-    if (!value)
+    contrastRatioProperties['foregroundColor'] = axs.color.colorToString(fgColor);
+    var contrast = axs.utils.getContrastRatioForElementWithComputedStyle(style, element);
+    if (!contrast)
         return null;
-    contrastRatioProperties['value'] = value.toFixed(2);
-    if (axs.utils.isLowContrast(value, style))
+    contrastRatioProperties['value'] = contrast.toFixed(2);
+    if (axs.utils.isLowContrast(contrast, style))
         contrastRatioProperties['alert'] = true;
-    var suggestedColors = axs.utils.suggestColors(bgColor, fgColor, value, style);
+
+    var levelAAContrast = axs.utils.isLargeFont(style) ? 3.0 : 4.5;
+    var levelAAAContrast = axs.utils.isLargeFont(style) ? 4.5 : 7.0;
+    var desiredContrastRatios = {};
+    if (levelAAContrast > contrast)
+        desiredContrastRatios['AA'] = levelAAContrast;
+    if (levelAAAContrast > contrast)
+        desiredContrastRatios['AAA'] = levelAAAContrast;
+
+    if (!Object.keys(desiredContrastRatios).length)
+        return contrastRatioProperties;
+
+    var suggestedColors = axs.color.suggestColors(bgColor, fgColor, desiredContrastRatios);
     if (suggestedColors && Object.keys(suggestedColors).length)
         contrastRatioProperties['suggestedColors'] = suggestedColors;
     return contrastRatioProperties;
diff --git a/test/index.html b/test/index.html
index f08f42d6..ad5bfa4b 100644
--- a/test/index.html
+++ b/test/index.html
@@ -9,6 +9,7 @@
     <script src="../lib/closure-library/closure/goog/base.js"></script>
     <script src="../src/js/axs.js"></script>
     <script src="../src/js/BrowserUtils.js"></script>
+    <script src="../src/js/Color.js"></script>
     <script src="../src/js/Constants.js"></script>
     <script src="../src/js/AccessibilityUtils.js"></script>
     <script src="../src/js/Properties.js"></script>
diff --git a/test/js/color-test.js b/test/js/color-test.js
new file mode 100644
index 00000000..bcb5b444
--- /dev/null
+++ b/test/js/color-test.js
@@ -0,0 +1,55 @@
+// Copyright 2012 Google Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+module("Contrast Ratio", {
+  setup: function () {
+    var fixture = document.createElement('div');
+    document.getElementById('qunit-fixture').appendChild(fixture);
+    this.fixture_ = fixture;
+    this.black_ = {"red": 0, "green": 0, "blue": 0, "alpha": 1};
+    this.white_ = {"red": 255, "green": 255, "blue": 255, "alpha": 1};
+  }
+});
+test("Black and white.", function () {
+  equal(axs.color.calculateContrastRatio(this.white_, this.black_), 21);
+  equal(axs.color.calculateContrastRatio(this.black_, this.white_), 21);
+});
+test("Same color === no contrast.", function () {
+  equal(axs.color.calculateContrastRatio(this.white_, this.white_), 1);
+  equal(axs.color.calculateContrastRatio(this.black_, this.black_), 1);
+});
+test("Transparent foreground === no contrast.", function () {
+  equal(axs.color.calculateContrastRatio({"red": 0, "green": 0, "blue": 0, "alpha": 0}, this.white_), 1);
+});
+
+
+module("parseColor");
+test("parses alpha values correctly", function() {
+  var colorString = 'rgba(255, 255, 255, .47)';
+  var color = axs.color.parseColor(colorString);
+  equal(color.red, 255);
+  equal(color.blue, 255);
+  equal(color.green, 255);
+  equal(color.alpha, .47);
+});
+
+module("suggestColors");
+test("suggests correct grey values", function() {
+  var white = new axs.color.Color(255, 255, 255, 1)
+  var desiredContrastRatios = { AA: 4.5, AAA: 7.0 };
+  var suggestions = axs.color.suggestColors(white, white, desiredContrastRatios);
+  deepEqual(suggestions, { AA: { bg: "#ffffff", contrast: "4.54", fg: "#767676" },
+                           AAA: { bg: "#ffffff", contrast: "7.00", fg: "#595959" } });
+});
+
diff --git a/test/js/utils-test.js b/test/js/utils-test.js
index 93c0a185..574dbff8 100644
--- a/test/js/utils-test.js
+++ b/test/js/utils-test.js
@@ -12,27 +12,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-module("Contrast Ratio", {
-  setup: function () {
-    var fixture = document.createElement('div');
-    document.getElementById('qunit-fixture').appendChild(fixture);
-    this.fixture_ = fixture;
-    this.black_ = {"red": 0, "green": 0, "blue": 0, "alpha": 1};
-    this.white_ = {"red": 255, "green": 255, "blue": 255, "alpha": 1};
-  }
-});
-test("Black and white.", function () {
-  equal(axs.utils.calculateContrastRatio(this.white_, this.black_), 21);
-  equal(axs.utils.calculateContrastRatio(this.black_, this.white_), 21);
-});
-test("Same color === no contrast.", function () {
-  equal(axs.utils.calculateContrastRatio(this.white_, this.white_), 1);
-  equal(axs.utils.calculateContrastRatio(this.black_, this.black_), 1);
-});
-test("Transparent foreground === no contrast.", function () {
-  equal(axs.utils.calculateContrastRatio({"red": 0, "green": 0, "blue": 0, "alpha": 0}, this.white_), 1);
-});
-
 module("Zero Area", {
   setup: function () {
     var fixture = document.createElement('div');
@@ -143,16 +122,6 @@ test("nth-of-type does not refer to a selector but a tagName", function() {
         'selector "' + selector + '" does not match element');
 });
 
-module("parseColor");
-test("parses alpha values correctly", function() {
-  var colorString = 'rgba(255, 255, 255, .47)';
-  var color = axs.utils.parseColor(colorString);
-  equal(color.red, 255);
-  equal(color.blue, 255);
-  equal(color.green, 255);
-  equal(color.alpha, .47);
-});
-
 module("getIdReferrers", {
   setup: function () {
     this.fixture_ = document.getElementById('qunit-fixture');

From 1b9bad3dc5dbca168e76417fdf2569e494b6154c Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Sun, 7 Jun 2015 21:04:59 -0700
Subject: [PATCH 07/10] New color suggestion algorithm.

1. Let L be the line in the coordinate space (Cb, Cr, luma) keeping (Cb, Cr) constant.
2. Let Corner be either the black or the white corner of the color cube, depending on whether the desired luma is lower (black) or higher (white) than the original luma.
3. Find the intersection between L and one of the three planes of the cube containing Corner, let this be point I.
4. If the luma at I is closer to the luma at Corner than the desired luma, then desired luma is on L point within the cube, so return the color with original Cb/Cr values and desired luma.
5. Otherwise, the desired luma is on L outside the cube, so find the point on the line (I, Corner) which has the desired luma value.
---
 Changelog.md          |   2 +
 src/js/AuditRules.js  |   5 +-
 src/js/Color.js       | 238 +++++++++++++++++++++++++++++++++---------
 test/index.html       |   1 +
 test/js/color-test.js |   2 -
 5 files changed, 197 insertions(+), 51 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index b6c34920..d6af9944 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -9,6 +9,8 @@
 ### Enhancements:
 * Rework findTextAlternatives not to return non-exposed text alternatives.
 * Add Bower config (#157)
+* Pull color code into separate file.
+* Improve color suggestion algorithm.
 
 ### Bug fixes:
 * Check for any text alternatives when assessing unlabeled images (#154).
diff --git a/src/js/AuditRules.js b/src/js/AuditRules.js
index 4c8f904d..fe9d497c 100644
--- a/src/js/AuditRules.js
+++ b/src/js/AuditRules.js
@@ -20,6 +20,9 @@ goog.provide('axs.AuditRules');
     var auditRulesByName = {};
     var auditRulesByCode = {};
 
+    /** @type {Object.<string, axs.AuditRule.Spec>} */
+    axs.AuditRules.specs = {};
+
     /**
      * Instantiates and registers an audit rule.
      * If a conflicting rule is already registered then the new rule will not be added.
@@ -27,7 +30,6 @@ goog.provide('axs.AuditRules');
      * @throws {Error} If the rule duplicates properties that must be unique.
      */
     axs.AuditRules.addRule = function(spec) {
-        // axs.AuditRule.specs[spec.name] = spec;  // This would add backwards compatibility
         // create the auditRule before checking props as we can expect the constructor to perform the
         // first layer of sanity checking.
         var auditRule = new axs.AuditRule(spec);
@@ -36,6 +38,7 @@ goog.provide('axs.AuditRules');
         if (auditRule.name in auditRulesByName)
             throw new Error('Can not add audit rule with same name: "' + auditRule.name + '"');
         auditRulesByName[auditRule.name] = auditRulesByCode[auditRule.code] = auditRule;
+        axs.AuditRules.specs[spec.name] = spec;
     };
 
     /**
diff --git a/src/js/Color.js b/src/js/Color.js
index 6e91e55e..e7e77955 100644
--- a/src/js/Color.js
+++ b/src/js/Color.js
@@ -36,6 +36,54 @@ axs.color.Color = function(red, green, blue, alpha) {
     this.alpha = alpha;
 };
 
+/**
+ * @constructor
+ * See https://en.wikipedia.org/wiki/YCbCr for more information.
+ * @param {Array.<number>} coords The YCbCr values as a 3 element array, in the order [luma, Cb, Cr].
+ *     All numbers are in the range [0, 1].
+ */
+axs.color.YCbCr = function(coords) {
+    /** @type {number} */
+    this.luma = this.z = coords[0];
+
+    /** @type {number} */
+    this.Cb = this.x = coords[1];
+
+    /** @type {number} */
+    this.Cr = this.y = coords[2];
+};
+
+axs.color.YCbCr.prototype = {
+    /**
+     * @param {number} scalar
+     * @return {axs.color.YCbCr} This color multiplied by the given scalar
+     */
+    multiply: function(scalar) {
+        var result = [ this.luma * scalar, this.Cb * scalar, this.Cr * scalar ];
+        return new axs.color.YCbCr(result);
+    },
+
+    /**
+     * @param {axs.color.YCbCr} other
+     * @return {axs.color.YCbCr} This plus other
+     */
+    add: function(other) {
+        var result = [ this.luma + other.luma, this.Cb + other.Cb, this.Cr + other.Cr ];
+        return new axs.color.YCbCr(result);
+    },
+
+    /**
+     * @param {axs.color.YCbCr} other
+     * @return {axs.color.YCbCr} This minus other
+     */
+    subtract: function(other) {
+        var result = [ this.luma - other.luma, this.Cb - other.Cb, this.Cr - other.Cr ];
+        return new axs.color.YCbCr(result);
+    }
+
+};
+
+
 /**
  * Calculate the contrast ratio between the two given colors. Returns the ratio
  * to 1, for example for two two colors with a contrast ratio of 21:1, this
@@ -70,8 +118,8 @@ axs.color.calculateLuminance = function(color) {
     var b = bSRGB <= 0.03928 ? bSRGB / 12.92 : Math.pow(((bSRGB + 0.055)/1.055), 2.4);
 
     return 0.2126 * r + 0.7152 * g + 0.0722 * b; */
-    var ycc = axs.color.toYCC(color);
-    return ycc[0];
+    var ycc = axs.color.toYCbCr(color);
+    return ycc.luma;
 };
 
 /**
@@ -155,27 +203,53 @@ axs.color.luminanceFromContrastRatio = function(luminance, contrast, higher) {
 };
 
 /**
- * Given a color in YCC format and a desired luminance, pick a new color with the desired luminance which is
- * a translation towards black or white of the old color.
- * @param {Array.<number>} ycc A color in YCC as an array with three elements.
- * @param {number} luminance The desired luminance
- * @return {axs.color.Color} A new color in RGB.
+ * Given a color in YCbCr format and a desired luminance, pick a new color with the desired luminance which is
+ * as close as possible to the original color.
+ * @param {axs.color.YCbCr} ycc The original color in YCbCr form.
+ * @param {number} luma The desired luminance
+ * @return {!axs.color.Color} A new color in RGB.
  */
-axs.color.translateColor = function(ycc, luminance) {
-    var oldLuminance = ycc[0];
-    if (oldLuminance > luminance)
-        var endpoint = 0;
-    else
-        var endpoint = 1;
+axs.color.translateColor = function(ycc, luma) {
+    var endpoint = (luma > ycc.luma) ? axs.color.WHITE_YCC : axs.color.BLACK_YCC;
+    var cubeFaces = (endpoint == axs.color.WHITE_YCC) ? axs.color.YCC_CUBE_FACES_WHITE
+                                                      : axs.color.YCC_CUBE_FACES_BLACK;
+
+    var a = new axs.color.YCbCr([0, ycc.Cb, ycc.Cr]);
+    var b = new axs.color.YCbCr([1, ycc.Cb, ycc.Cr]);
+    var line = { a: a, b: b };
+
+    var intersection = null;
+    for (var i = 0; i < cubeFaces.length; i++) {
+        var cubeFace = cubeFaces[i];
+        intersection = axs.color.findIntersection(line, cubeFace);
+        // If intersection within [0, 1] in Z axis, it is within the cube.
+        if (intersection.z >= 0 && intersection.z <= 1)
+            break;
+    }
+    if (!intersection) {
+        // Should never happen
+        throw "Couldn't find intersection with YCbCr color cube for Cb=" + ycc.Cb + ", Cr=" + ycc.Cr + ".";
+    }
+    if (intersection.x != ycc.x || intersection.y != ycc.y) {
+        // Should never happen
+        throw "Intersection has wrong Cb/Cr values.";
+    }
+
+    // If intersection.luma is closer to endpoint than desired luma, then luma is inside cube
+    // and we can immediately return new value.
+    if (Math.abs(endpoint.luma - intersection.luma) < Math.abs(endpoint.luma - luma)) {
+        var translatedColor = [luma, ycc.Cb, ycc.Cr];
+        return axs.color.fromYCbCrArray(translatedColor);
+    }
 
-    var d = luminance - oldLuminance;
-    var scale = 0; // d / (endpoint - oldLuminance);
+    // Otherwise, translate from intersection towards white/black such that luma is correct.
+    var dLuma = luma - intersection.luma;
+    var scale = dLuma / (endpoint.luma - intersection.luma);
+    var translatedColor = [ luma,
+                            intersection.Cb - (intersection.Cb * scale),
+                            intersection.Cr - (intersection.Cr * scale) ];
 
-    /** @type {Array.<number>} */ var translatedColor = [ luminance,
-                                                          ycc[1] - ycc[1] * scale,
-                                                          ycc[2] - ycc[2] * scale ];
-    var rgb = axs.color.fromYCC(translatedColor);
-    return rgb;
+    return axs.color.fromYCbCrArray(translatedColor);
 };
 
 /** @typedef {{fg: string, bg: string, contrast: string}} */
@@ -193,14 +267,14 @@ axs.color.suggestColors = function(bgColor, fgColor, desiredContrastRatios) {
     var fgLuminance = axs.color.calculateLuminance(fgColor);
 
     var fgLuminanceIsHigher = fgLuminance > bgLuminance;
-    var fgYCC = axs.color.toYCC(fgColor);
-    var bgYCC = axs.color.toYCC(bgColor);
+    var fgYCbCr = axs.color.toYCbCr(fgColor);
+    var bgYCbCr = axs.color.toYCbCr(bgColor);
     for (var desiredLabel in desiredContrastRatios) {
         var desiredContrast = desiredContrastRatios[desiredLabel];
 
         var desiredFgLuminance = axs.color.luminanceFromContrastRatio(bgLuminance, desiredContrast + 0.02, fgLuminanceIsHigher);
         if (desiredFgLuminance <= 1 && desiredFgLuminance >= 0) {
-            var newFgColor = axs.color.translateColor(fgYCC, desiredFgLuminance);
+            var newFgColor = axs.color.translateColor(fgYCbCr, desiredFgLuminance);
             var newContrastRatio = axs.color.calculateContrastRatio(newFgColor, bgColor);
             var suggestedColors = {};
             suggestedColors.fg = /** @type {!string} */ (axs.color.colorToString(newFgColor));
@@ -212,7 +286,7 @@ axs.color.suggestColors = function(bgColor, fgColor, desiredContrastRatios) {
 
         var desiredBgLuminance = axs.color.luminanceFromContrastRatio(fgLuminance, desiredContrast + 0.02, !fgLuminanceIsHigher);
         if (desiredBgLuminance <= 1 && desiredBgLuminance >= 0) {
-            var newBgColor = axs.color.translateColor(bgYCC, desiredBgLuminance);
+            var newBgColor = axs.color.translateColor(bgYCbCr, desiredBgLuminance);
             var newContrastRatio = axs.color.calculateContrastRatio(fgColor, newBgColor);
             var suggestedColors = {};
             suggestedColors.bg = /** @type {!string} */ (axs.color.colorToString(newBgColor));
@@ -241,12 +315,12 @@ axs.color.flattenColors = function(fgColor, bgColor) {
 };
 
 /**
- * Multiply the given color vector by the given transformation matrix.
- * @param {Array.<Array.<number>>} matrix A 3x3 conversion matrix
- * @param {Array.<number>} vector A 3-element color vector
- * @return {Array.<number>} A 3-element color vector
+ * Multiply the given vector by the given matrix.
+ * @param {Array.<Array.<number>>} matrix A 3x3 matrix
+ * @param {Array.<number>} vector A 3-element vector
+ * @return {Array.<number>} A 3-element vector
  */
-axs.color.convertColor = function(matrix, vector) {
+axs.color.multiplyMatrixVector = function(matrix, vector) {
     var a = matrix[0][0];
     var b = matrix[0][1];
     var c = matrix[0][2];
@@ -269,10 +343,11 @@ axs.color.convertColor = function(matrix, vector) {
 };
 
 /**
- * Convert a given RGB color to YCC.
+ * Convert a given RGB color to YCbCr.
  * @param {axs.color.Color} color
+ * @return {axs.color.YCbCr}
  */
-axs.color.toYCC = function(color) {
+axs.color.toYCbCr = function(color) {
     var rSRGB = color.red / 255;
     var gSRGB = color.green / 255;
     var bSRGB = color.blue / 255;
@@ -281,16 +356,24 @@ axs.color.toYCC = function(color) {
     var g = gSRGB <= 0.03928 ? gSRGB / 12.92 : Math.pow(((gSRGB + 0.055)/1.055), 2.4);
     var b = bSRGB <= 0.03928 ? bSRGB / 12.92 : Math.pow(((bSRGB + 0.055)/1.055), 2.4);
 
-    return axs.color.convertColor(axs.color.YCC_MATRIX, [r, g, b]);
+    return new axs.color.YCbCr(axs.color.multiplyMatrixVector(axs.color.YCC_MATRIX, [r, g, b]));
 };
 
 /**
- * Convert a color from a YCC color (as a vector) to an RGB color
- * @param {Array.<number>} yccColor
- * @return {axs.color.Color}
+ * @param {axs.color.YCbCr} ycc
+ * @return {!axs.color.Color}
  */
-axs.color.fromYCC = function(yccColor) {
-    var rgb = axs.color.convertColor(axs.color.INVERTED_YCC_MATRIX, yccColor);
+axs.color.fromYCbCr = function(ycc) {
+    return axs.color.fromYCbCrArray([ycc.luma, ycc.Cb, ycc.Cr]);
+};
+
+/**
+ * Convert a color from a YCbCr color (as a vector) to an RGB color
+ * @param {Array.<number>} yccArray
+ * @return {!axs.color.Color}
+ */
+axs.color.fromYCbCrArray = function(yccArray) {
+    var rgb = axs.color.multiplyMatrixVector(axs.color.INVERTED_YCC_MATRIX, yccArray);
 
     var r = rgb[0];
     var g = rgb[1];
@@ -307,12 +390,12 @@ axs.color.fromYCC = function(yccColor) {
 };
 
 /**
- * Returns an RGB to YCC conversion matrix for the given kR, kB constants.
+ * Returns an RGB to YCbCr conversion matrix for the given kR, kB constants.
  * @param {number} kR
  * @param {number} kB
  * @return {Array.<Array.<number>>}
  */
-axs.color.RGBToYCCMatrix = function(kR, kB) {
+axs.color.RGBToYCbCrMatrix = function(kR, kB) {
     return [
         [
             kR,
@@ -368,6 +451,34 @@ axs.color.invert3x3Matrix = function(matrix) {
     ], z);
 };
 
+/** @typedef {{ a: axs.color.YCbCr, b: axs.color.YCbCr }} */
+axs.color.Line;
+
+/** @typedef {{ p0: axs.color.YCbCr, p1: axs.color.YCbCr, p2: axs.color.YCbCr }} */
+axs.color.Plane;
+
+/**
+ * Find the intersection between a line and a plane using
+ * http://en.wikipedia.org/wiki/Line%E2%80%93plane_intersection#Parametric_form
+ * @param {axs.color.Line} l
+ * @param {axs.color.Plane} p
+ * @return {axs.color.YCbCr}
+ */
+axs.color.findIntersection = function(l, p) {
+    var lhs = [ l.a.x - p.p0.x, l.a.y - p.p0.y, l.a.z - p.p0.z ];
+
+    var matrix = [ [ l.a.x - l.b.x, p.p1.x - p.p0.x, p.p2.x - p.p0.x ],
+                   [ l.a.y - l.b.y, p.p1.y - p.p0.y, p.p2.y - p.p0.y ],
+                   [ l.a.z - l.b.z, p.p1.z - p.p0.z, p.p2.z - p.p0.z ] ];
+    var invertedMatrix = axs.color.invert3x3Matrix(matrix);
+
+    var tuv = axs.color.multiplyMatrixVector(invertedMatrix, lhs);
+    var t = tuv[0];
+
+    var result = l.a.add(l.b.subtract(l.a).multiply(t));
+    return result;
+};
+
 /**
  * Multiply a matrix by a scalar.
  * @param {Array.<Array.<number>>} matrix A 3x3 matrix.
@@ -376,20 +487,51 @@ axs.color.invert3x3Matrix = function(matrix) {
  */
 axs.color.scalarMultiplyMatrix = function(matrix, scalar) {
     var result = [];
-    result[0] = [];
-    result[1] = [];
-    result[2] = [];
 
-    for (var i = 0; i < 3; i++) {
-        for (var j = 0; j < 3; j++) {
-            result[i][j] = matrix[i][j] * scalar;
-        }
-    }
+    for (var i = 0; i < 3; i++)
+      result[i] = axs.color.scalarMultiplyVector(matrix[i], scalar);
 
     return result;
 };
 
+/**
+ * Multiply a vector by a scalar.
+ * @param {Array.<number>} vector
+ * @param {number} scalar
+ * @return {Array.<number>} vector
+ */
+axs.color.scalarMultiplyVector = function(vector, scalar) {
+    var result = []
+    for (var i = 0; i < vector.length; i++)
+        result[i] = vector[i] * scalar;
+    return result;
+};
+
 axs.color.kR = 0.2126;
 axs.color.kB = 0.0722;
-axs.color.YCC_MATRIX = axs.color.RGBToYCCMatrix(axs.color.kR, axs.color.kB);
+axs.color.YCC_MATRIX = axs.color.RGBToYCbCrMatrix(axs.color.kR, axs.color.kB);
 axs.color.INVERTED_YCC_MATRIX = axs.color.invert3x3Matrix(axs.color.YCC_MATRIX);
+
+axs.color.BLACK = new axs.color.Color(0, 0, 0, 1.0);
+axs.color.BLACK_YCC = axs.color.toYCbCr(axs.color.BLACK);
+axs.color.WHITE = new axs.color.Color(255, 255, 255, 1.0);
+axs.color.WHITE_YCC = axs.color.toYCbCr(axs.color.WHITE);
+axs.color.RED = new axs.color.Color(255, 0, 0, 1.0);
+axs.color.RED_YCC = axs.color.toYCbCr(axs.color.RED);
+axs.color.GREEN = new axs.color.Color(0, 255, 0, 1.0);
+axs.color.GREEN_YCC = axs.color.toYCbCr(axs.color.GREEN);
+axs.color.BLUE = new axs.color.Color(0, 0, 255, 1.0);
+axs.color.BLUE_YCC = axs.color.toYCbCr(axs.color.BLUE);
+axs.color.CYAN = new axs.color.Color(0, 255, 255, 1.0);
+axs.color.CYAN_YCC = axs.color.toYCbCr(axs.color.CYAN);
+axs.color.MAGENTA = new axs.color.Color(255, 0, 255, 1.0);
+axs.color.MAGENTA_YCC = axs.color.toYCbCr(axs.color.MAGENTA);
+axs.color.YELLOW = new axs.color.Color(255, 255, 0, 1.0);
+axs.color.YELLOW_YCC = axs.color.toYCbCr(axs.color.YELLOW);
+
+axs.color.YCC_CUBE_FACES_BLACK = [ { p0: axs.color.BLACK_YCC, p1: axs.color.RED_YCC, p2: axs.color.GREEN_YCC },
+                                   { p0: axs.color.BLACK_YCC, p1: axs.color.GREEN_YCC, p2: axs.color.BLUE_YCC },
+                                   { p0: axs.color.BLACK_YCC, p1: axs.color.BLUE_YCC, p2: axs.color.RED_YCC } ];
+axs.color.YCC_CUBE_FACES_WHITE = [ { p0: axs.color.WHITE_YCC, p1: axs.color.CYAN_YCC, p2: axs.color.MAGENTA_YCC },
+                                   { p0: axs.color.WHITE_YCC, p1: axs.color.MAGENTA_YCC, p2: axs.color.YELLOW_YCC },
+                                   { p0: axs.color.WHITE_YCC, p1: axs.color.YELLOW_YCC, p2: axs.color.CYAN_YCC } ];
diff --git a/test/index.html b/test/index.html
index ad5bfa4b..b16fc580 100644
--- a/test/index.html
+++ b/test/index.html
@@ -47,6 +47,7 @@
     <script src="./js/properties-test.js"></script>
     <script src="./js/utils-test.js"></script>
     <script src="./js/browser-utils-test.js"></script>
+    <script src="./js/color-test.js"></script>
     <script src="./js/audit-configuration-test.js"></script>
     <script src="./js/audit-rule-test.js"></script>
 	<script src="./js/audit-rules-test.js"></script>
diff --git a/test/js/color-test.js b/test/js/color-test.js
index bcb5b444..72f897df 100644
--- a/test/js/color-test.js
+++ b/test/js/color-test.js
@@ -33,7 +33,6 @@ test("Transparent foreground === no contrast.", function () {
   equal(axs.color.calculateContrastRatio({"red": 0, "green": 0, "blue": 0, "alpha": 0}, this.white_), 1);
 });
 
-
 module("parseColor");
 test("parses alpha values correctly", function() {
   var colorString = 'rgba(255, 255, 255, .47)';
@@ -52,4 +51,3 @@ test("suggests correct grey values", function() {
   deepEqual(suggestions, { AA: { bg: "#ffffff", contrast: "4.54", fg: "#767676" },
                            AAA: { bg: "#ffffff", contrast: "7.00", fg: "#595959" } });
 });
-

From e569020bedec1451312c7f041c529944ade8c9ac Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Tue, 23 Jun 2015 14:50:59 +0100
Subject: [PATCH 08/10] Add Color.js to Gruntfile

---
 Gruntfile.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gruntfile.js b/Gruntfile.js
index bb877489..c64db54a 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -18,6 +18,7 @@ module.exports = function(grunt) {
               './src/js/axs.js',
               './src/js/BrowserUtils.js',
               './src/js/Constants.js',
+              './src/js/Color.js',
               './src/js/AccessibilityUtils.js',
               './src/js/Properties.js',
               './src/js/AuditRule.js',

From 407f318f682c802645c3ef867ed97854de4b655b Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Fri, 10 Jul 2015 13:10:33 -0700
Subject: [PATCH 09/10] Bring Changelog up to date

---
 Changelog.md | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 7cb921e7..f3b2072b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,8 @@
+# Enhancements:
+* Pull color code into separate file.
+* Improve color suggestion algorithm.
+* Descend into iframes when collecting matching elements.
+
 ## 2.7.1 - 2015-06-30
 
 ## 2.7.1-rc.1 - 2015-06-23
@@ -11,8 +16,6 @@
 ### Enhancements:
 * Rework findTextAlternatives not to return non-exposed text alternatives.
 * Add Bower config (#157)
-* Pull color code into separate file.
-* Improve color suggestion algorithm.
 
 ### Bug fixes:
 * Check for any text alternatives when assessing unlabeled images (#154).

From 48b283ed84ab8544095b31c4b2052d523f9ffd8a Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Fri, 10 Jul 2015 13:20:59 -0700
Subject: [PATCH 10/10] Release v2.8.0-rc.0

---
 Changelog.md           |   2 +
 bower.json             |   2 +-
 dist/js/axs_testing.js | 348 ++++++++++++++++++++++-------------------
 package.json           |   2 +-
 4 files changed, 194 insertions(+), 160 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index f3b2072b..94712386 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,5 @@
+## 2.8.0-rc.0 - 2015-07-10
+
 # Enhancements:
 * Pull color code into separate file.
 * Improve color suggestion algorithm.
diff --git a/bower.json b/bower.json
index 603827af..e14e95cc 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "accessibility-developer-tools",
-  "version": "2.7.1",
+  "version": "2.8.0-rc.0",
   "homepage": "https://github.com/GoogleChrome/accessibility-developer-tools",
   "authors": [
     "Google"
diff --git a/dist/js/axs_testing.js b/dist/js/axs_testing.js
index 371db550..fb1671e2 100644
--- a/dist/js/axs_testing.js
+++ b/dist/js/axs_testing.js
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  *
- * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/ef4fec4549616cd69a0f0f732d43c838d8ab17eb
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/407f318f682c802645c3ef867ed97854de4b655b
  *
  * See project README for build steps.
  */
@@ -523,25 +523,166 @@ reserved:!0}], MATH:[{role:"", allowed:["presentation"]}], MENU:[{role:"toolbar"
 allowed:["application", "document", "img", "presentation"]}], OL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], OPTGROUP:[{role:"", allowed:["presentation"]}], OPTION:[{role:"option"}], OUTPUT:[{role:"status", allowed:["*"]}], PARAM:[{role:"", reserved:!0}], PICTURE:[{role:"", reserved:!0}], PROGRESS:[{role:"progressbar", allowed:["presentation"]}], SCRIPT:[{role:"", reserved:!0}], SECTION:[{role:"region", allowed:"alert alertdialog application contentinfo dialog document log marquee search status presentation".split(" ")}], 
 SELECT:[{role:"listbox"}], SOURCE:[{role:"", reserved:!0}], SPAN:[{role:"", allowed:["*"]}], STYLE:[{role:"", reserved:!0}], SVG:[{role:"", allowed:["application", "document", "img", "presentation"]}], SUMMARY:[{role:"", allowed:["presentation"]}], TABLE:[{role:"", allowed:["*"]}], TEMPLATE:[{role:"", reserved:!0}], TEXTAREA:[{role:"textbox"}], TBODY:[{role:"rowgroup", allowed:["*"]}], THEAD:[{role:"rowgroup", allowed:["*"]}], TFOOT:[{role:"rowgroup", allowed:["*"]}], TITLE:[{role:"", reserved:!0}], 
 TD:[{role:"", allowed:["*"]}], TH:[{role:"", allowed:["*"]}], TR:[{role:"", allowed:["*"]}], TRACK:[{role:"", reserved:!0}], UL:[{role:"list", allowed:"directory group listbox menu menubar tablist toolbar tree presentation".split(" ")}], VIDEO:[{role:"", allowed:["application", "presentation"]}]};
-axs.utils = {};
-axs.utils.FOCUSABLE_ELEMENTS_SELECTOR = "input:not([type=hidden]):not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href],iframe,[tabindex]";
-axs.utils.Color = function(a, b, c, d) {
+axs.color = {};
+axs.color.Color = function(a, b, c, d) {
   this.red = a;
   this.green = b;
   this.blue = c;
   this.alpha = d;
 };
-axs.utils.calculateContrastRatio = function(a, b) {
-  if (!a || !b) {
-    return null;
-  }
-  1 > a.alpha && (a = axs.utils.flattenColors(a, b));
-  var c = axs.utils.calculateLuminance(a), d = axs.utils.calculateLuminance(b);
+axs.color.YCbCr = function(a) {
+  this.luma = this.z = a[0];
+  this.Cb = this.x = a[1];
+  this.Cr = this.y = a[2];
+};
+axs.color.YCbCr.prototype = {multiply:function(a) {
+  return new axs.color.YCbCr([this.luma * a, this.Cb * a, this.Cr * a]);
+}, add:function(a) {
+  return new axs.color.YCbCr([this.luma + a.luma, this.Cb + a.Cb, this.Cr + a.Cr]);
+}, subtract:function(a) {
+  return new axs.color.YCbCr([this.luma - a.luma, this.Cb - a.Cb, this.Cr - a.Cr]);
+}};
+axs.color.calculateContrastRatio = function(a, b) {
+  1 > a.alpha && (a = axs.color.flattenColors(a, b));
+  var c = axs.color.calculateLuminance(a), d = axs.color.calculateLuminance(b);
   return (Math.max(c, d) + .05) / (Math.min(c, d) + .05);
 };
-axs.utils.luminanceRatio = function(a, b) {
+axs.color.calculateLuminance = function(a) {
+  return axs.color.toYCbCr(a).luma;
+};
+axs.color.luminanceRatio = function(a, b) {
   return (Math.max(a, b) + .05) / (Math.min(a, b) + .05);
 };
+axs.color.parseColor = function(a) {
+  var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
+  if (b) {
+    a = parseInt(b[1], 10);
+    var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
+    return new axs.color.Color(a, c, d, 1);
+  }
+  return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.color.Color(a, c, d, b)) : null;
+};
+axs.color.colorChannelToString = function(a) {
+  a = Math.round(a);
+  return 15 >= a ? "0" + a.toString(16) : a.toString(16);
+};
+axs.color.colorToString = function(a) {
+  return 1 == a.alpha ? "#" + axs.color.colorChannelToString(a.red) + axs.color.colorChannelToString(a.green) + axs.color.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
+};
+axs.color.luminanceFromContrastRatio = function(a, b, c) {
+  return c ? (a + .05) * b - .05 : (a + .05) / b - .05;
+};
+axs.color.translateColor = function(a, b) {
+  for (var c = b > a.luma ? axs.color.WHITE_YCC : axs.color.BLACK_YCC, d = c == axs.color.WHITE_YCC ? axs.color.YCC_CUBE_FACES_WHITE : axs.color.YCC_CUBE_FACES_BLACK, e = new axs.color.YCbCr([0, a.Cb, a.Cr]), f = new axs.color.YCbCr([1, a.Cb, a.Cr]), f = {a:e, b:f}, e = null, g = 0;g < d.length && !(e = axs.color.findIntersection(f, d[g]), 0 <= e.z && 1 >= e.z);g++) {
+  }
+  if (!e) {
+    throw "Couldn't find intersection with YCbCr color cube for Cb=" + a.Cb + ", Cr=" + a.Cr + ".";
+  }
+  if (e.x != a.x || e.y != a.y) {
+    throw "Intersection has wrong Cb/Cr values.";
+  }
+  if (Math.abs(c.luma - e.luma) < Math.abs(c.luma - b)) {
+    return c = [b, a.Cb, a.Cr], axs.color.fromYCbCrArray(c);
+  }
+  c = (b - e.luma) / (c.luma - e.luma);
+  c = [b, e.Cb - e.Cb * c, e.Cr - e.Cr * c];
+  return axs.color.fromYCbCrArray(c);
+};
+axs.color.suggestColors = function(a, b, c) {
+  var d = {}, e = axs.color.calculateLuminance(a), f = axs.color.calculateLuminance(b), g = f > e, h = axs.color.toYCbCr(b), k = axs.color.toYCbCr(a), m;
+  for (m in c) {
+    var l = c[m], n = axs.color.luminanceFromContrastRatio(e, l + .02, g);
+    if (1 >= n && 0 <= n) {
+      var p = axs.color.translateColor(h, n), l = axs.color.calculateContrastRatio(p, a), n = {};
+      n.fg = axs.color.colorToString(p);
+      n.bg = axs.color.colorToString(a);
+      n.contrast = l.toFixed(2);
+      d[m] = n;
+    } else {
+      l = axs.color.luminanceFromContrastRatio(f, l + .02, !g), 1 >= l && 0 <= l && (p = axs.color.translateColor(k, l), l = axs.color.calculateContrastRatio(b, p), n = {}, n.bg = axs.color.colorToString(p), n.fg = axs.color.colorToString(b), n.contrast = l.toFixed(2), d[m] = n);
+    }
+  }
+  return d;
+};
+axs.color.flattenColors = function(a, b) {
+  var c = a.alpha;
+  return new axs.color.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
+};
+axs.color.multiplyMatrixVector = function(a, b) {
+  var c = b[0], d = b[1], e = b[2];
+  return [a[0][0] * c + a[0][1] * d + a[0][2] * e, a[1][0] * c + a[1][1] * d + a[1][2] * e, a[2][0] * c + a[2][1] * d + a[2][2] * e];
+};
+axs.color.toYCbCr = function(a) {
+  var b = a.red / 255, c = a.green / 255;
+  a = a.blue / 255;
+  b = .03928 >= b ? b / 12.92 : Math.pow((b + .055) / 1.055, 2.4);
+  c = .03928 >= c ? c / 12.92 : Math.pow((c + .055) / 1.055, 2.4);
+  a = .03928 >= a ? a / 12.92 : Math.pow((a + .055) / 1.055, 2.4);
+  return new axs.color.YCbCr(axs.color.multiplyMatrixVector(axs.color.YCC_MATRIX, [b, c, a]));
+};
+axs.color.fromYCbCr = function(a) {
+  return axs.color.fromYCbCrArray([a.luma, a.Cb, a.Cr]);
+};
+axs.color.fromYCbCrArray = function(a) {
+  var b = axs.color.multiplyMatrixVector(axs.color.INVERTED_YCC_MATRIX, a), c = b[0];
+  a = b[1];
+  b = b[2];
+  c = .00303949 >= c ? 12.92 * c : 1.055 * Math.pow(c, 1 / 2.4) - .055;
+  a = .00303949 >= a ? 12.92 * a : 1.055 * Math.pow(a, 1 / 2.4) - .055;
+  b = .00303949 >= b ? 12.92 * b : 1.055 * Math.pow(b, 1 / 2.4) - .055;
+  c = Math.min(Math.max(Math.round(255 * c), 0), 255);
+  a = Math.min(Math.max(Math.round(255 * a), 0), 255);
+  b = Math.min(Math.max(Math.round(255 * b), 0), 255);
+  return new axs.color.Color(c, a, b, 1);
+};
+axs.color.RGBToYCbCrMatrix = function(a, b) {
+  return [[a, 1 - a - b, b], [-a / (2 - 2 * b), (a + b - 1) / (2 - 2 * b), (1 - b) / (2 - 2 * b)], [(1 - a) / (2 - 2 * a), (a + b - 1) / (2 - 2 * a), -b / (2 - 2 * a)]];
+};
+axs.color.invert3x3Matrix = function(a) {
+  var b = a[0][0], c = a[0][1], d = a[0][2], e = a[1][0], f = a[1][1], g = a[1][2], h = a[2][0], k = a[2][1];
+  a = a[2][2];
+  return axs.color.scalarMultiplyMatrix([[f * a - g * k, d * k - c * a, c * g - d * f], [g * h - e * a, b * a - d * h, d * e - b * g], [e * k - f * h, h * c - b * k, b * f - c * e]], 1 / (b * (f * a - g * k) - c * (a * e - g * h) + d * (e * k - f * h)));
+};
+axs.color.findIntersection = function(a, b) {
+  var c = [a.a.x - b.p0.x, a.a.y - b.p0.y, a.a.z - b.p0.z], d = axs.color.invert3x3Matrix([[a.a.x - a.b.x, b.p1.x - b.p0.x, b.p2.x - b.p0.x], [a.a.y - a.b.y, b.p1.y - b.p0.y, b.p2.y - b.p0.y], [a.a.z - a.b.z, b.p1.z - b.p0.z, b.p2.z - b.p0.z]]), c = axs.color.multiplyMatrixVector(d, c)[0];
+  return a.a.add(a.b.subtract(a.a).multiply(c));
+};
+axs.color.scalarMultiplyMatrix = function(a, b) {
+  for (var c = [], d = 0;3 > d;d++) {
+    c[d] = axs.color.scalarMultiplyVector(a[d], b);
+  }
+  return c;
+};
+axs.color.scalarMultiplyVector = function(a, b) {
+  for (var c = [], d = 0;d < a.length;d++) {
+    c[d] = a[d] * b;
+  }
+  return c;
+};
+axs.color.kR = .2126;
+axs.color.kB = .0722;
+axs.color.YCC_MATRIX = axs.color.RGBToYCbCrMatrix(axs.color.kR, axs.color.kB);
+axs.color.INVERTED_YCC_MATRIX = axs.color.invert3x3Matrix(axs.color.YCC_MATRIX);
+axs.color.BLACK = new axs.color.Color(0, 0, 0, 1);
+axs.color.BLACK_YCC = axs.color.toYCbCr(axs.color.BLACK);
+axs.color.WHITE = new axs.color.Color(255, 255, 255, 1);
+axs.color.WHITE_YCC = axs.color.toYCbCr(axs.color.WHITE);
+axs.color.RED = new axs.color.Color(255, 0, 0, 1);
+axs.color.RED_YCC = axs.color.toYCbCr(axs.color.RED);
+axs.color.GREEN = new axs.color.Color(0, 255, 0, 1);
+axs.color.GREEN_YCC = axs.color.toYCbCr(axs.color.GREEN);
+axs.color.BLUE = new axs.color.Color(0, 0, 255, 1);
+axs.color.BLUE_YCC = axs.color.toYCbCr(axs.color.BLUE);
+axs.color.CYAN = new axs.color.Color(0, 255, 255, 1);
+axs.color.CYAN_YCC = axs.color.toYCbCr(axs.color.CYAN);
+axs.color.MAGENTA = new axs.color.Color(255, 0, 255, 1);
+axs.color.MAGENTA_YCC = axs.color.toYCbCr(axs.color.MAGENTA);
+axs.color.YELLOW = new axs.color.Color(255, 255, 0, 1);
+axs.color.YELLOW_YCC = axs.color.toYCbCr(axs.color.YELLOW);
+axs.color.YCC_CUBE_FACES_BLACK = [{p0:axs.color.BLACK_YCC, p1:axs.color.RED_YCC, p2:axs.color.GREEN_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.GREEN_YCC, p2:axs.color.BLUE_YCC}, {p0:axs.color.BLACK_YCC, p1:axs.color.BLUE_YCC, p2:axs.color.RED_YCC}];
+axs.color.YCC_CUBE_FACES_WHITE = [{p0:axs.color.WHITE_YCC, p1:axs.color.CYAN_YCC, p2:axs.color.MAGENTA_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.MAGENTA_YCC, p2:axs.color.YELLOW_YCC}, {p0:axs.color.WHITE_YCC, p1:axs.color.YELLOW_YCC, p2:axs.color.CYAN_YCC}];
+axs.utils = {};
+axs.utils.FOCUSABLE_ELEMENTS_SELECTOR = "input:not([type=hidden]):not([disabled]),select:not([disabled]),textarea:not([disabled]),button:not([disabled]),a[href],iframe,[tabindex]";
 axs.utils.parentElement = function(a) {
   if (!a) {
     return null;
@@ -669,7 +810,7 @@ axs.utils.isLargeFont = function(a) {
   return !1;
 };
 axs.utils.getBgColor = function(a, b) {
-  var c = axs.utils.parseColor(a.backgroundColor);
+  var c = axs.color.parseColor(a.backgroundColor);
   if (!c) {
     return null;
   }
@@ -679,7 +820,7 @@ axs.utils.getBgColor = function(a, b) {
     if (null == d) {
       return null;
     }
-    c = axs.utils.flattenColors(c, d);
+    c = axs.color.flattenColors(c, d);
   }
   return c;
 };
@@ -689,146 +830,28 @@ axs.utils.getParentBgColor = function(a) {
   for (var c = null;b = axs.utils.parentElement(b);) {
     var d = window.getComputedStyle(b, null);
     if (d) {
-      var e = axs.utils.parseColor(d.backgroundColor);
+      var e = axs.color.parseColor(d.backgroundColor);
       if (e && (1 > d.opacity && (e.alpha *= d.opacity), 0 != e.alpha && (a.push(e), 1 == e.alpha))) {
         c = !0;
         break;
       }
     }
   }
-  c || a.push(new axs.utils.Color(255, 255, 255, 1));
+  c || a.push(new axs.color.Color(255, 255, 255, 1));
   for (b = a.pop();a.length;) {
-    c = a.pop(), b = axs.utils.flattenColors(c, b);
+    c = a.pop(), b = axs.color.flattenColors(c, b);
   }
   return b;
 };
 axs.utils.getFgColor = function(a, b, c) {
-  var d = axs.utils.parseColor(a.color);
+  var d = axs.color.parseColor(a.color);
   if (!d) {
     return null;
   }
-  1 > d.alpha && (d = axs.utils.flattenColors(d, c));
-  1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.utils.flattenColors(d, b));
+  1 > d.alpha && (d = axs.color.flattenColors(d, c));
+  1 > a.opacity && (b = axs.utils.getParentBgColor(b), d.alpha *= a.opacity, d = axs.color.flattenColors(d, b));
   return d;
 };
-axs.utils.parseColor = function(a) {
-  var b = a.match(/^rgb\((\d+), (\d+), (\d+)\)$/);
-  if (b) {
-    a = parseInt(b[1], 10);
-    var c = parseInt(b[2], 10), d = parseInt(b[3], 10);
-    return new axs.utils.Color(a, c, d, 1);
-  }
-  return (b = a.match(/^rgba\((\d+), (\d+), (\d+), (\d*(\.\d+)?)\)/)) ? (a = parseInt(b[1], 10), c = parseInt(b[2], 10), d = parseInt(b[3], 10), b = parseFloat(b[4]), new axs.utils.Color(a, c, d, b)) : null;
-};
-axs.utils.colorChannelToString = function(a) {
-  a = Math.round(a);
-  return 15 >= a ? "0" + a.toString(16) : a.toString(16);
-};
-axs.utils.colorToString = function(a) {
-  return 1 == a.alpha ? "#" + axs.utils.colorChannelToString(a.red) + axs.utils.colorChannelToString(a.green) + axs.utils.colorChannelToString(a.blue) : "rgba(" + [a.red, a.green, a.blue, a.alpha].join() + ")";
-};
-axs.utils.luminanceFromContrastRatio = function(a, b, c) {
-  return c ? (a + .05) * b - .05 : (a + .05) / b - .05;
-};
-axs.utils.translateColor = function(a, b) {
-  var c = a[0], c = (b - c) / ((c > b ? 0 : 1) - c);
-  return axs.utils.fromYCC([b, a[1] - a[1] * c, a[2] - a[2] * c]);
-};
-axs.utils.suggestColors = function(a, b, c, d) {
-  if (!axs.utils.isLowContrast(c, d, !0)) {
-    return null;
-  }
-  var e = {}, f = axs.utils.calculateLuminance(a), g = axs.utils.calculateLuminance(b), h = axs.utils.isLargeFont(d) ? 3 : 4.5, k = axs.utils.isLargeFont(d) ? 4.5 : 7, m = g > f, l = axs.utils.luminanceFromContrastRatio(f, h + .02, m), n = axs.utils.luminanceFromContrastRatio(f, k + .02, m), p = axs.utils.toYCC(b);
-  if (axs.utils.isLowContrast(c, d, !1) && 1 >= l && 0 <= l) {
-    var q = axs.utils.translateColor(p, l), l = axs.utils.calculateContrastRatio(q, a), f = {};
-    f.fg = axs.utils.colorToString(q);
-    f.bg = axs.utils.colorToString(a);
-    f.contrast = l.toFixed(2);
-    e.AA = f;
-  }
-  axs.utils.isLowContrast(c, d, !0) && 1 >= n && 0 <= n && (n = axs.utils.translateColor(p, n), l = axs.utils.calculateContrastRatio(n, a), f = {}, f.fg = axs.utils.colorToString(n), f.bg = axs.utils.colorToString(a), f.contrast = l.toFixed(2), e.AAA = f);
-  h = axs.utils.luminanceFromContrastRatio(g, h + .02, !m);
-  g = axs.utils.luminanceFromContrastRatio(g, k + .02, !m);
-  a = axs.utils.toYCC(a);
-  !("AA" in e) && axs.utils.isLowContrast(c, d, !1) && 1 >= h && 0 <= h && (k = axs.utils.translateColor(a, h), l = axs.utils.calculateContrastRatio(b, k), f = {}, f.bg = axs.utils.colorToString(k), f.fg = axs.utils.colorToString(b), f.contrast = l.toFixed(2), e.AA = f);
-  !("AAA" in e) && axs.utils.isLowContrast(c, d, !0) && 1 >= g && 0 <= g && (c = axs.utils.translateColor(a, g), l = axs.utils.calculateContrastRatio(b, c), f = {}, f.bg = axs.utils.colorToString(c), f.fg = axs.utils.colorToString(b), f.contrast = l.toFixed(2), e.AAA = f);
-  return e;
-};
-axs.utils.flattenColors = function(a, b) {
-  var c = a.alpha;
-  return new axs.utils.Color((1 - c) * b.red + c * a.red, (1 - c) * b.green + c * a.green, (1 - c) * b.blue + c * a.blue, a.alpha + b.alpha * (1 - a.alpha));
-};
-axs.utils.calculateLuminance = function(a) {
-  return axs.utils.toYCC(a)[0];
-};
-axs.utils.RGBToYCCMatrix = function(a, b) {
-  return [[a, 1 - a - b, b], [-a / (2 - 2 * b), (a + b - 1) / (2 - 2 * b), (1 - b) / (2 - 2 * b)], [(1 - a) / (2 - 2 * a), (a + b - 1) / (2 - 2 * a), -b / (2 - 2 * a)]];
-};
-axs.utils.invert3x3Matrix = function(a) {
-  var b = a[0][0], c = a[0][1], d = a[0][2], e = a[1][0], f = a[1][1], g = a[1][2], h = a[2][0], k = a[2][1];
-  a = a[2][2];
-  return axs.utils.scalarMultiplyMatrix([[f * a - g * k, d * k - c * a, c * g - d * f], [g * h - e * a, b * a - d * h, d * e - b * g], [e * k - f * h, h * c - b * k, b * f - c * e]], 1 / (b * (f * a - g * k) - c * (a * e - g * h) + d * (e * k - f * h)));
-};
-axs.utils.scalarMultiplyMatrix = function(a, b) {
-  for (var c = [[], [], []], d = 0;3 > d;d++) {
-    for (var e = 0;3 > e;e++) {
-      c[d][e] = a[d][e] * b;
-    }
-  }
-  return c;
-};
-axs.utils.kR = .2126;
-axs.utils.kB = .0722;
-axs.utils.YCC_MATRIX = axs.utils.RGBToYCCMatrix(axs.utils.kR, axs.utils.kB);
-axs.utils.INVERTED_YCC_MATRIX = axs.utils.invert3x3Matrix(axs.utils.YCC_MATRIX);
-axs.utils.convertColor = function(a, b) {
-  var c = b[0], d = b[1], e = b[2];
-  return [a[0][0] * c + a[0][1] * d + a[0][2] * e, a[1][0] * c + a[1][1] * d + a[1][2] * e, a[2][0] * c + a[2][1] * d + a[2][2] * e];
-};
-axs.utils.multiplyMatrices = function(a, b) {
-  for (var c = [[], [], []], d = 0;3 > d;d++) {
-    for (var e = 0;3 > e;e++) {
-      c[d][e] = a[d][0] * b[0][e] + a[d][1] * b[1][e] + a[d][2] * b[2][e];
-    }
-  }
-  return c;
-};
-axs.utils.toYCC = function(a) {
-  var b = a.red / 255, c = a.green / 255;
-  a = a.blue / 255;
-  b = .03928 >= b ? b / 12.92 : Math.pow((b + .055) / 1.055, 2.4);
-  c = .03928 >= c ? c / 12.92 : Math.pow((c + .055) / 1.055, 2.4);
-  a = .03928 >= a ? a / 12.92 : Math.pow((a + .055) / 1.055, 2.4);
-  return axs.utils.convertColor(axs.utils.YCC_MATRIX, [b, c, a]);
-};
-axs.utils.fromYCC = function(a) {
-  var b = axs.utils.convertColor(axs.utils.INVERTED_YCC_MATRIX, a), c = b[0];
-  a = b[1];
-  b = b[2];
-  c = .00303949 >= c ? 12.92 * c : 1.055 * Math.pow(c, 1 / 2.4) - .055;
-  a = .00303949 >= a ? 12.92 * a : 1.055 * Math.pow(a, 1 / 2.4) - .055;
-  b = .00303949 >= b ? 12.92 * b : 1.055 * Math.pow(b, 1 / 2.4) - .055;
-  c = Math.min(Math.max(Math.round(255 * c), 0), 255);
-  a = Math.min(Math.max(Math.round(255 * a), 0), 255);
-  b = Math.min(Math.max(Math.round(255 * b), 0), 255);
-  return new axs.utils.Color(c, a, b, 1);
-};
-axs.utils.scalarMultiplyMatrix = function(a, b) {
-  for (var c = [[], [], []], d = 0;3 > d;d++) {
-    for (var e = 0;3 > e;e++) {
-      c[d][e] = a[d][e] * b;
-    }
-  }
-  return c;
-};
-axs.utils.multiplyMatrices = function(a, b) {
-  for (var c = [[], [], []], d = 0;3 > d;d++) {
-    for (var e = 0;3 > e;e++) {
-      c[d][e] = a[d][0] * b[0][e] + a[d][1] * b[1][e] + a[d][2] * b[2][e];
-    }
-  }
-  return c;
-};
 axs.utils.getContrastRatioForElement = function(a) {
   var b = window.getComputedStyle(a, null);
   return axs.utils.getContrastRatioForElementWithComputedStyle(b, a);
@@ -842,7 +865,7 @@ axs.utils.getContrastRatioForElementWithComputedStyle = function(a, b) {
     return null;
   }
   var d = axs.utils.getFgColor(a, b, c);
-  return d ? axs.utils.calculateContrastRatio(d, c) : null;
+  return d ? axs.color.calculateContrastRatio(d, c) : null;
 };
 axs.utils.isNativeTextElement = function(a) {
   var b = a.tagName.toLowerCase();
@@ -1189,16 +1212,22 @@ axs.properties.getContrastRatioProperties = function(a) {
   if (!d) {
     return null;
   }
-  b.backgroundColor = axs.utils.colorToString(d);
+  b.backgroundColor = axs.color.colorToString(d);
   var e = axs.utils.getFgColor(c, a, d);
-  b.foregroundColor = axs.utils.colorToString(e);
+  b.foregroundColor = axs.color.colorToString(e);
   a = axs.utils.getContrastRatioForElementWithComputedStyle(c, a);
   if (!a) {
     return null;
   }
   b.value = a.toFixed(2);
   axs.utils.isLowContrast(a, c) && (b.alert = !0);
-  (c = axs.utils.suggestColors(d, e, a, c)) && Object.keys(c).length && (b.suggestedColors = c);
+  var f = axs.utils.isLargeFont(c) ? 3 : 4.5, c = axs.utils.isLargeFont(c) ? 4.5 : 7, g = {};
+  f > a && (g.AA = f);
+  c > a && (g.AAA = c);
+  if (!Object.keys(g).length) {
+    return b;
+  }
+  (d = axs.color.suggestColors(d, e, g)) && Object.keys(d).length && (b.suggestedColors = d);
   return b;
 };
 axs.properties.findTextAlternatives = function(a, b, c, d) {
@@ -1288,11 +1317,11 @@ axs.properties.getTextFromAriaLabelledby = function(a, b) {
 };
 axs.properties.getTextFromHostLanguageAttributes = function(a, b, c, d) {
   if (axs.browserUtils.matchSelector(a, "img") && a.hasAttribute("alt")) {
-      var e = {type:"string", valid:!0};
-      e.text = a.getAttribute("alt");
-      c ? e.unused = !0 : c = e.text;
-      b.alt = e;
-    }
+    var e = {type:"string", valid:!0};
+    e.text = a.getAttribute("alt");
+    c ? e.unused = !0 : c = e.text;
+    b.alt = e;
+  }
   if (axs.browserUtils.matchSelector(a, 'input:not([type="hidden"]):not([disabled]), select:not([disabled]), textarea:not([disabled]), button:not([disabled]), video:not([disabled])') && !d) {
     if (a.hasAttribute("id")) {
       d = document.querySelectorAll('label[for="' + a.id + '"]');
@@ -1330,8 +1359,8 @@ axs.properties.getLastWord = function(a) {
 axs.properties.getTextProperties = function(a) {
   var b = {}, c = axs.properties.findTextAlternatives(a, b, !1, !0);
   if (0 == Object.keys(b).length && ((a = axs.utils.asElement(a)) && axs.browserUtils.matchSelector(a, "img") && (b.alt = {valid:!1, errorMessage:"No alt value provided"}, a = a.src, "string" == typeof a && (c = a.split("/").pop(), b.filename = {text:c})), !c)) {
-      return null;
-    }
+    return null;
+  }
   b.hasProperties = Boolean(Object.keys(b).length);
   b.computedText = c;
   b.lastWord = axs.properties.getLastWord(c);
@@ -1527,19 +1556,20 @@ axs.AuditRule.collectMatchingElements = function(a, b, c, d) {
     }
   }
   if (e && "content" == e.localName) {
-    for (e = e.getDistributedNodes(), f = 0;f < e.length;f++) {
-      axs.AuditRule.collectMatchingElements(e[f], b, c, d);
+    for (var f = e.getDistributedNodes(), g = 0;g < f.length;g++) {
+      axs.AuditRule.collectMatchingElements(f[g], b, c, d);
     }
   } else {
     if (e && "shadow" == e.localName) {
       if (f = e, d) {
-        for (e = f.getDistributedNodes(), f = 0;f < e.length;f++) {
-          axs.AuditRule.collectMatchingElements(e[f], b, c, d);
+        for (f = f.getDistributedNodes(), g = 0;g < f.length;g++) {
+          axs.AuditRule.collectMatchingElements(f[g], b, c, d);
         }
       } else {
         console.warn("ShadowRoot not provided for", e);
       }
     }
+    e && "iframe" == e.localName && e.contentDocument && axs.AuditRule.collectMatchingElements(e.contentDocument, b, c, d);
     for (a = a.firstChild;null != a;) {
       axs.AuditRule.collectMatchingElements(a, b, c, d), a = a.nextSibling;
     }
@@ -1574,15 +1604,17 @@ axs.AuditRule.prototype.run = function(a) {
 axs.AuditRules = {};
 (function() {
   var a = {}, b = {};
+  axs.AuditRules.specs = {};
   axs.AuditRules.addRule = function(c) {
-    c = new axs.AuditRule(c);
-    if (c.code in b) {
-      throw Error('Can not add audit rule with same code: "' + c.code + '"');
+    var d = new axs.AuditRule(c);
+    if (d.code in b) {
+      throw Error('Can not add audit rule with same code: "' + d.code + '"');
     }
-    if (c.name in a) {
-      throw Error('Can not add audit rule with same name: "' + c.name + '"');
+    if (d.name in a) {
+      throw Error('Can not add audit rule with same name: "' + d.name + '"');
     }
-    a[c.name] = b[c.code] = c;
+    a[d.name] = b[d.code] = d;
+    axs.AuditRules.specs[c.name] = c;
   };
   axs.AuditRules.getRule = function(c) {
     return a[c] || b[c] || null;
diff --git a/package.json b/package.json
index 121ce66f..8f072e16 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "accessibility-developer-tools",
-  "version": "2.7.1",
+  "version": "2.8.0-rc.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/GoogleChrome/accessibility-developer-tools"