<!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>[198381] 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/198381">198381</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-03-17 23:52:54 -0700 (Thu, 17 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: WEB: VoiceOver does not announce some WAI-ARIA document structures
https://bugs.webkit.org/show_bug.cgi?id=155603
<rdar://problem/25227385>
Reviewed by Darin Adler.
Source/WebCore:
Expose more ARIA landmark type roles on iOS for accessibility.
Updated test: accessibility/ios-simulator/landmark-type.html
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _accessibilityIsLandmarkRole:]):
(-[WebAccessibilityObjectWrapper accessibilityLabel]):
* platform/LocalizedStrings.cpp:
(WebCore::searchMenuClearRecentSearchesText):
(WebCore::AXWebAreaText):
(WebCore::AXListItemActionVerb):
(WebCore::AXAutoFillCredentialsLabel):
* platform/LocalizedStrings.h:
LayoutTests:
* accessibility/ios-simulator/landmark-type-expected.txt:
* accessibility/ios-simulator/landmark-type.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorlandmarktypeexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/landmark-type-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorlandmarktypehtml">trunk/LayoutTests/accessibility/ios-simulator/landmark-type.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>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringscpp">trunk/Source/WebCore/platform/LocalizedStrings.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformLocalizedStringsh">trunk/Source/WebCore/platform/LocalizedStrings.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198380 => 198381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-03-18 06:36:21 UTC (rev 198380)
+++ trunk/LayoutTests/ChangeLog 2016-03-18 06:52:54 UTC (rev 198381)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-03-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WEB: VoiceOver does not announce some WAI-ARIA document structures
+ https://bugs.webkit.org/show_bug.cgi?id=155603
+ <rdar://problem/25227385>
+
+ Reviewed by Darin Adler.
+
+ * accessibility/ios-simulator/landmark-type-expected.txt:
+ * accessibility/ios-simulator/landmark-type.html:
+
</ins><span class="cx"> 2016-03-17 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [XSS Auditor] Off by one in XSSAuditor::canonicalizedSnippetForJavaScript()
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorlandmarktypeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/ios-simulator/landmark-type-expected.txt (198380 => 198381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/landmark-type-expected.txt 2016-03-18 06:36:21 UTC (rev 198380)
+++ trunk/LayoutTests/accessibility/ios-simulator/landmark-type-expected.txt 2016-03-18 06:52:54 UTC (rev 198381)
</span><span class="lines">@@ -2,6 +2,10 @@
</span><span class="cx"> text
</span><span class="cx"> text
</span><span class="cx"> text
</span><ins>+footer
+article
+document
+note
</ins><span class="cx"> This tests that landmarks return their type as part of the AX label.
</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">@@ -13,6 +17,14 @@
</span><span class="cx"> PASS banner.childAtIndex(0).traits != nonLandmarkText.traits is true
</span><span class="cx"> PASS region.description is 'AXLabel: testregion, region'
</span><span class="cx"> PASS region.childAtIndex(0).traits != nonLandmarkText.traits is true
</span><ins>+PASS footer.description is 'AXLabel: footer'
+PASS footer.childAtIndex(0).traits != nonLandmarkText.traits is true
+PASS article.description is 'AXLabel: article'
+PASS article.childAtIndex(0).traits != nonLandmarkText.traits is true
+PASS note.description is 'AXLabel: note'
+PASS note.childAtIndex(0).traits != nonLandmarkText.traits is true
+PASS documentContainer.description is 'AXLabel: document'
+PASS documentContainer.childAtIndex(0).traits != nonLandmarkText.traits is true
</ins><span class="cx"> PASS region.childAtIndex(0).traits == main.childAtIndex(0).traits is true
</span><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorlandmarktypehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/ios-simulator/landmark-type.html (198380 => 198381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/landmark-type.html 2016-03-18 06:36:21 UTC (rev 198380)
+++ trunk/LayoutTests/accessibility/ios-simulator/landmark-type.html 2016-03-18 06:52:54 UTC (rev 198381)
</span><span class="lines">@@ -24,6 +24,22 @@
</span><span class="cx"> text
</span><span class="cx"> </div>
</span><span class="cx">
</span><ins>+<footer id="footer">
+footer
+</footer>
+
+<div role="article" id="article">
+article
+</div>
+
+<div role="document" id="documentcontainer">
+document
+</div>
+
+<div role="note" id="note">
+note
+</div>
+
</ins><span class="cx"> <p id="description"></p>
</span><span class="cx"> <div id="console"></div>
</span><span class="cx">
</span><span class="lines">@@ -49,6 +65,22 @@
</span><span class="cx"> shouldBe("region.description", "'AXLabel: testregion, region'");
</span><span class="cx"> shouldBeTrue("region.childAtIndex(0).traits != nonLandmarkText.traits");
</span><span class="cx">
</span><ins>+ var footer = accessibilityController.accessibleElementById("footer");
+ shouldBe("footer.description", "'AXLabel: footer'");
+ shouldBeTrue("footer.childAtIndex(0).traits != nonLandmarkText.traits");
+
+ var article = accessibilityController.accessibleElementById("article");
+ shouldBe("article.description", "'AXLabel: article'");
+ shouldBeTrue("article.childAtIndex(0).traits != nonLandmarkText.traits");
+
+ var note = accessibilityController.accessibleElementById("note");
+ shouldBe("note.description", "'AXLabel: note'");
+ shouldBeTrue("note.childAtIndex(0).traits != nonLandmarkText.traits");
+
+ var documentContainer = accessibilityController.accessibleElementById("documentcontainer");
+ shouldBe("documentContainer.description", "'AXLabel: document'");
+ shouldBeTrue("documentContainer.childAtIndex(0).traits != nonLandmarkText.traits");
+
</ins><span class="cx"> shouldBeTrue("region.childAtIndex(0).traits == main.childAtIndex(0).traits");
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198380 => 198381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-18 06:36:21 UTC (rev 198380)
+++ trunk/Source/WebCore/ChangeLog 2016-03-18 06:52:54 UTC (rev 198381)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-03-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WEB: VoiceOver does not announce some WAI-ARIA document structures
+ https://bugs.webkit.org/show_bug.cgi?id=155603
+ <rdar://problem/25227385>
+
+ Reviewed by Darin Adler.
+
+ Expose more ARIA landmark type roles on iOS for accessibility.
+
+ Updated test: accessibility/ios-simulator/landmark-type.html
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper _accessibilityIsLandmarkRole:]):
+ (-[WebAccessibilityObjectWrapper accessibilityLabel]):
+ * platform/LocalizedStrings.cpp:
+ (WebCore::searchMenuClearRecentSearchesText):
+ (WebCore::AXWebAreaText):
+ (WebCore::AXListItemActionVerb):
+ (WebCore::AXAutoFillCredentialsLabel):
+ * platform/LocalizedStrings.h:
+
</ins><span class="cx"> 2016-03-17 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> Cleanup: Remove the need to pass reporting status to ContentSecurityPolicy functions
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (198380 => 198381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-03-18 06:36:21 UTC (rev 198380)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-03-18 06:52:54 UTC (rev 198381)
</span><span class="lines">@@ -498,7 +498,11 @@
</span><span class="cx"> - (BOOL)_accessibilityIsLandmarkRole:(AccessibilityRole)role
</span><span class="cx"> {
</span><span class="cx"> switch (role) {
</span><ins>+ case DocumentRole:
+ case DocumentArticleRole:
+ case DocumentNoteRole:
</ins><span class="cx"> case DocumentRegionRole:
</span><ins>+ case FooterRole:
</ins><span class="cx"> case LandmarkApplicationRole:
</span><span class="cx"> case LandmarkBannerRole:
</span><span class="cx"> case LandmarkComplementaryRole:
</span><span class="lines">@@ -958,7 +962,11 @@
</span><span class="cx"> NSString *axTitle = [self baseAccessibilityTitle];
</span><span class="cx"> NSString *axDescription = [self baseAccessibilityDescription];
</span><span class="cx"> NSString *landmarkDescription = [self ariaLandmarkRoleDescription];
</span><del>-
</del><ins>+
+ // Footer is not considered a landmark, but we want the role description.
+ if (m_object->roleValue() == FooterRole)
+ landmarkDescription = AXFooterRoleDescriptionText();
+
</ins><span class="cx"> NSMutableString *result = [NSMutableString string];
</span><span class="cx"> if (m_object->roleValue() == HorizontalRuleRole)
</span><span class="cx"> appendStringToResult(result, AXHorizontalRuleDescriptionText());
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (198380 => 198381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-03-18 06:36:21 UTC (rev 198380)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2016-03-18 06:52:54 UTC (rev 198381)
</span><span class="lines">@@ -544,6 +544,7 @@
</span><span class="cx"> {
</span><span class="cx"> return WEB_UI_STRING("Clear Recent Searches", "menu item in Recent Searches menu that empties menu's contents");
</span><span class="cx"> }
</span><ins>+#endif // !PLATFORM(IOS)
</ins><span class="cx">
</span><span class="cx"> String AXWebAreaText()
</span><span class="cx"> {
</span><span class="lines">@@ -652,7 +653,6 @@
</span><span class="cx"> notImplemented();
</span><span class="cx"> return "select";
</span><span class="cx"> }
</span><del>-#endif // !PLATFORM(IOS)
</del><span class="cx">
</span><span class="cx"> String AXAutoFillCredentialsLabel()
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (198380 => 198381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.h 2016-03-18 06:36:21 UTC (rev 198380)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2016-03-18 06:52:54 UTC (rev 198381)
</span><span class="lines">@@ -149,6 +149,7 @@
</span><span class="cx"> String searchMenuNoRecentSearchesText();
</span><span class="cx"> String searchMenuRecentSearchesText();
</span><span class="cx"> String searchMenuClearRecentSearchesText();
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> String AXWebAreaText();
</span><span class="cx"> String AXLinkText();
</span><span class="lines">@@ -172,7 +173,6 @@
</span><span class="cx"> String AXMenuListPopupActionVerb();
</span><span class="cx"> String AXLinkActionVerb();
</span><span class="cx"> String AXListItemActionVerb();
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_WEEK)
</span><span class="cx"> // weekFormatInLDML() returns week and year format in LDML, Unicode
</span></span></pre>
</div>
</div>
</body>
</html>