<!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>[204563] 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/204563">204563</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-08-17 11:01:41 -0700 (Wed, 17 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Support abbreviations in iOS
https://bugs.webkit.org/show_bug.cgi?id=160907
Reviewed by Joanmarie Diggs.
Source/WebCore:
Expose the expandedTextValue attribute for iOS, so that VoiceOver can speak abbreviations correctly.
Test: accessibility/ios-simulator/abbreviation.html
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper textMarkersForRange:]):
(-[WebAccessibilityObjectWrapper accessibilityExpandedTextValue]):
(-[WebAccessibilityObjectWrapper accessibilityIdentifier]):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(AXAttributeStringSetSpelling):
(AXAttributeStringSetExpandedTextValue):
(AXAttributedStringAppendText):
(AXAttributeStringSetexpandedTextValue): Deleted.
Tools:
* DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
(AccessibilityUIElement::stringAttributeValue):
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::stringAttributeValue):
LayoutTests:
* accessibility/ios-simulator/abbreviation-expected.txt: Added.
* accessibility/ios-simulator/abbreviation.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</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="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm">trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm">trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorabbreviationexpectedtxt">trunk/LayoutTests/accessibility/ios-simulator/abbreviation-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityiossimulatorabbreviationhtml">trunk/LayoutTests/accessibility/ios-simulator/abbreviation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (204562 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-08-17 17:48:59 UTC (rev 204562)
+++ trunk/LayoutTests/ChangeLog        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Support abbreviations in iOS
+ https://bugs.webkit.org/show_bug.cgi?id=160907
+
+ Reviewed by Joanmarie Diggs.
+
+ * accessibility/ios-simulator/abbreviation-expected.txt: Added.
+ * accessibility/ios-simulator/abbreviation.html: Added.
+
</ins><span class="cx"> 2016-08-16 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS WK2] Don't throw touchMove events on the floor
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorabbreviationexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/abbreviation-expected.txt (0 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/abbreviation-expected.txt         (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/abbreviation-expected.txt        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+IRS
+This tests that expanded text values can be retrieved.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS text.description is 'AXLabel: IRS'
+PASS text.stringAttributeValue('AXExpandedTextValue') is 'Internal Revenue Service'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityiossimulatorabbreviationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ios-simulator/abbreviation.html (0 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ios-simulator/abbreviation.html         (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/abbreviation.html        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+<script>
+var successfullyParsed = false;
+</script>
+</head>
+<body id="body">
+
+<abbr id="content" title='Internal Revenue Service'>IRS</abbr>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that expanded text values can be retrieved.");
+
+ if (window.accessibilityController) {
+
+ var text = accessibilityController.accessibleElementById("content").childAtIndex(0);
+
+ shouldBe("text.description", "'AXLabel: IRS'");
+ shouldBe("text.stringAttributeValue('AXExpandedTextValue')", "'Internal Revenue Service'");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204562 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-08-17 17:48:59 UTC (rev 204562)
+++ trunk/Source/WebCore/ChangeLog        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-08-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Support abbreviations in iOS
+ https://bugs.webkit.org/show_bug.cgi?id=160907
+
+ Reviewed by Joanmarie Diggs.
+
+ Expose the expandedTextValue attribute for iOS, so that VoiceOver can speak abbreviations correctly.
+
+ Test: accessibility/ios-simulator/abbreviation.html
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper textMarkersForRange:]):
+ (-[WebAccessibilityObjectWrapper accessibilityExpandedTextValue]):
+ (-[WebAccessibilityObjectWrapper accessibilityIdentifier]):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (AXAttributeStringSetSpelling):
+ (AXAttributeStringSetExpandedTextValue):
+ (AXAttributedStringAppendText):
+ (AXAttributeStringSetexpandedTextValue): Deleted.
+
</ins><span class="cx"> 2016-08-17 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove StyleCachedImageSet
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (204562 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2016-08-17 17:48:59 UTC (rev 204562)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -2592,6 +2592,13 @@
</span><span class="cx"> return [NSArray arrayWithObjects:start, end, nil];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (NSString *)accessibilityExpandedTextValue
+{
+ if (![self _prepareAccessibilityCall])
+ return nil;
+ return m_object->expandedTextValue();
+}
+
</ins><span class="cx"> - (NSString *)accessibilityIdentifier
</span><span class="cx"> {
</span><span class="cx"> if (![self _prepareAccessibilityCall])
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (204562 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm        2016-08-17 17:48:59 UTC (rev 204562)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -1194,7 +1194,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void AXAttributeStringSetexpandedTextValue(NSMutableAttributedString *attrString, RenderObject* renderer, NSRange range)
</del><ins>+static void AXAttributeStringSetExpandedTextValue(NSMutableAttributedString *attrString, RenderObject* renderer, NSRange range)
</ins><span class="cx"> {
</span><span class="cx"> if (!renderer || !AXAttributedStringRangeIsValid(attrString, range))
</span><span class="cx"> return;
</span><span class="lines">@@ -1283,7 +1283,7 @@
</span><span class="cx"> AXAttributeStringSetStyle(attrString, renderer, attrStringRange);
</span><span class="cx"> AXAttributeStringSetHeadingLevel(attrString, renderer, attrStringRange);
</span><span class="cx"> AXAttributeStringSetBlockquoteLevel(attrString, renderer, attrStringRange);
</span><del>- AXAttributeStringSetexpandedTextValue(attrString, renderer, attrStringRange);
</del><ins>+ AXAttributeStringSetExpandedTextValue(attrString, renderer, attrStringRange);
</ins><span class="cx"> AXAttributeStringSetElement(attrString, NSAccessibilityLinkTextAttribute, AccessibilityObject::anchorElementForNode(node), attrStringRange);
</span><span class="cx">
</span><span class="cx"> // do spelling last because it tends to break up the range
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204562 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2016-08-17 17:48:59 UTC (rev 204562)
+++ trunk/Tools/ChangeLog        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-08-17 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Support abbreviations in iOS
+ https://bugs.webkit.org/show_bug.cgi?id=160907
+
+ Reviewed by Joanmarie Diggs.
+
+ * DumpRenderTree/ios/AccessibilityUIElementIOS.mm:
+ (AccessibilityUIElement::stringAttributeValue):
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::stringAttributeValue):
+
</ins><span class="cx"> 2016-08-17 Gyuyoung Kim <gyuyoung.kim@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Bump efl version from 1.17 to 1.18
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm (204562 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm        2016-08-17 17:48:59 UTC (rev 204562)
+++ trunk/Tools/DumpRenderTree/ios/AccessibilityUIElementIOS.mm        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx"> - (UIAccessibilityTraits)_axContainedByFieldsetTrait;
</span><span class="cx"> - (id)_accessibilityFieldsetAncestor;
</span><span class="cx"> - (BOOL)_accessibilityHasTouchEventListener;
</span><ins>+- (NSString *)accessibilityExpandedTextValue;
</ins><span class="cx">
</span><span class="cx"> // TextMarker related
</span><span class="cx"> - (NSArray *)textMarkerRange;
</span><span class="lines">@@ -647,6 +648,9 @@
</span><span class="cx">
</span><span class="cx"> if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
</span><span class="cx"> return [[m_element accessibilityARIACurrentStatus] createJSStringRef];
</span><ins>+
+ if (JSStringIsEqualToUTF8CString(attribute, "AXExpandedTextValue"))
+ return [[m_element accessibilityExpandedTextValue] createJSStringRef];
</ins><span class="cx">
</span><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundleiosAccessibilityUIElementIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (204562 => 204563)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm        2016-08-17 17:48:59 UTC (rev 204562)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm        2016-08-17 18:01:41 UTC (rev 204563)
</span><span class="lines">@@ -73,6 +73,7 @@
</span><span class="cx"> - (UIAccessibilityTraits)_axContainedByFieldsetTrait;
</span><span class="cx"> - (id)_accessibilityFieldsetAncestor;
</span><span class="cx"> - (BOOL)_accessibilityHasTouchEventListener;
</span><ins>+- (NSString *)accessibilityExpandedTextValue;
</ins><span class="cx">
</span><span class="cx"> // TextMarker related
</span><span class="cx"> - (NSArray *)textMarkerRange;
</span><span class="lines">@@ -339,7 +340,10 @@
</span><span class="cx">
</span><span class="cx"> if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
</span><span class="cx"> return [[m_element accessibilityARIACurrentStatus] createJSStringRef];
</span><del>-
</del><ins>+
+ if (JSStringIsEqualToUTF8CString(attribute, "AXExpandedTextValue"))
+ return [[m_element accessibilityExpandedTextValue] createJSStringRef];
+
</ins><span class="cx"> return JSStringCreateWithCharacters(0, 0);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>