<!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>[204645] 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/204645">204645</a></dd>
<dt>Author</dt> <dd>n_wang@apple.com</dd>
<dt>Date</dt> <dd>2016-08-19 12:23:30 -0700 (Fri, 19 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: iOS, Wrong axLabel on static text if heading has multiple children
https://bugs.webkit.org/show_bug.cgi?id=160981
Reviewed by Chris Fleizach.
Source/WebCore:
Headings are using textUnderElement to compute the accessibilityLabel on iOS, so normally it's
the concatenation of all the children's accessibilityLabel. Therefore, we shouldn't use accessibilityLabel
to check for user defined text on headings. Instead, baseAccessibilityDescription will return the
alternate text we want.
Changes are covered in the modified test.
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _accessibilityTraitsFromAncestors]):
LayoutTests:
* accessibility/ios-simulator/heading-with-aria-label-expected.txt:
* accessibility/ios-simulator/heading-with-aria-label.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorheadingwitharialabelexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/heading-with-aria-label-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorheadingwitharialabelhtml">trunk/LayoutTests/accessibility/ios-simulator/heading-with-aria-label.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204644 => 204645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-08-19 19:07:30 UTC (rev 204644)
+++ trunk/LayoutTests/ChangeLog 2016-08-19 19:23:30 UTC (rev 204645)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-19 Nan Wang <n_wang@apple.com>
+
+ AX: iOS, Wrong axLabel on static text if heading has multiple children
+ https://bugs.webkit.org/show_bug.cgi?id=160981
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/ios-simulator/heading-with-aria-label-expected.txt:
+ * accessibility/ios-simulator/heading-with-aria-label.html:
+
</ins><span class="cx"> 2016-08-19 Carlos Alberto Lopez Perez <clopez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Gardening: Layout tests expectations updates and test rebaselines.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorheadingwitharialabelexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/ios-simulator/heading-with-aria-label-expected.txt (204644 => 204645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/heading-with-aria-label-expected.txt 2016-08-19 19:07:30 UTC (rev 204644)
+++ trunk/LayoutTests/accessibility/ios-simulator/heading-with-aria-label-expected.txt 2016-08-19 19:23:30 UTC (rev 204645)
</span><span class="lines">@@ -1,4 +1,6 @@
</span><del>-visible text visible text
</del><ins>+visible text visible text visible text
+text1link
+
</ins><span class="cx"> This tests that if heading has aria-label, it will override the visible text as necessary.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="lines">@@ -5,8 +7,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS heading1Text.traits == heading2Text.traits is true
</span><ins>+PASS heading3Text.traits == heading2Text.traits is true
</ins><span class="cx"> PASS heading1Text.description is 'AXLabel: test label'
</span><span class="cx"> PASS heading2Text.description is 'AXLabel: visible text'
</span><ins>+PASS heading3Text.description is 'AXLabel: hidden label'
+PASS heading4Text1.description is 'AXLabel: text1'
+PASS linkText.description is 'AXLabel: link'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorheadingwitharialabelhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/ios-simulator/heading-with-aria-label.html (204644 => 204645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/heading-with-aria-label.html 2016-08-19 19:07:30 UTC (rev 204644)
+++ trunk/LayoutTests/accessibility/ios-simulator/heading-with-aria-label.html 2016-08-19 19:23:30 UTC (rev 204645)
</span><span class="lines">@@ -8,9 +8,14 @@
</span><span class="cx"> </head>
</span><span class="cx"> <body id="body">
</span><span class="cx">
</span><ins>+<div id="hidden" style="display:none">hidden label</div>
+
</ins><span class="cx"> <span id="heading1" role="heading" aria-label="test label">visible text</span>
</span><span class="cx"> <span id="heading2" role="heading">visible text</span>
</span><ins>+<span id="heading3" role="heading" aria-labelledby="hidden">visible text</span>
</ins><span class="cx">
</span><ins>+<h2 id="heading4"><span>text1</span><a id="link" href="">link</a></h2>
+
</ins><span class="cx"> <p id="description"></p>
</span><span class="cx"> <div id="console"></div>
</span><span class="cx">
</span><span class="lines">@@ -22,12 +27,24 @@
</span><span class="cx">
</span><span class="cx"> var heading1Text = accessibilityController.accessibleElementById("heading1").childAtIndex(0);
</span><span class="cx"> var heading2Text = accessibilityController.accessibleElementById("heading2").childAtIndex(0);
</span><ins>+ var heading3Text = accessibilityController.accessibleElementById("heading3").childAtIndex(0);
</ins><span class="cx">
</span><span class="cx"> // Get the trait so that the label will be set.
</span><span class="cx"> shouldBeTrue("heading1Text.traits == heading2Text.traits");
</span><ins>+ shouldBeTrue("heading3Text.traits == heading2Text.traits");
</ins><span class="cx">
</span><span class="cx"> shouldBe("heading1Text.description", "'AXLabel: test label'");
</span><span class="cx"> shouldBe("heading2Text.description", "'AXLabel: visible text'");
</span><ins>+ shouldBe("heading3Text.description", "'AXLabel: hidden label'");
+
+ // When a heading has multiple children, ensure the children's
+ // labels are correct if aria-label is NOT set.
+ var heading4 = accessibilityController.accessibleElementById("heading4");
+ var heading4Text1 = heading4.childAtIndex(0);
+ var linkText = accessibilityController.accessibleElementById("link").childAtIndex(0);
+
+ shouldBe("heading4Text1.description", "'AXLabel: text1'");
+ shouldBe("linkText.description", "'AXLabel: link'");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> successfullyParsed = true;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204644 => 204645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-19 19:07:30 UTC (rev 204644)
+++ trunk/Source/WebCore/ChangeLog 2016-08-19 19:23:30 UTC (rev 204645)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-08-19 Nan Wang <n_wang@apple.com>
+
+ AX: iOS, Wrong axLabel on static text if heading has multiple children
+ https://bugs.webkit.org/show_bug.cgi?id=160981
+
+ Reviewed by Chris Fleizach.
+
+ Headings are using textUnderElement to compute the accessibilityLabel on iOS, so normally it's
+ the concatenation of all the children's accessibilityLabel. Therefore, we shouldn't use accessibilityLabel
+ to check for user defined text on headings. Instead, baseAccessibilityDescription will return the
+ alternate text we want.
+
+ Changes are covered in the modified test.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper _accessibilityTraitsFromAncestors]):
+
</ins><span class="cx"> 2016-08-19 Johan K. Jensen <johan_jensen@apple.com>
</span><span class="cx">
</span><span class="cx"> Resource Timing: Make PerformanceEntryList a sequence as per spec
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (204644 => 204645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-08-19 19:07:30 UTC (rev 204644)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-08-19 19:23:30 UTC (rev 204645)
</span><span class="lines">@@ -601,7 +601,7 @@
</span><span class="cx"> if (role == StaticTextRole) {
</span><span class="cx"> // We should only set the text value as the label when there's no
</span><span class="cx"> // alternate text on the heading parent.
</span><del>- NSString *headingLabel = [wrapper accessibilityLabel];
</del><ins>+ NSString *headingLabel = [wrapper baseAccessibilityDescription];
</ins><span class="cx"> if (![headingLabel length])
</span><span class="cx"> [self setAccessibilityLabel:m_object->stringValue()];
</span><span class="cx"> else
</span></span></pre>
</div>
</div>
</body>
</html>