<!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>[164635] 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/164635">164635</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-02-25 00:08:17 -0800 (Tue, 25 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Support abbr, acronym
https://bugs.webkit.org/show_bug.cgi?id=128860
Reviewed by Mario Sanchez Prada.
Source/WebCore:
Expose the data in <abbr>, <acronym> and <th abbr=""> as an
alternateTextValue() parameter.
Test: platform/mac/accessibility/abbr-acronym-tags.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::hasTagName):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityObject::alternateTextValue):
(WebCore::AccessibilityObject::supportsAlternateTextValue):
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::alternateTextValue):
(WebCore::AccessibilityRenderObject::supportsAlternateTextValue):
* accessibility/AccessibilityRenderObject.h:
* accessibility/AccessibilityTableCell.cpp:
(WebCore::AccessibilityTableCell::alternateTextValue):
(WebCore::AccessibilityTableCell::supportsAlternateTextValue):
* accessibility/AccessibilityTableCell.h:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(AXAttributeStringSetAlternateTextValue):
(AXAttributedStringAppendText):
(-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
LayoutTests:
* platform/mac/accessibility/abbr-acronym-tags-expected.txt: Added.
* platform/mac/accessibility/abbr-acronym-tags.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="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp">trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityTableCellh">trunk/Source/WebCore/accessibility/AccessibilityTableCell.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityabbracronymtagsexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/abbr-acronym-tags-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityabbracronymtagshtml">trunk/LayoutTests/platform/mac/accessibility/abbr-acronym-tags.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/LayoutTests/ChangeLog 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-24 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Support abbr, acronym
+ https://bugs.webkit.org/show_bug.cgi?id=128860
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/mac/accessibility/abbr-acronym-tags-expected.txt: Added.
+ * platform/mac/accessibility/abbr-acronym-tags.html: Added.
+
</ins><span class="cx"> 2014-02-24 Oliver Hunt <oliver@apple.com>
</span><span class="cx">
</span><span class="cx"> Spread operator has a bad time when applied to call function
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityabbracronymtagsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/abbr-acronym-tags-expected.txt (0 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/abbr-acronym-tags-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/abbr-acronym-tags-expected.txt 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+WWW
+WK2
+Longer Test
+test
+This tests that 'alternate text' for certain tags works correctly, including abbr tag, acronym tag and abbr attribute.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS abbr.stringAttributeValue('AXExpandedTextValue') is 'World Wide Web'
+PASS content.attributedStringForTextMarkerRangeContainsAttribute('AXExpandedTextValue', markerRange) is true
+PASS acronym.stringAttributeValue('AXExpandedTextValue') is 'WebKit2'
+PASS content.attributedStringForTextMarkerRangeContainsAttribute('AXExpandedTextValue', markerRange) is true
+PASS headerCell.stringAttributeValue('AXExpandedTextValue') is 'Test'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityabbracronymtagshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/abbr-acronym-tags.html (0 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/abbr-acronym-tags.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/abbr-acronym-tags.html 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -0,0 +1,53 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div id="content1">
+<abbr title="World Wide Web">WWW</abbr>
+</div>
+
+<div id="content2">
+<acronym title="WebKit2">WK2</acronym>
+</div>
+
+<table border=1>
+<tr><th id="cell" abbr="Test">Longer Test</th></tr>
+<tr><td>test</td></tr>
+</table>
+
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that 'alternate text' for certain tags works correctly, including abbr tag, acronym tag and abbr attribute.");
+
+ if (window.accessibilityController) {
+
+ var content = accessibilityController.accessibleElementById("content1");
+ var abbr = content.childAtIndex(0);
+ shouldBe("abbr.stringAttributeValue('AXExpandedTextValue')", "'World Wide Web'");
+ var markerRange = content.textMarkerRangeForElement(content);
+ shouldBeTrue("content.attributedStringForTextMarkerRangeContainsAttribute('AXExpandedTextValue', markerRange)");
+
+ content = accessibilityController.accessibleElementById("content2");
+ var acronym = content.childAtIndex(0);
+ shouldBe("acronym.stringAttributeValue('AXExpandedTextValue')", "'WebKit2'");
+ markerRange = content.textMarkerRangeForElement(content);
+ shouldBeTrue("content.attributedStringForTextMarkerRangeContainsAttribute('AXExpandedTextValue', markerRange)");
+
+ var headerCell = accessibilityController.accessibleElementById("cell");
+ shouldBe("headerCell.stringAttributeValue('AXExpandedTextValue')", "'Test'");
+
+
+ }
+
+</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 (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/Source/WebCore/ChangeLog 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2014-02-24 Chris Fleizach <cfleizach@apple.com>
+
+ AX: Support abbr, acronym
+ https://bugs.webkit.org/show_bug.cgi?id=128860
+
+ Reviewed by Mario Sanchez Prada.
+
+ Expose the data in <abbr>, <acronym> and <th abbr=""> as an
+ alternateTextValue() parameter.
+
+ Test: platform/mac/accessibility/abbr-acronym-tags.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::hasTagName):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::alternateTextValue):
+ (WebCore::AccessibilityObject::supportsAlternateTextValue):
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::alternateTextValue):
+ (WebCore::AccessibilityRenderObject::supportsAlternateTextValue):
+ * accessibility/AccessibilityRenderObject.h:
+ * accessibility/AccessibilityTableCell.cpp:
+ (WebCore::AccessibilityTableCell::alternateTextValue):
+ (WebCore::AccessibilityTableCell::supportsAlternateTextValue):
+ * accessibility/AccessibilityTableCell.h:
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (AXAttributeStringSetAlternateTextValue):
+ (AXAttributedStringAppendText):
+ (-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
</ins><span class="cx"> 2014-02-24 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] generate-gtkdoc should not generate documentation for source files for unbuilt source files
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -1548,6 +1548,13 @@
</span><span class="cx"> return invalidStatusTrue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityObject::hasTagName(const QualifiedName& tagName) const
+{
+ if (Node* node = this->node())
+ return node->hasTagName(tagName);
+ return false;
+}
+
</ins><span class="cx"> bool AccessibilityObject::hasAttribute(const QualifiedName& attribute) const
</span><span class="cx"> {
</span><span class="cx"> Node* elementNode = node();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -659,7 +659,11 @@
</span><span class="cx"> virtual String ariaLabeledByAttribute() const { return String(); }
</span><span class="cx"> virtual String ariaDescribedByAttribute() const { return String(); }
</span><span class="cx"> const AtomicString& placeholderValue() const;
</span><del>-
</del><ins>+
+ // Abbreviations
+ virtual String expandedTextValue() const { return String(); }
+ virtual bool supportsExpandedTextValue() const { return false; }
+
</ins><span class="cx"> void elementsFromAttribute(Vector<Element*>&, const QualifiedName&) const;
</span><span class="cx">
</span><span class="cx"> // Only if isColorWell()
</span><span class="lines">@@ -757,6 +761,7 @@
</span><span class="cx"> static AccessibilityRole ariaRoleToWebCoreRole(const String&);
</span><span class="cx"> bool hasAttribute(const QualifiedName&) const;
</span><span class="cx"> const AtomicString& getAttribute(const QualifiedName&) const;
</span><ins>+ bool hasTagName(const QualifiedName&) const;
</ins><span class="cx">
</span><span class="cx"> virtual VisiblePositionRange visiblePositionRange() const { return VisiblePositionRange(); }
</span><span class="cx"> virtual VisiblePositionRange visiblePositionRangeForLine(unsigned) const { return VisiblePositionRange(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -2431,7 +2431,27 @@
</span><span class="cx"> }
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><ins>+
+String AccessibilityRenderObject::expandedTextValue() const
+{
+ if (AccessibilityObject* parent = parentObject()) {
+ if (parent->hasTagName(abbrTag) || parent->hasTagName(acronymTag))
+ return parent->getAttribute(titleAttr);
+ }
+
+ return String();
+}
</ins><span class="cx">
</span><ins>+bool AccessibilityRenderObject::supportsExpandedTextValue() const
+{
+ if (roleValue() == StaticTextRole) {
+ if (AccessibilityObject* parent = parentObject())
+ return parent->hasTagName(abbrTag) || parent->hasTagName(acronymTag);
+ }
+
+ return false;
+}
+
</ins><span class="cx"> AccessibilityRole AccessibilityRenderObject::determineAccessibilityRole()
</span><span class="cx"> {
</span><span class="cx"> if (!m_renderer)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -267,6 +267,8 @@
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="cx"> void updateAttachmentViewParents();
</span><span class="cx"> #endif
</span><ins>+ virtual String expandedTextValue() const;
+ virtual bool supportsExpandedTextValue() const;
</ins><span class="cx">
</span><span class="cx"> void ariaSelectedRows(AccessibilityChildrenVector&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.cpp 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -142,6 +142,16 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+String AccessibilityTableCell::expandedTextValue() const
+{
+ return getAttribute(abbrAttr);
+}
+
+bool AccessibilityTableCell::supportsExpandedTextValue() const
+{
+ return isTableHeaderCell() && hasAttribute(abbrAttr);
+}
+
</ins><span class="cx"> void AccessibilityTableCell::columnHeaders(AccessibilityChildrenVector& headers)
</span><span class="cx"> {
</span><span class="cx"> AccessibilityTable* parent = parentTable();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityTableCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityTableCell.h (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/Source/WebCore/accessibility/AccessibilityTableCell.h 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -64,7 +64,9 @@
</span><span class="cx"> virtual AccessibilityObject* titleUIElement() const override;
</span><span class="cx"> virtual bool exposesTitleUIElement() const override { return true; }
</span><span class="cx"> virtual bool computeAccessibilityIsIgnored() const override;
</span><del>-
</del><ins>+ virtual String expandedTextValue() const;
+ virtual bool supportsExpandedTextValue() const;
+
</ins><span class="cx"> bool isTableCellInSameRowGroup(AccessibilityTableCell*);
</span><span class="cx"> bool isTableCellInSameColGroup(AccessibilityTableCell*);
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (164634 => 164635)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-02-25 07:51:14 UTC (rev 164634)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2014-02-25 08:08:17 UTC (rev 164635)
</span><span class="lines">@@ -197,6 +197,10 @@
</span><span class="cx"> #define NSAccessibilityPathAttribute @"AXPath"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef NSAccessibilityExpandedTextValueAttribute
+#define NSAccessibilityExpandedTextValueAttribute @"AXExpandedTextValue"
+#endif
+
</ins><span class="cx"> #define NSAccessibilityDOMIdentifierAttribute @"AXDOMIdentifier"
</span><span class="cx"> #define NSAccessibilityDOMClassListAttribute @"AXDOMClassList"
</span><span class="cx">
</span><span class="lines">@@ -919,6 +923,17 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void AXAttributeStringSetexpandedTextValue(NSMutableAttributedString *attrString, RenderObject* renderer, NSRange range)
+{
+ if (!renderer || !AXAttributedStringRangeIsValid(attrString, range))
+ return;
+ AccessibilityObject* axObject = renderer->document().axObjectCache()->getOrCreate(renderer);
+ if (axObject->supportsExpandedTextValue())
+ [attrString addAttribute:NSAccessibilityExpandedTextValueAttribute value:axObject->expandedTextValue() range:range];
+ else
+ [attrString removeAttribute:NSAccessibilityExpandedTextValueAttribute range:range];
+}
+
</ins><span class="cx"> static void AXAttributeStringSetHeadingLevel(NSMutableAttributedString* attrString, RenderObject* renderer, NSRange range)
</span><span class="cx"> {
</span><span class="cx"> if (!renderer)
</span><span class="lines">@@ -971,7 +986,8 @@
</span><span class="cx"> static void AXAttributedStringAppendText(NSMutableAttributedString* attrString, Node* node, StringView text)
</span><span class="cx"> {
</span><span class="cx"> // skip invisible text
</span><del>- if (!node->renderer())
</del><ins>+ RenderObject* renderer = node->renderer();
+ if (!renderer)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // easier to calculate the range before appending the string
</span><span class="lines">@@ -993,9 +1009,10 @@
</span><span class="cx"> [attrString removeAttribute:NSAccessibilityMisspelledTextAttribute range:attrStringRange];
</span><span class="cx">
</span><span class="cx"> // set new attributes
</span><del>- AXAttributeStringSetStyle(attrString, node->renderer(), attrStringRange);
- AXAttributeStringSetHeadingLevel(attrString, node->renderer(), attrStringRange);
- AXAttributeStringSetBlockquoteLevel(attrString, node->renderer(), attrStringRange);
</del><ins>+ AXAttributeStringSetStyle(attrString, renderer, attrStringRange);
+ AXAttributeStringSetHeadingLevel(attrString, renderer, attrStringRange);
+ AXAttributeStringSetBlockquoteLevel(attrString, renderer, attrStringRange);
+ 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 class="lines">@@ -1214,6 +1231,9 @@
</span><span class="cx"> if (m_object->supportsPath())
</span><span class="cx"> [additional addObject:NSAccessibilityPathAttribute];
</span><span class="cx">
</span><ins>+ if (m_object->supportsExpandedTextValue())
+ [additional addObject:NSAccessibilityExpandedTextValueAttribute];
+
</ins><span class="cx"> return additional;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2848,6 +2868,9 @@
</span><span class="cx"> return [self accessibilityMathPrescriptPairs];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ([attributeName isEqualToString:NSAccessibilityExpandedTextValueAttribute])
+ return m_object->expandedTextValue();
+
</ins><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityDOMIdentifierAttribute])
</span><span class="cx"> return m_object->identifierAttribute();
</span><span class="cx"> if ([attributeName isEqualToString:NSAccessibilityDOMClassListAttribute]) {
</span></span></pre>
</div>
</div>
</body>
</html>