From 570e610463acb1f25944c61acedb7e36c4ef7e12 Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Mon, 15 Jun 2015 09:42:27 -0700
Subject: [PATCH 1/9] Release v2.7.1-rc.0

---
 Changelog.md           |   2 +
 bower.json             |   2 +-
 dist/js/axs_testing.js | 210 ++++++++++++++++++++---------------------
 package.json           |   2 +-
 4 files changed, 107 insertions(+), 109 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index e1290cb4..6be00e9d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,5 @@
+## 2.7.1-rc.0 - 2015-06-15
+
 ### Enhancements:
 * Rework findTextAlternatives not to return non-exposed text alternatives.
 * Add Bower config (#157)
diff --git a/bower.json b/bower.json
index 2611fe5a..060f91b1 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "accessibility-developer-tools",
-  "version": "2.7.0",
+  "version": "2.7.1-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 7236b238..32f23827 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/a33b34feb4bf5c6990c9d88f98c3c8e3115168ab
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/c4f8e2d24fc5bbba7000e8c3b9308ff24bd762ff
  *
  * 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) {
@@ -537,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) {
@@ -594,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);
@@ -614,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);
@@ -663,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);
@@ -718,7 +718,7 @@ axs.utils.parseColor = function(a) {
     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;
+  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);
@@ -762,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];
@@ -783,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++) {
@@ -848,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":
@@ -869,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) {
@@ -881,19 +881,19 @@ 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") || a.hasAttribute("id") && 0 < document.querySelectorAll('label[for="' + a.id + '"]').length) {
-    return !0;
+    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
@@ -996,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};
 };
@@ -1108,7 +1108,7 @@ axs.utils.getSelectorForAriaProperties = function(a) {
 };
 axs.utils.findDescendantsWithRole = function(a, b) {
   if (!a || !b) {
-    return [];
+    return[];
   }
   var c = axs.properties.getSelectorForRole(b);
   if (c && (c = a.querySelectorAll(c))) {
@@ -1116,7 +1116,7 @@ axs.utils.findDescendantsWithRole = function(a, b) {
       return a;
     });
   } else {
-    return [];
+    return[];
   }
   return c;
 };
@@ -1163,19 +1163,19 @@ axs.properties.hasDirectTextDescendant = function(a) {
   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!0;
       }
     }
-    return !1;
+    return!1;
   }
   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!0;
       }
     }
-    return !1;
+    return!1;
   }
   var d;
   d = a.nodeType == Node.DOCUMENT_NODE ? a : a.ownerDocument;
@@ -1287,15 +1287,11 @@ axs.properties.getTextFromAriaLabelledby = function(a, b) {
   return c;
 };
 axs.properties.getTextFromHostLanguageAttributes = function(a, b, c, d) {
-  if (axs.browserUtils.matchSelector(a, "img")) {
-    if (a.hasAttribute("alt")) {
-      var e = {type:"string", valid:!0};
-      e.text = a.getAttribute("alt");
-      c ? e.unused = !0 : c = e.text;
-      b.alt = e;
-    } else {
-      e = {valid:!1, errorMessage:"No alt value provided"}, b.alt = e, e = a.src, "string" == typeof e && (c = e.split("/").pop(), b.filename = {text:c});
-    }
+  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;
   }
   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")) {
@@ -1332,18 +1328,13 @@ axs.properties.getLastWord = function(a) {
   return a.substring(b > c ? b : c);
 };
 axs.properties.getTextProperties = function(a) {
-  var b = {};
-  a = axs.properties.findTextAlternatives(a, b, !1, !0);
-  if (0 == Object.keys(b).length) {
-    if (!a) {
-      return null;
-    }
-    b.hasProperties = !1;
-  } else {
-    b.hasProperties = !0;
+  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;
   }
-  b.computedText = a;
-  b.lastWord = axs.properties.getLastWord(a);
+  b.hasProperties = Boolean(Object.keys(b).length);
+  b.computedText = c;
+  b.lastWord = axs.properties.getLastWord(c);
   return b;
 };
 axs.properties.getAriaProperties = function(a) {
@@ -1417,7 +1408,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);
@@ -1454,10 +1445,10 @@ axs.properties.getAllProperties = function(a) {
     return d;
   }
   axs.properties.getImplicitRole = function(b) {
-    return (b = a(b)) ? b.role : "";
+    return(b = a(b)) ? b.role : "";
   };
   axs.properties.canTakeAriaAttributes = function(b) {
-    return (b = a(b)) ? !b.reserved : !0;
+    return(b = a(b)) ? !b.reserved : !0;
   };
 })();
 axs.properties.getNativelySupportedAttributes = function(a) {
@@ -1560,7 +1551,7 @@ 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 (var f = 0;f < d.length && !(null != c && e.length >= c);f++) {
     var g = d[f], h;
@@ -1744,7 +1735,7 @@ axs.Audit.accessibilityErrorMessage = function(a) {
 };
 goog.exportSymbol("axs.Audit.accessibilityErrorMessage", axs.Audit.accessibilityErrorMessage);
 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);
+  return!axs.properties.canTakeAriaAttributes(a);
 }, test:function(a) {
   return null !== axs.properties.getAriaProperties(a);
 }, code:"AX_ARIA_12"});
@@ -1760,31 +1751,31 @@ axs.AuditRules.addRule({name:"ariaRoleNotScoped", heading:"Elements with ARIA ro
 }, test:function(a) {
   var b = axs.utils.getRoles(a);
   if (!b || !b.applied) {
-    return !1;
+    return!1;
   }
   b = b.applied.details.scope;
   if (!b || 0 === b.length) {
-    return !1;
+    return!1;
   }
   for (var c = a;c = c.parentNode;) {
     var d = axs.utils.getRoles(c, !0);
     if (d && d.applied && 0 <= b.indexOf(d.applied.name)) {
-      return !1;
+      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.applied && 0 <= b.indexOf(d.applied.name)) {
-        return !1;
+        return!1;
       }
     }
   }
-  return !0;
+  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;
+  return!a.querySelectorAll("[controls]").length && 3 < a.duration;
 }, code:"AX_AUDIO_01"});
 (function() {
   var a = /^aria\-/;
@@ -1792,19 +1783,19 @@ axs.AuditRules.addRule({name:"audioWithoutControls", heading:"Audio elements sho
     b = b.attributes;
     for (var c = 0, d = b.length;c < d;c++) {
       if (a.test(b[c].name)) {
-        return !0;
+        return!0;
       }
     }
-    return !1;
+    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!0;
       }
     }
-    return !1;
+    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) {
@@ -1816,30 +1807,30 @@ axs.AuditRules.addRule({name:"badAriaAttributeValue", heading:"ARIA state and pr
     if (a.hasAttribute(c)) {
       var d = a.getAttribute(c);
       if (!axs.utils.getAriaPropertyValue(c, d, a).valid) {
-        return !0;
+        return!0;
       }
     }
   }
-  return !1;
+  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;
+  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;
+    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"});
@@ -1848,40 +1839,45 @@ axs.AuditRules.addRule({name:"duplicateId", heading:"An element's ID must be uni
 }, test:function(a) {
   var b = a.id;
   if (!b) {
-    return !1;
+    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 (var b = axs.utils.parentElement(a);null != b;b = axs.utils.parentElement(b)) {
     if (axs.utils.elementIsAriaWidget(b)) {
-      return !1;
+      return!1;
     }
   }
   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);
+  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) {
+axs.AuditRules.addRule({name:"imagesWithoutAltText", heading:"Images should have a text alternative or presentational role", 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");
+  if (a.hasAttribute("alt") && "" == a.alt || "presentation" == a.getAttribute("role")) {
+    return!1;
+  }
+  var b = {};
+  axs.properties.findTextAlternatives(a, b);
+  return 0 == Object.keys(b).length ? !0 : !1;
 }, 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");
@@ -1889,7 +1885,7 @@ axs.AuditRules.addRule({name:"linkWithUnclearPurpose", heading:"The purpose of e
   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;
+      return!0;
     }
   }
   c = c.stopwords || "click tap go here learn more this page link about".split(" ");
@@ -1897,36 +1893,36 @@ axs.AuditRules.addRule({name:"linkWithUnclearPurpose", heading:"The purpose of e
   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!0;
     }
   }
-  return !1;
+  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);
+  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;
+  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);
+  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);
@@ -1948,11 +1944,11 @@ axs.AuditRules.addRule({name:"nonExistentAriaRelatedElement", heading:"ARIA attr
     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!0;
       }
     }
   }
-  return !1;
+  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();
@@ -1965,13 +1961,13 @@ axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements w
 }, 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)) && 0 > axs.properties.getNativelySupportedAttributes(a).indexOf(e)) {
-        return !0;
+        return!0;
       }
     }
   }
@@ -1980,7 +1976,7 @@ axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements w
   function a(a) {
     a = axs.utils.getRoles(a);
     if (!a || !a.applied) {
-      return [];
+      return[];
     }
     a = a.applied;
     return a.valid ? a.details.mustcontain || [] : [];
@@ -1989,12 +1985,12 @@ axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements w
     return axs.browserUtils.matchSelector(b, "[role]") ? 0 < a(b).length : !1;
   }, test:function(b) {
     if ("true" === b.getAttribute("aria-busy")) {
-      return !1;
+      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;
+        return!1;
       }
     }
     b = axs.utils.getIdReferents("aria-owns", b);
@@ -2002,25 +1998,25 @@ axs.AuditRules.addRule({name:"requiredAriaAttributeMissing", heading:"Elements w
       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;
+            return!1;
           }
         }
       }
     }
-    return !0;
+    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;
+    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;
+  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);
@@ -2034,17 +2030,17 @@ axs.AuditRules.addRule({name:"unfocusableElementsWithOnClick", heading:"Elements
       if (a.test(g)) {
         var h = g.replace(a, "");
         if (axs.constants.ARIA_PROPERTIES.hasOwnProperty(h) && !(g in d)) {
-          return !0;
+          return!0;
         }
       }
     }
-    return !1;
+    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;
+  return!a.querySelectorAll("track[kind=captions]").length;
 }, code:"AX_VIDEO_01"});
 
 
diff --git a/package.json b/package.json
index c06f6ff5..a2ed0baa 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "accessibility-developer-tools",
-  "version": "2.7.0",
+  "version": "2.7.1-rc.0",
   "repository": {
     "type": "git",
     "url": "http://github.com/GoogleChrome/accessibility-developer-tools"

From 561e70254126fb8dd6e31da88994a6dee6a14db5 Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Mon, 15 Jun 2015 12:48:44 -0700
Subject: [PATCH 2/9] Move gh_repo.coffee to pre-existing scripts/ directory

---
 Gruntfile.js                         | 2 +-
 {src/util => scripts}/gh_repo.coffee | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {src/util => scripts}/gh_repo.coffee (100%)

diff --git a/Gruntfile.js b/Gruntfile.js
index e13ff852..4313417b 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -69,7 +69,7 @@ module.exports = function(grunt) {
     coffee: {
       compile: {
         files: {
-          '.tmp/util/gh_repo.js': 'src/util/gh_repo.coffee'
+          '.tmp/util/gh_repo.js': 'scripts/gh_repo.coffee'
         }
       }
     },
diff --git a/src/util/gh_repo.coffee b/scripts/gh_repo.coffee
similarity index 100%
rename from src/util/gh_repo.coffee
rename to scripts/gh_repo.coffee

From 6c0ba1325fb95d9de8b87ee2989d1d8f513b483a Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Mon, 22 Jun 2015 15:45:17 +0100
Subject: [PATCH 3/9] Don't clean dist/ unless copying to dist

---
 Gruntfile.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/Gruntfile.js b/Gruntfile.js
index 4313417b..bb877489 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -53,7 +53,8 @@ module.exports = function(grunt) {
     },
 
     clean: {
-      all: ['.tmp', 'dist']
+      local: ['.tmp'],
+      dist: ['dist']
     },
 
     bump: {
@@ -220,6 +221,7 @@ module.exports = function(grunt) {
       'prompt:gh-release',
       'build',
       'test:unit',
+      'clean:dist',
       'copy:dist',
       'bump-only:' + releaseType,
       'changelog:' + releaseType,
@@ -237,9 +239,9 @@ module.exports = function(grunt) {
     grunt.task.run('git-describe');
   });
 
-  grunt.registerTask('build', ['clean:all', 'save-revision', 'closurecompiler:minify']);
+  grunt.registerTask('build', ['clean:local', 'save-revision', 'closurecompiler:minify']);
   grunt.registerTask('test:unit', ['qunit']);
-  grunt.registerTask('dist', ['build', 'copy:dist']);
+  grunt.registerTask('dist', ['clean:dist', 'build', 'copy:dist']);
   grunt.registerTask('travis', ['closurecompiler:minify', 'test:unit']);
   grunt.registerTask('default', ['build', 'test:unit']);
 };

From a3193c1726d245a4fb7bccff44a8d6493bf19f8e Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Mon, 22 Jun 2015 15:36:07 +0100
Subject: [PATCH 4/9] Fix hidden case for
 FocusableElementNotVisibleAndNotAriaHidden

---
 ...usableElementNotVisibleAndNotAriaHidden.js |  3 +-
 ...ot-visible-not-aria-hidden-test-browser.js | 47 +++++++++++++++++++
 ...lement-not-visible-not-aria-hidden-test.js | 22 +--------
 test/gui-browser.html                         |  2 +-
 test/index.html                               |  2 +
 5 files changed, 54 insertions(+), 22 deletions(-)
 create mode 100644 test/audits/focusable-element-not-visible-not-aria-hidden-test-browser.js

diff --git a/src/audits/FocusableElementNotVisibleAndNotAriaHidden.js b/src/audits/FocusableElementNotVisibleAndNotAriaHidden.js
index f2726ac6..a1e601f1 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 textAlternatives = axs.properties.findTextAlternatives(element, {});
+        if (!textAlternatives || textAlternatives.trim() === '')
             return false;
 
         return true;
diff --git a/test/audits/focusable-element-not-visible-not-aria-hidden-test-browser.js b/test/audits/focusable-element-not-visible-not-aria-hidden-test-browser.js
new file mode 100644
index 00000000..d399474c
--- /dev/null
+++ b/test/audits/focusable-element-not-visible-not-aria-hidden-test-browser.js
@@ -0,0 +1,47 @@
+// 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.
+
+module('FocusableElementNotVisibleAndNotAriaHiddenBrowser', {
+  setup: function() {
+    var fixture = document.createElement('div');
+    document.getElementById('qunit-fixture').appendChild(fixture);
+
+    this.fixture_ = fixture;
+    document.getElementById('qunit-fixture').style.top = 0;
+    document.getElementById('qunit-fixture').style.left = 0;
+  },
+  teardown: function() {
+    document.getElementById('qunit-fixture').style.removeProperty('top');
+    document.getElementById('qunit-fixture').style.removeProperty('left');
+  }
+});
+
+test('a focusable element that is hidden but shown on focus passes the audit', function() {
+  var style = document.createElement('style');
+  var skipLink = document.createElement('a');
+
+  skipLink.href = '#main';
+  skipLink.id = 'skip';
+  skipLink.textContent = 'Skip to content';
+
+  style.appendChild(document.createTextNode("a#skip { position:fixed; top: -1000px; left: -1000px }" +
+                                            "a#skip:focus, a#skip:active { top: 10px; left: 10px }"));
+  this.fixture_.appendChild(style);
+  this.fixture_.appendChild(skipLink);
+
+  var rule = axs.AuditRules.getRule('focusableElementNotVisibleAndNotAriaHidden');
+  deepEqual(
+    rule.run({scope: this.fixture_}),
+    { elements: [], result: axs.constants.AuditResult.PASS });
+});
diff --git a/test/audits/focusable-element-not-visible-not-aria-hidden-test.js b/test/audits/focusable-element-not-visible-not-aria-hidden-test.js
index 8a798036..6d40f0b7 100644
--- a/test/audits/focusable-element-not-visible-not-aria-hidden-test.js
+++ b/test/audits/focusable-element-not-visible-not-aria-hidden-test.js
@@ -51,25 +51,6 @@ test('a focusable element that is hidden fails the audit', function() {
   );
 });
 
-test('a focusable element that is hidden but shown on focus passes the audit', function() {
-  var style = document.createElement('style');
-  var skipLink = document.createElement('a');
-
-  skipLink.href = '#main';
-  skipLink.id = 'skip';
-  skipLink.textContent = 'Skip to content';
-
-  style.appendChild(document.createTextNode("a#skip { position:fixed; top: -1000px; left: -1000px }" +
-                                            "a#skip:focus, a#skip:active { top: 10px; left: 10px }"));
-  this.fixture_.appendChild(style);
-  this.fixture_.appendChild(skipLink);
-
-  var rule = axs.AuditRules.getRule('focusableElementNotVisibleAndNotAriaHidden');
-  deepEqual(
-    rule.run({scope: this.fixture_}),
-    { elements: [], result: axs.constants.AuditResult.PASS });
-});
-
 test('an element with negative tabindex and empty computed text is ignored', function() {
   var emptyDiv = document.createElement('div');
   emptyDiv.tabIndex = '-1';
@@ -78,5 +59,6 @@ test('an element with negative tabindex and empty computed text is ignored', fun
   var rule = axs.AuditRules.getRule('focusableElementNotVisibleAndNotAriaHidden');
   deepEqual(
     rule.run({scope: this.fixture_}),
-    { elements: [], result: axs.constants.AuditResult.NA });
+    { result: axs.constants.AuditResult.NA });
 });
+
diff --git a/test/gui-browser.html b/test/gui-browser.html
index 19de8a0f..e85911a6 100644
--- a/test/gui-browser.html
+++ b/test/gui-browser.html
@@ -18,7 +18,7 @@
     <script src="../src/js/Audit.js"></script>
     <script src="../src/audits/FocusableElementNotVisibleAndNotAriaHidden.js"></script>
 <!-- Tests -->
-    <script src="./audits/focusable-element-not-visible-not-aria-hidden-test.js"></script>
+    <script src="./audits/focusable-element-not-visible-not-aria-hidden-test-browser.js"></script>
     <script src="./js/gui-utils-test.js"></script>
   </head>
   <body>
diff --git a/test/index.html b/test/index.html
index d142dc11..f08f42d6 100644
--- a/test/index.html
+++ b/test/index.html
@@ -25,6 +25,7 @@
     <script src="../src/audits/BadAriaRole.js"></script>
     <script src="../src/audits/ControlsWithoutLabel.js"></script>
     <script src="../src/audits/DuplicateId.js"></script>
+    <script src="../src/audits/FocusableElementNotVisibleAndNotAriaHidden.js"></script>
     <script src="../src/audits/ImageWithoutAltText.js"></script>
     <script src="../src/audits/LinkWithUnclearPurpose.js"></script>
     <script src="../src/audits/LowContrast.js"></script>
@@ -57,6 +58,7 @@
     <script src="./audits/controls-without-label-test.js"></script>
     <script src="./audits/duplicate-id-test.js"></script>
     <script src="./audits/image-without-alt-text-test.js"></script>
+    <script src="./audits/focusable-element-not-visible-not-aria-hidden-test.js"></script>
     <script src="./audits/link-with-unclear-purpose.js"></script>
     <script src="./audits/low-contrast-test.js"></script>
     <script src="./audits/main-role-on-inappropriate-element-test.js"></script>

From 91ec7093ac31a45c6b3611e65e08ef82ecdc11d1 Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Tue, 23 Jun 2015 10:14:23 +0100
Subject: [PATCH 5/9] Update Changelog

---
 Changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Changelog.md b/Changelog.md
index 6be00e9d..b33d001d 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,7 @@
+### Bug fixes:
+
+* Check for null `textAlternatives` in `FocusableElementNotVisibleAndNotAriaHidden`'s `relevantElementMatcher` method.
+
 ## 2.7.1-rc.0 - 2015-06-15
 
 ### Enhancements:

From ef4fec4549616cd69a0f0f732d43c838d8ab17eb Mon Sep 17 00:00:00 2001
From: Alice Boxhall <aboxhall@chromium.org>
Date: Tue, 23 Jun 2015 10:15:47 +0100
Subject: [PATCH 6/9] Release v2.7.1-rc.1

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

diff --git a/Changelog.md b/Changelog.md
index b33d001d..b6c34920 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,3 +1,5 @@
+## 2.7.1-rc.1 - 2015-06-23
+
 ### Bug fixes:
 
 * Check for null `textAlternatives` in `FocusableElementNotVisibleAndNotAriaHidden`'s `relevantElementMatcher` method.
diff --git a/bower.json b/bower.json
index 060f91b1..7dfacb9e 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "accessibility-developer-tools",
-  "version": "2.7.1-rc.0",
+  "version": "2.7.1-rc.1",
   "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 32f23827..760460a7 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/c4f8e2d24fc5bbba7000e8c3b9308ff24bd762ff
+ * Generated from http://github.com/GoogleChrome/accessibility-developer-tools/tree/91ec7093ac31a45c6b3611e65e08ef82ecdc11d1
  *
  * See project README for build steps.
  */
@@ -1856,7 +1856,7 @@ axs.AuditRules.addRule({name:"focusableElementNotVisibleAndNotAriaHidden", headi
       return!1;
     }
   }
-  return "" === axs.properties.findTextAlternatives(a, {}).trim() ? !1 : !0;
+  return(a = axs.properties.findTextAlternatives(a, {})) && "" !== a.trim() ? !0 : !1;
 }, test:function(a) {
   if (axs.utils.isElementOrAncestorHidden(a)) {
     return!1;
diff --git a/package.json b/package.json
index a2ed0baa..6d07d818 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "accessibility-developer-tools",
-  "version": "2.7.1-rc.0",
+  "version": "2.7.1-rc.1",
   "repository": {
     "type": "git",
     "url": "http://github.com/GoogleChrome/accessibility-developer-tools"

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 7/9] 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 8/9] 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 9/9] 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',