<!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>[185355] tags/Safari-601.1.34.2</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/185355">185355</a></dd>
<dt>Author</dt> <dd>bshafiei@apple.com</dd>
<dt>Date</dt> <dd>2015-06-08 22:29:04 -0700 (Mon, 08 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/185335">r185335</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#tagsSafari6011342LayoutTestsChangeLog">tags/Safari-601.1.34.2/LayoutTests/ChangeLog</a></li>
<li><a href="#tagsSafari6011342LayoutTestsaccessibilitylistdetectionexpectedtxt">tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection-expected.txt</a></li>
<li><a href="#tagsSafari6011342LayoutTestsaccessibilitylistdetectionhtml">tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection.html</a></li>
<li><a href="#tagsSafari6011342LayoutTestsplatformgtkaccessibilitylistdetectionexpectedtxt">tags/Safari-601.1.34.2/LayoutTests/platform/gtk/accessibility/list-detection-expected.txt</a></li>
<li><a href="#tagsSafari6011342LayoutTestsplatformwinTestExpectations">tags/Safari-601.1.34.2/LayoutTests/platform/win/TestExpectations</a></li>
<li><a href="#tagsSafari6011342SourceWebCoreChangeLog">tags/Safari-601.1.34.2/Source/WebCore/ChangeLog</a></li>
<li><a href="#tagsSafari6011342SourceWebCoreaccessibilityAccessibilityListcpp">tags/Safari-601.1.34.2/Source/WebCore/accessibility/AccessibilityList.cpp</a></li>
<li><a href="#tagsSafari6011342SourceWebCoreaccessibilityAccessibilityListh">tags/Safari-601.1.34.2/Source/WebCore/accessibility/AccessibilityList.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#tagsSafari6011342LayoutTestsaccessibilitylistdetection2expectedtxt">tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection2-expected.txt</a></li>
<li><a href="#tagsSafari6011342LayoutTestsaccessibilitylistdetection2html">tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection2.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="tagsSafari6011342LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.34.2/LayoutTests/ChangeLog (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/LayoutTests/ChangeLog 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/LayoutTests/ChangeLog 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-06-08 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r185335.
+
+ 2015-06-08 Chris Fleizach <cfleizach@apple.com>
+
+ AX: improve list heuristics (presentational use versus actual lists)
+ https://bugs.webkit.org/show_bug.cgi?id=134187
+
+ Unreviewed. Rolling this change out temporarily.
+
+ * accessibility/list-detection-expected.txt:
+ * accessibility/list-detection.html:
+ * accessibility/list-detection2-expected.txt: Removed.
+ * accessibility/list-detection2.html: Removed.
+ * platform/gtk/accessibility/list-detection-expected.txt:
+ * platform/win/TestExpectations:
+
</ins><span class="cx"> 2015-06-04 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r185187.
</span></span></pre></div>
<a id="tagsSafari6011342LayoutTestsaccessibilitylistdetectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection-expected.txt (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection-expected.txt 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection-expected.txt 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> PASS axElement.role == 'AXRole: AXList' is true
</span><span class="cx">
</span><span class="cx">
</span><del>-Unordered list with more than 1 item and no style is not a list.
-PASS axElement.role == 'AXRole: AXList' is false
</del><ins>+Unordered list with more than 1 item and no style is a list.
+PASS axElement.role == 'AXRole: AXList' is true
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> Unordered list with 1 item and no style is not list.
</span></span></pre></div>
<a id="tagsSafari6011342LayoutTestsaccessibilitylistdetectionhtml"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection.html (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection.html 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection.html 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> <li>item</li>
</span><span class="cx"> </ul>
</span><span class="cx">
</span><del>-<ul id="list9" style="list-style-type: none;" test-description="Unordered list with more than 1 item and no style is not a list." is-list="false">
</del><ins>+<ul id="list9" style="list-style-type: none;" test-description="Unordered list with more than 1 item and no style is a list." is-list="true">
</ins><span class="cx"> <li>item</li>
</span><span class="cx"> <li>item</li>
</span><span class="cx"> </ul>
</span></span></pre></div>
<a id="tagsSafari6011342LayoutTestsaccessibilitylistdetection2expectedtxt"></a>
<div class="delfile"><h4>Deleted: tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection2-expected.txt (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection2-expected.txt 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection2-expected.txt 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -1,25 +0,0 @@
</span><del>-This tests that heurisitics for determining meaningful lists versus presentational lists result in the same computed role, regardless of platform.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-PASS: ul[role="list"] w/ explicit role and displayed inline -> list.
-PASS: ul[role="list"] w/ explicit role but no markers -> list.
-PASS: ul w/ default list markers -> list.
-PASS: ol w/ default list counters -> list.
-PASS: ul w/ list-style-image -> list.
-PASS: ul w/ image content on ::before -> list.
-PASS: ul w/ image content on inline ::before -> list.
-PASS: ul w/ bullet content on ::before -> list.
-PASS: ul w/ bullet content on inline ::before -> list.
-PASS: ol w/ counter content on ::before -> list.
-PASS: ol w/ counter content on inline ::before -> list.
-PASS: ul w/ background image (NOT A LIST) -> group.
-PASS: ul w/ background on ::before (NOT A LIST) -> group.
-PASS: ul w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST) -> group.
-PASS: ol w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST) -> group.
-PASS: ul w/o explicit role and no markers (NOT A LIST) -> group.
-
</del></span></pre></div>
<a id="tagsSafari6011342LayoutTestsaccessibilitylistdetection2html"></a>
<div class="delfile"><h4>Deleted: tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection2.html (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection2.html 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/LayoutTests/accessibility/list-detection2.html 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -1,203 +0,0 @@
</span><del>-<!DOCTYPE HTML>
-<html>
-<head>
- <title>List; presentation heuristics</title>
- <meta charset="utf-8">
- <style type="text/css">
- html, body {
- font-size: 100%;
- }
- h1 {
- font-size: 1em;
- }
- .inline, .inline li {
- display: inline;
- }
- .nomarkers {
- list-style: none;
- }
- .imagemarkers {
- list-style-image: url(data:image/gif;base64,R0lGODlhEAARAJECAOHh4UpKSgAAAAAAACH5BAEAAAIALAAAAAAQABEAAAIllB8Zx63b4otSUWcvyuz5D4biSD7AiZroWSXa5r7CJNOvra1RAQA7);
- }
- .imagemarkersbefore li::before {
- content: url(data:image/gif;base64,R0lGODlhEAARAJECAOHh4UpKSgAAAAAAACH5BAEAAAIALAAAAAAQABEAAAIllB8Zx63b4otSUWcvyuz5D4biSD7AiZroWSXa5r7CJNOvra1RAQA7) " ";
- }
- .bulletmarkersbefore li::before {
- content: "• ";
- }
- .countermarkersbefore {
- counter-reset: number;
- list-style-type: none;
- }
- .countermarkersbefore li::before {
- counter-increment: number;
- content: counters(number,".") ". ";
- }
- .backgroundmarkers li {
- padding-left: 30px;
- background: transparent url(data:image/gif;base64,R0lGODlhEAARAJECAOHh4UpKSgAAAAAAACH5BAEAAAIALAAAAAAQABEAAAIllB8Zx63b4otSUWcvyuz5D4biSD7AiZroWSXa5r7CJNOvra1RAQA7) left center no-repeat;
- }
- .backgroundmarkersbefore li::before {
- display: inline-block;
- content: " ";
- width: 17px;
- height: 17px;
- background: transparent url(data:image/gif;base64,R0lGODlhEAARAJECAOHh4UpKSgAAAAAAACH5BAEAAAIALAAAAAAQABEAAAIllB8Zx63b4otSUWcvyuz5D4biSD7AiZroWSXa5r7CJNOvra1RAQA7) left center no-repeat;
- }
-</style>
-</head>
-<body onload="runTest();">
-<script src="../resources/js-test-pre.js"></script>
-
-<div id="examples">
-
- <!-- @data-role is the expectation -->
-
- <h1>list because of explicit role, despite style and lack of list markers</h1>
- <ul role="list" data-role="list" class="ex inline" data-note=" w/ explicit role and displayed inline">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
- <ul role="list" data-role="list" class="ex nomarkers" data-note=" w/ explicit role but no markers">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
-
- <h1>list because of rendered list markers (exposed as AXListMarker)</h1>
- <ul data-role="list" class="ex" data-note=" w/ default list markers">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
- <ol data-role="list" class="ex" data-note=" w/ default list counters">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ol>
- <ul data-role="list" class="ex imagemarkers" data-note=" w/ list-style-image">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
-
- <h1>list because these list markers consist of CSS-generated content on ::before pseudo element. Note: WebKit is not exposing these as AXListMarker; need another bug for that.</h1>
- <ul data-role="list" class="ex nomarkers imagemarkersbefore" data-note=" w/ image content on ::before">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
- <ul data-role="list" class="ex nomarkers inline imagemarkersbefore" data-note=" w/ image content on inline ::before">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
- <ul data-role="list" class="ex nomarkers bulletmarkersbefore" data-note=" w/ bullet content on ::before">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
- <ul data-role="list" class="ex nomarkers inline bulletmarkersbefore" data-note=" w/ bullet content on inline ::before">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
- <ol data-role="list" class="ex nomarkers countermarkersbefore" data-note=" w/ counter content on ::before">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ol>
- <ol data-role="list" class="ex nomarkers inline countermarkersbefore" data-note=" w/ counter content on inline ::before">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ol>
-
- <p>Since many web pages suffer from "list-itis" and some users have noted that they don't want to hear about so many lists, any UL or OL that does not match one of the above heuristics should not be exposed as a list. Chances are that they are just presentational lists using the elements for the sake of a styling hook.</p>
-
-
- <h1>EXPLICIT FAILURE CASES: These next examples are <strong>NOT</strong> lists because these "list markers" are faked as background images. One is even a background image on a ::before pseudo-element, but that does not count as a listmarker. List markers should only be inferred by the <code>content</code> property or the <code>list-style</code> properties.</h1>
- <ul data-role="group" class="ex nomarkers backgroundmarkers" data-note=" w/ background image (NOT A LIST)">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
- <ul data-role="group" class="ex nomarkers backgroundmarkersbefore" data-note=" w/ background on ::before (NOT A LIST)">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
-
- <h1>EXPLICIT FAILURE CASES: These next examples are <strong>NOT</strong> there is no explicit role or any style or list markers to indicate this is actually intended as a list.</h1>
- <ul data-role="group" class="ex inline" data-note=" w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST)">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
- <ol data-role="group" class="ex inline" data-note=" w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST)">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ol>
- <ul data-role="group" class="ex nomarkers" data-note=" w/o explicit role and no markers (NOT A LIST)">
- <li>foo</li>
- <li>bar</li>
- <li>baz</li>
- </ul>
-
-
-</div>
-
-<div id="console"></div>
-<script>
-function runTest() {
- if (window.testRunner && window.accessibilityController) {
- description("This tests that heurisitics for determining meaningful lists versus presentational lists result in the same computed role, regardless of platform.")
- var examples = document.querySelectorAll(".ex");
- var el, contentAttrRoleString, axElement, computedAriaRole, output, expectedRole, expectation, result, note;
- for (var i = 0, c = examples.length; i < c; i++) {
- el = examples[i];
- el.id = "ex" + i
-
- axElement = accessibilityController.accessibleElementById(el.id);
- if (!axElement)
- continue;
-
- computedAriaRole = axElement.computedRoleString;
-
- contentAttrRoleString = el.getAttribute("role");
- note = el.getAttribute("data-note")
- output = el.tagName.toLowerCase() + (contentAttrRoleString ? ("[role=\""+contentAttrRoleString+"\"]") : "") + (note ? note : "");
- output += " -> ";
- output += computedAriaRole;
- output += ". ";
-
- expectedRole = "";
- if (el.hasAttribute("data-role")) {
- expectedRole = el.getAttribute("data-role");
- }
-
- expectation = expectedRole;
- matchedResults = (computedAriaRole == expectedRole)
-
- result = document.getElementById('console');
- if (matchedResults) {
- result.innerText += "PASS: " + output + "\n";
- } else {
- result.innerText += "FAIL: " + output + "Expected: " + expectation + ".\n";
- }
- }
-
- // Once tests are complete, hide all the example markup.
- examples = document.querySelectorAll(".ex, #examples");
- for (var i = 0, c = examples.length; i < c; i++)
- examples[i].style.display = "none";
- }
-}
-</script>
-<script src="../resources/js-test-post.js"></script>
-</body>
-</html>
-
-
</del></span></pre></div>
<a id="tagsSafari6011342LayoutTestsplatformgtkaccessibilitylistdetectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.34.2/LayoutTests/platform/gtk/accessibility/list-detection-expected.txt (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/LayoutTests/platform/gtk/accessibility/list-detection-expected.txt 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/LayoutTests/platform/gtk/accessibility/list-detection-expected.txt 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -35,8 +35,8 @@
</span><span class="cx"> PASS axElement.role == 'AXRole: AXList' is true
</span><span class="cx">
</span><span class="cx">
</span><del>-Unordered list with more than 1 item and no style is not a list.
-PASS axElement.role == 'AXRole: AXList' is false
</del><ins>+Unordered list with more than 1 item and no style is a list.
+PASS axElement.role == 'AXRole: AXList' is true
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> Unordered list with 1 item and no style is not list.
</span></span></pre></div>
<a id="tagsSafari6011342LayoutTestsplatformwinTestExpectations"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.34.2/LayoutTests/platform/win/TestExpectations (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/LayoutTests/platform/win/TestExpectations 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/LayoutTests/platform/win/TestExpectations 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -1334,10 +1334,8 @@
</span><span class="cx"> webkit.org/b/140798 [ Debug ] accessibility/legend-children-are-visible.html [ Skip ] # Debug assertion
</span><span class="cx"> webkit.org/b/140798 [ Release ] accessibility/link-inside-button-accessible-text.html [ Failure ]
</span><span class="cx"> webkit.org/b/140798 [ Debug ] accessibility/link-inside-button-accessible-text.html [ Skip ] # Debug assertion
</span><del>-webkit.org/b/145271 [ Release ] accessibility/list-detection.html [ Failure ]
-webkit.org/b/145271 [ Debug ] accessibility/list-detection.html [ Skip ] # Debug assertion
-webkit.org/b/145271 [ Release ] accessibility/list-detection2.html [ Failure ]
-webkit.org/b/145271 [ Debug ] accessibility/list-detection2.html [ Failure ]
</del><ins>+webkit.org/b/140798 [ Release ] accessibility/list-detection.html [ Failure ]
+webkit.org/b/140798 [ Debug ] accessibility/list-detection.html [ Skip ] # Debug assertion
</ins><span class="cx"> webkit.org/b/140798 [ Release ] accessibility/listitem-title.html [ Failure ]
</span><span class="cx"> webkit.org/b/140798 [ Debug ] accessibility/listitem-title.html [ Skip ] # Debug assertion
</span><span class="cx"> webkit.org/b/140798 [ Release ] accessibility/math-multiscript-attributes.html [ Failure ]
</span></span></pre></div>
<a id="tagsSafari6011342SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.34.2/Source/WebCore/ChangeLog (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/Source/WebCore/ChangeLog 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/Source/WebCore/ChangeLog 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-08 Babak Shafiei <bshafiei@apple.com>
+
+ Merge r185335.
+
+ 2015-06-08 Chris Fleizach <cfleizach@apple.com>
+
+ AX: improve list heuristics (presentational use versus actual lists)
+ https://bugs.webkit.org/show_bug.cgi?id=134187
+
+ Unreviewed. Rolling this change out temporarily.
+
+ * accessibility/AccessibilityList.cpp:
+ (WebCore::AccessibilityList::isDescriptionList):
+ (WebCore::AccessibilityList::determineAccessibilityRole):
+ (WebCore::AccessibilityList::childHasPseudoVisibleListItemMarkers): Deleted.
+ * accessibility/AccessibilityList.h:
+
</ins><span class="cx"> 2015-06-04 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Roll out r185207.
</span></span></pre></div>
<a id="tagsSafari6011342SourceWebCoreaccessibilityAccessibilityListcpp"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.34.2/Source/WebCore/accessibility/AccessibilityList.cpp (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/Source/WebCore/accessibility/AccessibilityList.cpp 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/Source/WebCore/accessibility/AccessibilityList.cpp 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #include "AXObjectCache.h"
</span><span class="cx"> #include "HTMLElement.h"
</span><span class="cx"> #include "HTMLNames.h"
</span><del>-#include "PseudoElement.h"
</del><span class="cx"> #include "RenderListItem.h"
</span><span class="cx"> #include "RenderObject.h"
</span><span class="cx"> #include "RenderStyle.h"
</span><span class="lines">@@ -98,35 +97,6 @@
</span><span class="cx"> return node && node->hasTagName(dlTag);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool AccessibilityList::childHasPseudoVisibleListItemMarkers(RenderObject* listItem)
-{
- // Check if the list item has a pseudo-element that should be accessible (e.g. an image or text)
- Element* listItemElement = downcast<Element>(listItem->node());
- if (!listItemElement || !listItemElement->beforePseudoElement())
- return false;
-
- AccessibilityObject* axObj = axObjectCache()->getOrCreate(listItemElement->beforePseudoElement()->renderer());
- if (!axObj)
- return false;
-
- if (!axObj->accessibilityIsIgnored())
- return true;
-
- for (const auto& child : axObj->children()) {
- if (!child->accessibilityIsIgnored())
- return true;
- }
-
- // Platforms which expose rendered text content through the parent element will treat
- // those renderers as "ignored" objects.
-#if PLATFORM(GTK) || PLATFORM(EFL)
- String text = axObj->textUnderElement();
- return !text.isEmpty() && !text.containsOnlyWhitespace();
-#else
- return false;
-#endif
-}
-
</del><span class="cx"> AccessibilityRole AccessibilityList::determineAccessibilityRole()
</span><span class="cx"> {
</span><span class="cx"> m_ariaRole = determineAriaRoleAttribute();
</span><span class="lines">@@ -161,33 +131,21 @@
</span><span class="cx"> listItemCount++;
</span><span class="cx"> else if (child->roleValue() == ListItemRole) {
</span><span class="cx"> RenderObject* listItem = child->renderer();
</span><del>- if (!listItem)
- continue;
-
- // Rendered list items always count.
- if (listItem->isListItem()) {
- if (!hasVisibleMarkers && (listItem->style().listStyleType() != NoneListStyle || listItem->style().listStyleImage() || childHasPseudoVisibleListItemMarkers(listItem)))
</del><ins>+ if (listItem && listItem->isListItem()) {
+ if (listItem->style().listStyleType() != NoneListStyle || listItem->style().listStyleImage())
</ins><span class="cx"> hasVisibleMarkers = true;
</span><span class="cx"> listItemCount++;
</span><del>- } else if (listItem->node() && listItem->node()->hasTagName(liTag)) {
- // Inline elements that are in a list with an explicit role should also count.
- if (m_ariaRole == ListRole)
- listItemCount++;
-
- if (childHasPseudoVisibleListItemMarkers(listItem)) {
- hasVisibleMarkers = true;
- listItemCount++;
- }
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool unorderedList = isUnorderedList();
</ins><span class="cx"> // Non <ul> lists and ARIA lists only need to have one child.
</span><del>- // <ul>, <ol> lists need to have visible markers.
- if (ariaRoleAttribute() != UnknownRole) {
</del><ins>+ // <ul> lists need to have 1 child, or visible markers.
+ if (!unorderedList || ariaRoleAttribute() != UnknownRole) {
</ins><span class="cx"> if (!listItemCount)
</span><span class="cx"> role = GroupRole;
</span><del>- } else if (!hasVisibleMarkers)
</del><ins>+ } else if (unorderedList && listItemCount <= 1 && !hasVisibleMarkers)
</ins><span class="cx"> role = GroupRole;
</span><span class="cx">
</span><span class="cx"> return role;
</span></span></pre></div>
<a id="tagsSafari6011342SourceWebCoreaccessibilityAccessibilityListh"></a>
<div class="modfile"><h4>Modified: tags/Safari-601.1.34.2/Source/WebCore/accessibility/AccessibilityList.h (185354 => 185355)</h4>
<pre class="diff"><span>
<span class="info">--- tags/Safari-601.1.34.2/Source/WebCore/accessibility/AccessibilityList.h 2015-06-09 05:26:57 UTC (rev 185354)
+++ tags/Safari-601.1.34.2/Source/WebCore/accessibility/AccessibilityList.h 2015-06-09 05:29:04 UTC (rev 185355)
</span><span class="lines">@@ -49,7 +49,6 @@
</span><span class="cx"> virtual bool isList() const override { return true; }
</span><span class="cx"> virtual bool computeAccessibilityIsIgnored() const override;
</span><span class="cx"> virtual AccessibilityRole determineAccessibilityRole() override;
</span><del>- bool childHasPseudoVisibleListItemMarkers(RenderObject*);
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>