<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169427] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169427">169427</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-05-28 11:31:28 -0700 (Wed, 28 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: WebKit does not recognize ARIA 1.1 tables
https://bugs.webkit.org/show_bug.cgi?id=133163
Reviewed by Darin Adler.
The AXObjectCache code that determines which object to create based on the role needs to be token fallback aware.
Test: accessibility/table-fallback-roles-expose-element-attributes.html
* accessibility/AXObjectCache.cpp:
(WebCore::nodeHasRole):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitytablefallbackrolesexposeelementattributesexpectedtxt">trunk/LayoutTests/accessibility/table-fallback-roles-expose-element-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitytablefallbackrolesexposeelementattributeshtml">trunk/LayoutTests/accessibility/table-fallback-roles-expose-element-attributes.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsaccessibilitytablefallbackrolesexposeelementattributesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/table-fallback-roles-expose-element-attributes-expected.txt (0 => 169427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/table-fallback-roles-expose-element-attributes-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/table-fallback-roles-expose-element-attributes-expected.txt 2014-05-28 18:31:28 UTC (rev 169427)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+item1
+item1
+item1
+This tests if an element is using fallback role tokens, it will still become the 'correct' element which will expose the correct attributes.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+cellChild: AXRole: AXStaticText, AXValue: item1
+
+cellChild: AXRole: AXStaticText, AXValue: item1
+
+cellChild: AXRole: AXStaticText, AXValue: item1
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitytablefallbackrolesexposeelementattributeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/table-fallback-roles-expose-element-attributes.html (0 => 169427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/table-fallback-roles-expose-element-attributes.html (rev 0)
+++ trunk/LayoutTests/accessibility/table-fallback-roles-expose-element-attributes.html 2014-05-28 18:31:28 UTC (rev 169427)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div role="garbage grid" id="grid1">
+<div role="row"><div role="gridcell">item1</div></div>
+</div>
+
+<div role=" garbage grid " id="grid2">
+<div role="row"><div role="gridcell">item1</div></div>
+</div>
+
+<div role=" grid " id="grid3">
+<div role="row"><div role="gridcell">item1</div></div>
+</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests if an element is using fallback role tokens, it will still become the 'correct' element which will expose the correct attributes.");
+
+ if (window.accessibilityController) {
+
+ for (var k = 1; k < 4; k++) {
+ var grid = accessibilityController.accessibleElementById("grid" + k);
+ var cellChild = grid.cellForColumnAndRow(0, 0).childAtIndex(0);
+ debug("cellChild: " + cellChild.role + ", " + cellChild.stringValue + "\n");
+ }
+ }
+
+</script>
+
+<script src="../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (169426 => 169427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-05-28 18:07:31 UTC (rev 169426)
+++ trunk/Source/WebCore/ChangeLog 2014-05-28 18:31:28 UTC (rev 169427)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-05-27 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WebKit does not recognize ARIA 1.1 tables
+ https://bugs.webkit.org/show_bug.cgi?id=133163
+
+ Reviewed by Darin Adler.
+
+ The AXObjectCache code that determines which object to create based on the role needs to be token fallback aware.
+
+ Test: accessibility/table-fallback-roles-expose-element-attributes.html
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::nodeHasRole):
+
</ins><span class="cx"> 2014-05-28 Radu Stavila <stavila@adobe.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r168046): Invalid layout in multicol
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (169426 => 169427)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-05-28 18:07:31 UTC (rev 169426)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-05-28 18:31:28 UTC (rev 169427)
</span><span class="lines">@@ -254,7 +254,13 @@
</span><span class="cx"> if (!node || !node->isElementNode())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return equalIgnoringCase(toElement(node)->fastGetAttribute(roleAttr), role);
</del><ins>+ auto& roleValue = toElement(node)->fastGetAttribute(roleAttr);
+ if (role.isNull())
+ return roleValue.isEmpty();
+ if (roleValue.isEmpty())
+ return false;
+
+ return SpaceSplitString(roleValue, true).contains(role);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static PassRefPtr<AccessibilityObject> createFromRenderer(RenderObject* renderer)
</span></span></pre>
</div>
</div>
</body>
</html>