<!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>[201913] 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/201913">201913</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-06-09 23:06:08 -0700 (Thu, 09 Jun 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: VoiceOver Unable to View Download Progress or Completion Status for Mail Attachments
https://bugs.webkit.org/show_bug.cgi?id=158581

Reviewed by Darin Adler.

Source/WebCore:

Update attachment element accessibility so that:
   1) the action name comes first to match UI
   2) on iOS, it has the updates frequently trait

Make sure this test now runs on iOS as well.

Modified tests: accessibility/attachment-element.html

* accessibility/AccessibilityAttachment.cpp:
(WebCore::AccessibilityAttachment::accessibilityText):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
(-[WebAccessibilityObjectWrapper accessibilityTraits]):
(-[WebAccessibilityObjectWrapper accessibilityValue]):
(-[WebAccessibilityObjectWrapper accessibilityIsAttachmentElement]):
(-[WebAccessibilityObjectWrapper accessibilityIsComboBox]):

LayoutTests:

* accessibility/attachment-element-expected.txt:
* accessibility/attachment-element.html:
* accessibility/ios-simulator/attributed-string-for-range-expected.txt:
* platform/ios-simulator/TestExpectations:
* platform/ios-simulator/accessibility/attachment-element-expected.txt: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityattachmentelementexpectedtxt">trunk/LayoutTests/accessibility/attachment-element-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityattachmentelementhtml">trunk/LayoutTests/accessibility/attachment-element.html</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorattributedstringforrangeexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/attributed-string-for-range-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformiossimulatorTestExpectations">trunk/LayoutTests/platform/ios-simulator/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityAttachmentcpp">trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformiossimulatoraccessibilityattachmentelementexpectedtxt">trunk/LayoutTests/platform/ios-simulator/accessibility/attachment-element-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (201912 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/ChangeLog        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-06-09  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
+        AX: VoiceOver Unable to View Download Progress or Completion Status for Mail Attachments
+        https://bugs.webkit.org/show_bug.cgi?id=158581
+
+        Reviewed by Darin Adler.
+
+        * accessibility/attachment-element-expected.txt:
+        * accessibility/attachment-element.html:
+        * accessibility/ios-simulator/attributed-string-for-range-expected.txt:
+        * platform/ios-simulator/TestExpectations:
+        * platform/ios-simulator/accessibility/attachment-element-expected.txt: Added.
+
</ins><span class="cx"> 2016-06-09  Zalan Bujtas  &lt;zalan@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Hairline borders do not show up on 3x displays.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityattachmentelementexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/attachment-element-expected.txt (201912 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/attachment-element-expected.txt        2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/accessibility/attachment-element-expected.txt        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -4,7 +4,7 @@
</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><del>-Attachment description: AXDescription: title, subtitle, action
</del><ins>+Attachment description: AXDescription: action, title, subtitle
</ins><span class="cx"> Attachment value: AXValue: 0.5
</span><span class="cx"> Attachment role: AXRoleDescription: attachment
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityattachmentelementhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/attachment-element.html (201912 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/attachment-element.html        2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/accessibility/attachment-element.html        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -22,8 +22,12 @@
</span><span class="cx">     if (window.accessibilityController) {
</span><span class="cx">         var content = accessibilityController.accessibleElementById(&quot;attachment&quot;);
</span><span class="cx">         debug(&quot;Attachment description: &quot; + content.description);
</span><ins>+
</ins><span class="cx">         debug(&quot;Attachment value: &quot; + content.stringValue);
</span><del>-        debug(&quot;Attachment role: &quot; + content.roleDescription);
</del><ins>+
+        if (accessibilityController.platformName == &quot;mac&quot;) {
+            debug(&quot;Attachment role: &quot; + content.roleDescription);
+        }
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> &lt;/script&gt;
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorattributedstringforrangeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/ios-simulator/attributed-string-for-range-expected.txt (201912 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/attributed-string-for-range-expected.txt        2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/accessibility/ios-simulator/attributed-string-for-range-expected.txt        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx">     UIAccessibilityTokenFontName = &quot;Times New Roman&quot;;
</span><span class="cx">     UIAccessibilityTokenFontSize = 16;
</span><span class="cx"> }{
</span><del>-    UIAccessibilityTokenAttachment = &quot;WebAccessibilityObjectWrapper: title, subtitle, action&quot;;
</del><ins>+    UIAccessibilityTokenAttachment = &quot;WebAccessibilityObjectWrapper: action, title, subtitle&quot;;
</ins><span class="cx"> } {
</span><span class="cx">     UIAccessibilityTokenFontFamily = &quot;Times New Roman&quot;;
</span><span class="cx">     UIAccessibilityTokenFontName = &quot;Times New Roman&quot;;
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatorTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (201912 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/TestExpectations        2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -2768,6 +2768,9 @@
</span><span class="cx"> # Enable &quot;aria-table-attributes&quot; test for iOS
</span><span class="cx"> webkit.org/b/150366 accessibility/aria-table-attributes.html [ Pass ]
</span><span class="cx"> 
</span><ins>+# Enable &quot;attachment element&quot; test for iOS
+accessibility/attachment-element.html [ Pass ]
+
</ins><span class="cx"> # Enable Text marker tests for iOS
</span><span class="cx"> webkit.org/b/153292 accessibility/text-marker [ Pass ]
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformiossimulatoraccessibilityattachmentelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/ios-simulator/accessibility/attachment-element-expected.txt (0 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/ios-simulator/accessibility/attachment-element-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/accessibility/attachment-element-expected.txt        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+
+This tests that attachment elements are accessible.
+
+On success, you will see a series of &quot;PASS&quot; messages, followed by &quot;TEST COMPLETE&quot;.
+
+
+Attachment description: AXLabel: action, title, subtitle
+Attachment value: AXValue: 0.50
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201912 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/Source/WebCore/ChangeLog        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-06-09  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
+        AX: VoiceOver Unable to View Download Progress or Completion Status for Mail Attachments
+        https://bugs.webkit.org/show_bug.cgi?id=158581
+
+        Reviewed by Darin Adler.
+
+        Update attachment element accessibility so that:
+           1) the action name comes first to match UI
+           2) on iOS, it has the updates frequently trait
+
+        Make sure this test now runs on iOS as well.
+
+        Modified tests: accessibility/attachment-element.html
+
+        * accessibility/AccessibilityAttachment.cpp:
+        (WebCore::AccessibilityAttachment::accessibilityText):
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+        (-[WebAccessibilityObjectWrapper accessibilityTraits]):
+        (-[WebAccessibilityObjectWrapper accessibilityValue]):
+        (-[WebAccessibilityObjectWrapper accessibilityIsAttachmentElement]):
+        (-[WebAccessibilityObjectWrapper accessibilityIsComboBox]):
+
</ins><span class="cx"> 2016-06-09  Alex Christensen  &lt;achristensen@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Clean up WebCore.vcxproj after switching to CMake.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityAttachmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp (201912 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp        2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -94,14 +94,14 @@
</span><span class="cx">     auto&amp; subtitle = getAttribute(subtitleAttr);
</span><span class="cx">     auto&amp; action = getAttribute(actionAttr);
</span><span class="cx">     
</span><ins>+    if (action.length())
+        textOrder.append(AccessibilityText(action, ActionText));
+
</ins><span class="cx">     if (title.length())
</span><span class="cx">         textOrder.append(AccessibilityText(title, TitleText));
</span><span class="cx"> 
</span><span class="cx">     if (subtitle.length())
</span><span class="cx">         textOrder.append(AccessibilityText(subtitle, SubtitleText));
</span><del>-    
-    if (action.length())
-        textOrder.append(AccessibilityText(action, ActionText));
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (201912 => 201913)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2016-06-10 06:06:08 UTC (rev 201913)
</span><span class="lines">@@ -326,6 +326,7 @@
</span><span class="cx"> - (uint64_t)_axContainedByFieldsetTrait { return (1 &lt;&lt; 22); }
</span><span class="cx"> - (uint64_t)_axSearchFieldTrait { return (1 &lt;&lt; 23); }
</span><span class="cx"> - (uint64_t)_axTextAreaTrait { return (1 &lt;&lt; 24); }
</span><ins>+- (uint64_t)_axUpdatesFrequentlyTrait { return (1 &lt;&lt; 25); }
</ins><span class="cx"> 
</span><span class="cx"> - (BOOL)accessibilityCanFuzzyHitTest
</span><span class="cx"> {
</span><span class="lines">@@ -698,6 +699,9 @@
</span><span class="cx">             break;
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (m_object-&gt;isAttachmentElement())
+        traits |= [self _axUpdatesFrequentlyTrait];
+    
</ins><span class="cx">     if (m_object-&gt;isSelected())
</span><span class="cx">         traits |= [self _axSelectedTrait];
</span><span class="cx"> 
</span><span class="lines">@@ -1275,6 +1279,14 @@
</span><span class="cx">     return nil;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+- (BOOL)accessibilityIsAttachmentElement
+{
+    if (![self _prepareAccessibilityCall])
+        return NO;
+
+    return is&lt;AccessibilityAttachment&gt;(m_object);
+}
+
</ins><span class="cx"> - (BOOL)accessibilityIsComboBox
</span><span class="cx"> {
</span><span class="cx">     if (![self _prepareAccessibilityCall])
</span></span></pre>
</div>
</div>

</body>
</html>