<!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>[185675] 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/185675">185675</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2015-06-17 16:20:27 -0700 (Wed, 17 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: VoiceOver in iOS not announcing generic WAI-ARIA region, even if labelled properly
https://bugs.webkit.org/show_bug.cgi?id=146066

Reviewed by Darin Adler.

Source/WebCore:

Allow the region role to identify as a landmark type.

Updated test: platform/ios-simulator/accessibility/landmark-types.html

* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper _accessibilityIsLandmarkRole:]):

LayoutTests:

* platform/ios-simulator/accessibility/landmark-type-expected.txt:
* platform/ios-simulator/accessibility/landmark-type.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoraccessibilitylandmarktypeexpectedtxt">trunk/LayoutTests/platform/ios-simulator/accessibility/landmark-type-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatoraccessibilitylandmarktypehtml">trunk/LayoutTests/platform/ios-simulator/accessibility/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>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185674 => 185675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-06-17 23:02:07 UTC (rev 185674)
+++ trunk/LayoutTests/ChangeLog        2015-06-17 23:20:27 UTC (rev 185675)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-06-17  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
+        AX: VoiceOver in iOS not announcing generic WAI-ARIA region, even if labelled properly
+        https://bugs.webkit.org/show_bug.cgi?id=146066
+
+        Reviewed by Darin Adler.
+
+        * platform/ios-simulator/accessibility/landmark-type-expected.txt:
+        * platform/ios-simulator/accessibility/landmark-type.html:
+
</ins><span class="cx"> 2015-06-17  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r173283-r173296): Amazon.com front page has no caret in the search field
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoraccessibilitylandmarktypeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/accessibility/landmark-type-expected.txt (185674 => 185675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/accessibility/landmark-type-expected.txt        2015-06-17 23:02:07 UTC (rev 185674)
+++ trunk/LayoutTests/platform/ios-simulator/accessibility/landmark-type-expected.txt        2015-06-17 23:20:27 UTC (rev 185675)
</span><span class="lines">@@ -1,12 +1,19 @@
</span><ins>+non landmark
</ins><span class="cx"> text
</span><span class="cx"> text
</span><ins>+text
</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 &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> PASS main.description is 'AXLabel: main'
</span><ins>+PASS main.childAtIndex(0).traits != nonLandmarkText.traits is true
</ins><span class="cx"> PASS banner.description is 'AXLabel: banner'
</span><ins>+PASS banner.childAtIndex(0).traits != nonLandmarkText.traits is true
+PASS region.description is 'AXLabel: testregion, region'
+PASS region.childAtIndex(0).traits != nonLandmarkText.traits is true
+PASS region.childAtIndex(0).traits == main.childAtIndex(0).traits is true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoraccessibilitylandmarktypehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/accessibility/landmark-type.html (185674 => 185675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/accessibility/landmark-type.html        2015-06-17 23:02:07 UTC (rev 185674)
+++ trunk/LayoutTests/platform/ios-simulator/accessibility/landmark-type.html        2015-06-17 23:20:27 UTC (rev 185675)
</span><span class="lines">@@ -8,6 +8,10 @@
</span><span class="cx"> &lt;/head&gt;
</span><span class="cx"> &lt;body id=&quot;body&quot;&gt;
</span><span class="cx"> 
</span><ins>+&lt;div role=&quot;group&quot; id=&quot;group&quot;&gt;
+non landmark
+&lt;/div&gt;
+
</ins><span class="cx"> &lt;div role=&quot;main&quot; id=&quot;main&quot;&gt;
</span><span class="cx"> text
</span><span class="cx"> &lt;/div&gt;
</span><span class="lines">@@ -16,6 +20,10 @@
</span><span class="cx"> text
</span><span class="cx"> &lt;/div&gt;
</span><span class="cx"> 
</span><ins>+&lt;div role=&quot;region&quot; id=&quot;region&quot; aria-label=&quot;testregion&quot;&gt;
+text
+&lt;/div&gt;
+
</ins><span class="cx"> &lt;p id=&quot;description&quot;&gt;&lt;/p&gt;
</span><span class="cx"> &lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
</span><span class="cx"> 
</span><span class="lines">@@ -25,11 +33,23 @@
</span><span class="cx"> 
</span><span class="cx">     if (window.accessibilityController) {
</span><span class="cx"> 
</span><ins>+        // The traits of an object inside a landmark will be different from those not in a landmark,
+        // so we can use that to determine if an object is marked as a landmark.
+        var nonLandmarkText = accessibilityController.accessibleElementById(&quot;group&quot;).childAtIndex(0);
+
</ins><span class="cx">         var main = accessibilityController.accessibleElementById(&quot;main&quot;);
</span><span class="cx">         shouldBe(&quot;main.description&quot;, &quot;'AXLabel: main'&quot;);
</span><ins>+        shouldBeTrue(&quot;main.childAtIndex(0).traits != nonLandmarkText.traits&quot;);
</ins><span class="cx"> 
</span><span class="cx">         var banner = accessibilityController.accessibleElementById(&quot;banner&quot;);
</span><span class="cx">         shouldBe(&quot;banner.description&quot;, &quot;'AXLabel: banner'&quot;);
</span><ins>+        shouldBeTrue(&quot;banner.childAtIndex(0).traits != nonLandmarkText.traits&quot;);
+
+        var region = accessibilityController.accessibleElementById(&quot;region&quot;);
+        shouldBe(&quot;region.description&quot;, &quot;'AXLabel: testregion, region'&quot;);
+        shouldBeTrue(&quot;region.childAtIndex(0).traits != nonLandmarkText.traits&quot;);
+
+        shouldBeTrue(&quot;region.childAtIndex(0).traits == main.childAtIndex(0).traits&quot;);
</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 (185674 => 185675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-06-17 23:02:07 UTC (rev 185674)
+++ trunk/Source/WebCore/ChangeLog        2015-06-17 23:20:27 UTC (rev 185675)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-06-17  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
+        AX: VoiceOver in iOS not announcing generic WAI-ARIA region, even if labelled properly
+        https://bugs.webkit.org/show_bug.cgi?id=146066
+
+        Reviewed by Darin Adler.
+
+        Allow the region role to identify as a landmark type.
+
+        Updated test: platform/ios-simulator/accessibility/landmark-types.html
+
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper _accessibilityIsLandmarkRole:]):
+
</ins><span class="cx"> 2015-06-17  Simon Fraser  &lt;simon.fraser@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r173283-r173296): Amazon.com front page has no caret in the search field
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (185674 => 185675)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2015-06-17 23:02:07 UTC (rev 185674)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2015-06-17 23:20:27 UTC (rev 185675)
</span><span class="lines">@@ -433,16 +433,17 @@
</span><span class="cx"> - (BOOL)_accessibilityIsLandmarkRole:(AccessibilityRole)role
</span><span class="cx"> {
</span><span class="cx">     switch (role) {
</span><del>-        case LandmarkApplicationRole:
-        case LandmarkBannerRole:
-        case LandmarkComplementaryRole:
-        case LandmarkContentInfoRole:
-        case LandmarkMainRole:
-        case LandmarkNavigationRole:
-        case LandmarkSearchRole:
-            return YES;
-        default:
-            return NO;
</del><ins>+    case DocumentRegionRole:
+    case LandmarkApplicationRole:
+    case LandmarkBannerRole:
+    case LandmarkComplementaryRole:
+    case LandmarkContentInfoRole:
+    case LandmarkMainRole:
+    case LandmarkNavigationRole:
+    case LandmarkSearchRole:
+        return YES;
+    default:
+        return NO;
</ins><span class="cx">     }    
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>