<!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>[198942] 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/198942">198942</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-03-31 23:31:37 -0700 (Thu, 31 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: &lt;attachment&gt; element not accessible
https://bugs.webkit.org/show_bug.cgi?id=156045

Reviewed by Joanmarie Diggs.

Source/WebCore:

Make this element accessible by exposing title, subtitle, action, progress to accessibility.

Test: accessibility/attachment-element.html

* accessibility/AXObjectCache.cpp:
(WebCore::createFromRenderer):
* accessibility/AccessibilityAttachment.cpp: Added.
(WebCore::AccessibilityAttachment::AccessibilityAttachment):
(WebCore::AccessibilityAttachment::create):
(WebCore::AccessibilityAttachment::hasProgress):
(WebCore::AccessibilityAttachment::valueForRange):
(WebCore::AccessibilityAttachment::attachmentElement):
(WebCore::AccessibilityAttachment::roleDescription):
(WebCore::AccessibilityAttachment::computeAccessibilityIsIgnored):
(WebCore::AccessibilityAttachment::accessibilityText):
(WebCore::AccessibilityAttachment::accessibilityDescription):
* accessibility/AccessibilityAttachment.h: Added.
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::hasHighlighting):
(WebCore::AccessibilityObject::roleDescription):
(WebCore::AccessibilityObject::supportsRangeValue):
(WebCore::AccessibilityObject::supportsARIASetSize):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityObject::isAttachmentElement):
(WebCore::AccessibilityObject::isHeading):
(WebCore::AccessibilityObject::isLink):
(WebCore::AccessibilityObject::isImage):
(WebCore::AccessibilityObject::isRadioButton):
(WebCore::AccessibilityObject::isListBox):
(WebCore::AccessibilityObject::isListBoxOption):
(WebCore::AccessibilityObject::isAttachment):
(WebCore::AccessibilityObject::isMediaTimeline):
(WebCore::AccessibilityObject::isMenuRelated):
(WebCore::AccessibilityObject::isMenu):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper accessibilityValue]):

LayoutTests:

* accessibility/attachment-element-expected.txt: Added.
* accessibility/attachment-element.html: Added.
* platform/efl/TestExpectations:
* platform/gtk/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreEnglishlprojLocalizablestrings">trunk/Source/WebCore/English.lproj/Localizable.strings</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityAllInOnecpp">trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp</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="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.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>

<h3>Added Paths</h3>
<ul>
<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="#trunkSourceWebCoreaccessibilityAccessibilityAttachmentcpp">trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityAttachmenth">trunk/Source/WebCore/accessibility/AccessibilityAttachment.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/LayoutTests/ChangeLog        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-03-31  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
+        AX: &lt;attachment&gt; element not accessible
+        https://bugs.webkit.org/show_bug.cgi?id=156045
+
+        Reviewed by Joanmarie Diggs.
+
+        * accessibility/attachment-element-expected.txt: Added.
+        * accessibility/attachment-element.html: Added.
+        * platform/efl/TestExpectations:
+        * platform/gtk/TestExpectations:
+
</ins><span class="cx"> 2016-03-31  Nan Wang  &lt;n_wang@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: AX hit-testing does not work on WebKit video playback buttons
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityattachmentelementexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/attachment-element-expected.txt (0 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/attachment-element-expected.txt                                (rev 0)
+++ trunk/LayoutTests/accessibility/attachment-element-expected.txt        2016-04-01 06:31:37 UTC (rev 198942)
</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: AXDescription: title, subtitle, action
+Attachment value: AXValue: 0.5
+Attachment role: AXRoleDescription: attachment
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityattachmentelementhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/attachment-element.html (0 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/attachment-element.html                                (rev 0)
+++ trunk/LayoutTests/accessibility/attachment-element.html        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+&lt;!DOCTYPE HTML PUBLIC &quot;-//IETF//DTD HTML//EN&quot;&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;meta charset=&quot;utf-8&quot;&gt;
+&lt;script src=&quot;../resources/js-test-pre.js&quot;&gt;&lt;/script&gt;
+&lt;script&gt;
+    if (window.internals)
+        window.internals.settings.setAttachmentElementEnabled(true)
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body id=&quot;body&quot;&gt;
+
+&lt;attachment id=&quot;attachment&quot; title=&quot;title&quot; subtitle=&quot;subtitle&quot; action=&quot;action&quot; progress=&quot;0.5&quot;&gt;&lt;/attachment&gt;
+
+&lt;p id=&quot;description&quot;&gt;&lt;/p&gt;
+&lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
+
+&lt;script&gt;
+
+    description(&quot;This tests that attachment elements are accessible.&quot;);
+
+    if (window.accessibilityController) {
+        var content = accessibilityController.accessibleElementById(&quot;attachment&quot;);
+        debug(&quot;Attachment description: &quot; + content.description);
+        debug(&quot;Attachment value: &quot; + content.stringValue);
+        debug(&quot;Attachment role: &quot; + content.roleDescription);
+    }
+
+&lt;/script&gt;
+
+&lt;script src=&quot;../resources/js-test-post.js&quot;&gt;&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/LayoutTests/platform/efl/TestExpectations        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -2104,6 +2104,7 @@
</span><span class="cx"> webkit.org/b/112018 accessibility/th-as-title-ui.html [ Failure ]
</span><span class="cx"> webkit.org/b/112021 accessibility/visible-elements.html [ Failure Crash ]
</span><span class="cx"> webkit.org/b/133148 accessibility/set-selected-text-range-contenteditable.html [ Skip ]
</span><ins>+webkit.org/b/156045 accessibility/attachment-element.html [ Skip ]
</ins><span class="cx"> 
</span><span class="cx"> # New accessibility test added in r151079 that is failing for EFL.
</span><span class="cx"> webkit.org/b/117182 accessibility/text-role-with-aria-hidden-inside.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/LayoutTests/platform/gtk/TestExpectations        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> webkit.org/b/141074 accessibility/auto-filled-value.html [ Skip ]
</span><span class="cx"> webkit.org/b/133148 accessibility/content-editable-as-textarea.html [ Skip ]
</span><span class="cx"> webkit.org/b/133148 accessibility/set-selected-text-range-contenteditable.html [ Skip ]
</span><ins>+webkit.org/b/156045 accessibility/attachment-element.html [ Skip ]
</ins><span class="cx"> 
</span><span class="cx"> # Feature disabled, see: https://bugs.webkit.org/show_bug.cgi?id=85425
</span><span class="cx"> webkit.org/b/98925 fast/viewport/viewport-legacy-handheldfriendly.html [ Skip ]
</span></span></pre></div>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/CMakeLists.txt        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -1043,6 +1043,7 @@
</span><span class="cx">     accessibility/AccessibilityARIAGrid.cpp
</span><span class="cx">     accessibility/AccessibilityARIAGridCell.cpp
</span><span class="cx">     accessibility/AccessibilityARIAGridRow.cpp
</span><ins>+    accessibility/AccessibilityAttachment.cpp
</ins><span class="cx">     accessibility/AccessibilityImageMapLink.cpp
</span><span class="cx">     accessibility/AccessibilityList.cpp
</span><span class="cx">     accessibility/AccessibilityListBox.cpp
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/ChangeLog        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2016-03-31  Chris Fleizach  &lt;cfleizach@apple.com&gt;
+
+        AX: &lt;attachment&gt; element not accessible
+        https://bugs.webkit.org/show_bug.cgi?id=156045
+
+        Reviewed by Joanmarie Diggs.
+
+        Make this element accessible by exposing title, subtitle, action, progress to accessibility.
+
+        Test: accessibility/attachment-element.html
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::createFromRenderer):
+        * accessibility/AccessibilityAttachment.cpp: Added.
+        (WebCore::AccessibilityAttachment::AccessibilityAttachment):
+        (WebCore::AccessibilityAttachment::create):
+        (WebCore::AccessibilityAttachment::hasProgress):
+        (WebCore::AccessibilityAttachment::valueForRange):
+        (WebCore::AccessibilityAttachment::attachmentElement):
+        (WebCore::AccessibilityAttachment::roleDescription):
+        (WebCore::AccessibilityAttachment::computeAccessibilityIsIgnored):
+        (WebCore::AccessibilityAttachment::accessibilityText):
+        (WebCore::AccessibilityAttachment::accessibilityDescription):
+        * accessibility/AccessibilityAttachment.h: Added.
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::hasHighlighting):
+        (WebCore::AccessibilityObject::roleDescription):
+        (WebCore::AccessibilityObject::supportsRangeValue):
+        (WebCore::AccessibilityObject::supportsARIASetSize):
+        * accessibility/AccessibilityObject.h:
+        (WebCore::AccessibilityObject::isAttachmentElement):
+        (WebCore::AccessibilityObject::isHeading):
+        (WebCore::AccessibilityObject::isLink):
+        (WebCore::AccessibilityObject::isImage):
+        (WebCore::AccessibilityObject::isRadioButton):
+        (WebCore::AccessibilityObject::isListBox):
+        (WebCore::AccessibilityObject::isListBoxOption):
+        (WebCore::AccessibilityObject::isAttachment):
+        (WebCore::AccessibilityObject::isMediaTimeline):
+        (WebCore::AccessibilityObject::isMenuRelated):
+        (WebCore::AccessibilityObject::isMenu):
+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityValue]):
+
</ins><span class="cx"> 2016-03-31  Nan Wang  &lt;n_wang@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         AX: AX hit-testing does not work on WebKit video playback buttons
</span></span></pre></div>
<a id="trunkSourceWebCoreEnglishlprojLocalizablestrings"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/English.lproj/Localizable.strings (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/English.lproj/Localizable.strings        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/English.lproj/Localizable.strings        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -724,6 +724,9 @@
</span><span class="cx"> /* An ARIA accessibility group that acts as an article. */
</span><span class="cx"> &quot;article&quot; = &quot;article&quot;;
</span><span class="cx"> 
</span><ins>+/* accessibility role description for an attachment element */
+&quot;attachment&quot; = &quot;attachment&quot;;
+
</ins><span class="cx"> /* accessibility help text for audio element controller */
</span><span class="cx"> &quot;audio element playback controls and status display&quot; = &quot;audio element playback controls and status display&quot;;
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -1084,6 +1084,8 @@
</span><span class="cx">                 26FAE4CD1852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */; };
</span><span class="cx">                 26FAE4CE1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 26FAE4CA1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp */; };
</span><span class="cx">                 26FAE4CF1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 26FAE4CB1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.h */; };
</span><ins>+                2914E3071CAB5A440049966F /* AccessibilityAttachment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2914E3051CAB5A440049966F /* AccessibilityAttachment.cpp */; };
+                2914E3081CAB5A440049966F /* AccessibilityAttachment.h in Headers */ = {isa = PBXBuildFile; fileRef = 2914E3061CAB5A440049966F /* AccessibilityAttachment.h */; };
</ins><span class="cx">                 2917B5611473496C0052C9D0 /* LayerFlushScheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2917B55E1473496C0052C9D0 /* LayerFlushScheduler.cpp */; };
</span><span class="cx">                 2917B5621473496C0052C9D0 /* LayerFlushScheduler.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx">                 2917B5631473496C0052C9D0 /* LayerFlushSchedulerClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 2917B5601473496C0052C9D0 /* LayerFlushSchedulerClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -8529,6 +8531,8 @@
</span><span class="cx">                 26FAE4C91852E3A5004C8C46 /* ResourceHandleCFURLConnectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceHandleCFURLConnectionDelegate.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 26FAE4CA1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SynchronousResourceHandleCFURLConnectionDelegate.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 26FAE4CB1852E3A5004C8C46 /* SynchronousResourceHandleCFURLConnectionDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SynchronousResourceHandleCFURLConnectionDelegate.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><ins>+                2914E3051CAB5A440049966F /* AccessibilityAttachment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AccessibilityAttachment.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
+                2914E3061CAB5A440049966F /* AccessibilityAttachment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityAttachment.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</ins><span class="cx">                 2917B55E1473496C0052C9D0 /* LayerFlushScheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LayerFlushScheduler.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 2917B55F1473496C0052C9D0 /* LayerFlushScheduler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerFlushScheduler.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="cx">                 2917B5601473496C0052C9D0 /* LayerFlushSchedulerClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LayerFlushSchedulerClient.h; sourceTree = &quot;&lt;group&gt;&quot;; };
</span><span class="lines">@@ -16441,6 +16445,8 @@
</span><span class="cx">                                 29A812100FBB9C1D00510293 /* AccessibilityARIAGridCell.h */,
</span><span class="cx">                                 2981CA9F131822EC00D12F2A /* AccessibilityARIAGridRow.cpp */,
</span><span class="cx">                                 29A812150FBB9C1D00510293 /* AccessibilityARIAGridRow.h */,
</span><ins>+                                2914E3051CAB5A440049966F /* AccessibilityAttachment.cpp */,
+                                2914E3061CAB5A440049966F /* AccessibilityAttachment.h */,
</ins><span class="cx">                                 2981CAA0131822EC00D12F2A /* AccessibilityImageMapLink.cpp */,
</span><span class="cx">                                 29A8121D0FBB9C1D00510293 /* AccessibilityImageMapLink.h */,
</span><span class="cx">                                 2981CAA1131822EC00D12F2A /* AccessibilityList.cpp */,
</span><span class="lines">@@ -26028,6 +26034,7 @@
</span><span class="cx">                                 C58361A91744523F00173511 /* FontServicesIOS.h in Headers */,
</span><span class="cx">                                 C2015C0A1BE6FEB200822389 /* FontVariantBuilder.h in Headers */,
</span><span class="cx">                                 4A0DA2FF129B241900AB61E1 /* FormAssociatedElement.h in Headers */,
</span><ins>+                                2914E3081CAB5A440049966F /* AccessibilityAttachment.h in Headers */,
</ins><span class="cx">                                 D05CED2A0A40BB2C00C5AF38 /* FormatBlockCommand.h in Headers */,
</span><span class="cx">                                 7CE6CBFB187F370700D46BF5 /* FormatConverter.h in Headers */,
</span><span class="cx">                                 F50664F8157F52DC00AC226F /* FormController.h in Headers */,
</span><span class="lines">@@ -31844,6 +31851,7 @@
</span><span class="cx">                                 F55B3DDD1251F12D003EF269 /* URLInputType.cpp in Sources */,
</span><span class="cx">                                 6593923A09AE435C002C531F /* URLMac.mm in Sources */,
</span><span class="cx">                                 A769E96A16689D0C005D4529 /* UserActionElementSet.cpp in Sources */,
</span><ins>+                                2914E3071CAB5A440049966F /* AccessibilityAttachment.cpp in Sources */,
</ins><span class="cx">                                 868160D418766A0A0021E79D /* UserActivity.cpp in Sources */,
</span><span class="cx">                                 868160D518766A0E0021E79D /* UserActivityMac.mm in Sources */,
</span><span class="cx">                                 5D5975B71963637B00D00878 /* UserAgent.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include &quot;AccessibilityARIAGrid.h&quot;
</span><span class="cx"> #include &quot;AccessibilityARIAGridCell.h&quot;
</span><span class="cx"> #include &quot;AccessibilityARIAGridRow.h&quot;
</span><ins>+#include &quot;AccessibilityAttachment.h&quot;
</ins><span class="cx"> #include &quot;AccessibilityImageMapLink.h&quot;
</span><span class="cx"> #include &quot;AccessibilityList.h&quot;
</span><span class="cx"> #include &quot;AccessibilityListBox.h&quot;
</span><span class="lines">@@ -71,6 +72,7 @@
</span><span class="cx"> #include &quot;HTMLMeterElement.h&quot;
</span><span class="cx"> #include &quot;HTMLNames.h&quot;
</span><span class="cx"> #include &quot;Page.h&quot;
</span><ins>+#include &quot;RenderAttachment.h&quot;
</ins><span class="cx"> #include &quot;RenderListBox.h&quot;
</span><span class="cx"> #include &quot;RenderMenuList.h&quot;
</span><span class="cx"> #include &quot;RenderMeter.h&quot;
</span><span class="lines">@@ -428,6 +430,10 @@
</span><span class="cx">         if (is&lt;RenderProgress&gt;(cssBox))
</span><span class="cx">             return AccessibilityProgressIndicator::create(&amp;downcast&lt;RenderProgress&gt;(cssBox));
</span><span class="cx"> 
</span><ins>+#if ENABLE(ATTACHMENT_ELEMENT)
+        if (is&lt;RenderAttachment&gt;(cssBox))
+            return AccessibilityAttachment::create(&amp;downcast&lt;RenderAttachment&gt;(cssBox));
+#endif
</ins><span class="cx"> #if ENABLE(METER_ELEMENT)
</span><span class="cx">         if (is&lt;RenderMeter&gt;(cssBox))
</span><span class="cx">             return AccessibilityProgressIndicator::create(&amp;downcast&lt;RenderMeter&gt;(cssBox));
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityAllInOnecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/accessibility/AccessibilityAllInOne.cpp        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> #include &quot;AccessibilityARIAGrid.cpp&quot;
</span><span class="cx"> #include &quot;AccessibilityARIAGridCell.cpp&quot;
</span><span class="cx"> #include &quot;AccessibilityARIAGridRow.cpp&quot;
</span><ins>+#include &quot;AccessibilityAttachment.cpp&quot;
</ins><span class="cx"> #include &quot;AccessibilityImageMapLink.cpp&quot;
</span><span class="cx"> #include &quot;AccessibilityList.cpp&quot;
</span><span class="cx"> #include &quot;AccessibilityListBox.cpp&quot;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityAttachmentcpp"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp (0 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp                                (rev 0)
+++ trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -0,0 +1,110 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include &quot;config.h&quot;
+#include &quot;AccessibilityAttachment.h&quot;
+
+#include &quot;HTMLAttachmentElement.h&quot;
+#include &quot;HTMLNames.h&quot;
+#include &quot;LocalizedStrings.h&quot;
+#include &quot;RenderAttachment.h&quot;
+
+#if ENABLE(ATTACHMENT_ELEMENT)
+
+namespace WebCore {
+    
+using namespace HTMLNames;
+
+AccessibilityAttachment::AccessibilityAttachment(RenderAttachment* renderer)
+    : AccessibilityRenderObject(renderer)
+{
+}
+
+Ref&lt;AccessibilityAttachment&gt; AccessibilityAttachment::create(RenderAttachment* renderer)
+{
+    return adoptRef(*new AccessibilityAttachment(renderer));
+}
+
+bool AccessibilityAttachment::hasProgress(float* progress) const
+{
+    auto&amp; progressString = getAttribute(progressAttr);
+    bool validProgress;
+    float result = std::max&lt;float&gt;(std::min&lt;float&gt;(progressString.toFloat(&amp;validProgress), 1), 0);
+    if (progress)
+        *progress = result;
+    return validProgress;
+}
+
+float AccessibilityAttachment::valueForRange() const
+{
+    float progress = 0;
+    hasProgress(&amp;progress);
+    return progress;
+}
+    
+HTMLAttachmentElement* AccessibilityAttachment::attachmentElement() const
+{
+    ASSERT(is&lt;HTMLAttachmentElement&gt;(node()));
+    if (!is&lt;HTMLAttachmentElement&gt;(node()))
+        return nullptr;
+    
+    return downcast&lt;HTMLAttachmentElement&gt;(node());
+}
+    
+String AccessibilityAttachment::roleDescription() const
+{
+    return AXAttachmentRoleText();
+}
+
+bool AccessibilityAttachment::computeAccessibilityIsIgnored() const
+{
+    return false;
+}
+    
+void AccessibilityAttachment::accessibilityText(Vector&lt;AccessibilityText&gt;&amp; textOrder)
+{
+    HTMLAttachmentElement* attachmentElement = this-&gt;attachmentElement();
+    if (!attachmentElement)
+        return;
+    
+    auto title = attachmentElement-&gt;attachmentTitle();
+    auto&amp; subtitle = getAttribute(subtitleAttr);
+    auto&amp; action = getAttribute(actionAttr);
+    
+    if (title.length())
+        textOrder.append(AccessibilityText(title, TitleText));
+
+    if (subtitle.length())
+        textOrder.append(AccessibilityText(subtitle, SubtitleText));
+    
+    if (action.length())
+        textOrder.append(AccessibilityText(action, ActionText));
+}
+
+} // namespace WebCore
+
+#endif // ENABLE(ATTACHMENT_ELEMENT)
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityAttachmenth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/accessibility/AccessibilityAttachment.h (0 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityAttachment.h                                (rev 0)
+++ trunk/Source/WebCore/accessibility/AccessibilityAttachment.h        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -0,0 +1,62 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1.  Redistributions of source code must retain the above copyright
+ *     notice, this list of conditions and the following disclaimer.
+ * 2.  Redistributions in binary form must reproduce the above copyright
+ *     notice, this list of conditions and the following disclaimer in the
+ *     documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * &quot;AS IS&quot; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef AccessibilityAttachment_h
+#define AccessibilityAttachment_h
+
+#if ENABLE(ATTACHMENT_ELEMENT)
+
+#include &quot;AccessibilityRenderObject.h&quot;
+
+namespace WebCore {
+    
+class HTMLAttachmentElement;
+class RenderAttachment;
+    
+class AccessibilityAttachment final : public AccessibilityRenderObject {
+public:
+    static Ref&lt;AccessibilityAttachment&gt; create(RenderAttachment*);
+    HTMLAttachmentElement* attachmentElement() const;
+    bool hasProgress(float* progress = nullptr) const;
+    
+private:
+    AccessibilityRole roleValue() const override { return ButtonRole; }
+    bool isAttachmentElement() const override { return true; }
+
+    String roleDescription() const override;
+    float valueForRange() const override;
+    bool computeAccessibilityIsIgnored() const override;
+    void accessibilityText(Vector&lt;AccessibilityText&gt;&amp;) override;
+    explicit AccessibilityAttachment(RenderAttachment*);
+};
+    
+} // namespace WebCore
+
+SPECIALIZE_TYPE_TRAITS_ACCESSIBILITY(AccessibilityAttachment, isAttachmentElement())
+
+#endif // ENABLE(ATTACHMENT_ELEMENT)
+
+#endif // AccessibilityAttachment_h
</ins></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -2153,7 +2153,7 @@
</span><span class="cx">     return false;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-const AtomicString&amp; AccessibilityObject::roleDescription() const
</del><ins>+String AccessibilityObject::roleDescription() const
</ins><span class="cx"> {
</span><span class="cx">     return getAttribute(aria_roledescriptionAttr);
</span><span class="cx"> }
</span><span class="lines">@@ -2347,7 +2347,8 @@
</span><span class="cx">     return isProgressIndicator()
</span><span class="cx">         || isSlider()
</span><span class="cx">         || isScrollbar()
</span><del>-        || isSpinButton();
</del><ins>+        || isSpinButton()
+        || isAttachmentElement();
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> bool AccessibilityObject::supportsARIASetSize() const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -237,6 +237,9 @@
</span><span class="cx">     TitleTagText,
</span><span class="cx">     PlaceholderText,
</span><span class="cx">     LabelByElementText,
</span><ins>+    TitleText,
+    SubtitleText,
+    ActionText,
</ins><span class="cx"> };
</span><span class="cx">     
</span><span class="cx"> struct AccessibilityText {
</span><span class="lines">@@ -473,7 +476,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool accessibilityObjectContainsText(String *) const;
</span><span class="cx"> 
</span><del>-    virtual bool isAttachment() const { return false; }
</del><ins>+    virtual bool isAttachmentElement() const { return false; }
</ins><span class="cx">     virtual bool isHeading() const { return false; }
</span><span class="cx">     virtual bool isLink() const { return false; }
</span><span class="cx">     virtual bool isImage() const { return false; }
</span><span class="lines">@@ -490,6 +493,7 @@
</span><span class="cx">     virtual bool isRadioButton() const { return roleValue() == RadioButtonRole; }
</span><span class="cx">     virtual bool isListBox() const { return roleValue() == ListBoxRole; }
</span><span class="cx">     virtual bool isListBoxOption() const { return false; }
</span><ins>+    virtual bool isAttachment() const { return false; }
</ins><span class="cx">     virtual bool isMediaTimeline() const { return false; }
</span><span class="cx">     virtual bool isMenuRelated() const { return false; }
</span><span class="cx">     virtual bool isMenu() const { return false; }
</span><span class="lines">@@ -634,7 +638,7 @@
</span><span class="cx">     bool supportsRangeValue() const;
</span><span class="cx">     String identifierAttribute() const;
</span><span class="cx">     void classList(Vector&lt;String&gt;&amp;) const;
</span><del>-    const AtomicString&amp; roleDescription() const;
</del><ins>+    virtual String roleDescription() const;
</ins><span class="cx">     AccessibilityARIACurrentState ariaCurrentState() const;
</span><span class="cx">     
</span><span class="cx">     // This function checks if the object should be ignored when there's a modal dialog displayed.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx"> 
</span><span class="cx"> #if HAVE(ACCESSIBILITY) &amp;&amp; PLATFORM(IOS)
</span><span class="cx"> 
</span><ins>+#import &quot;AccessibilityAttachment.h&quot;
</ins><span class="cx"> #import &quot;AccessibilityRenderObject.h&quot;
</span><span class="cx"> #import &quot;AccessibilityScrollView.h&quot;
</span><span class="cx"> #import &quot;AccessibilityTable.h&quot;
</span><span class="lines">@@ -1252,6 +1253,9 @@
</span><span class="cx">         return [NSString stringWithFormat:@&quot;%.2f&quot;, m_object-&gt;valueForRange()];
</span><span class="cx">     }
</span><span class="cx"> 
</span><ins>+    if (is&lt;AccessibilityAttachment&gt;(m_object) &amp;&amp; downcast&lt;AccessibilityAttachment&gt;(m_object)-&gt;hasProgress())
+        return [NSString stringWithFormat:@&quot;%.2f&quot;, m_object-&gt;valueForRange()];
+    
</ins><span class="cx">     if (m_object-&gt;isHeading())
</span><span class="cx">         return [NSString stringWithFormat:@&quot;%d&quot;, m_object-&gt;headingLevel()];
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -189,13 +189,27 @@
</span><span class="cx">     
</span><span class="cx">     Vector&lt;AccessibilityText&gt; textOrder;
</span><span class="cx">     m_object-&gt;accessibilityText(textOrder);
</span><del>-    
</del><ins>+
+    NSMutableString *returnText = [NSMutableString string];
</ins><span class="cx">     bool visibleTextAvailable = false;
</span><span class="cx">     for (const auto&amp; text : textOrder) {
</span><del>-        if (text.textSource == AlternativeText)
-            return text.text;
</del><ins>+        if (text.textSource == AlternativeText) {
+            [returnText appendString:text.text];
+            break;
+        }
</ins><span class="cx">         
</span><span class="cx">         switch (text.textSource) {
</span><ins>+        // These are sub-components of one element (Attachment) that are re-combined in OSX and iOS.
+        case TitleText:
+        case SubtitleText:
+        case ActionText: {
+            if (!text.text.length())
+                break;
+            if ([returnText length])
+                [returnText appendString:@&quot;, &quot;];
+            [returnText appendString:text.text];
+            break;
+        }
</ins><span class="cx">         case VisibleText:
</span><span class="cx">         case ChildrenText:
</span><span class="cx">         case LabelByElementText:
</span><span class="lines">@@ -205,11 +219,13 @@
</span><span class="cx">             break;
</span><span class="cx">         }
</span><span class="cx">         
</span><del>-        if (text.textSource == TitleTagText &amp;&amp; !visibleTextAvailable)
-            return text.text;
</del><ins>+        if (text.textSource == TitleTagText &amp;&amp; !visibleTextAvailable) {
+            [returnText appendString:text.text];
+            break;
+        }
</ins><span class="cx">     }
</span><span class="cx">     
</span><del>-    return [NSString string];
</del><ins>+    return returnText;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> - (NSString *)baseAccessibilityHelpText
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.cpp        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -619,6 +619,11 @@
</span><span class="cx">     return WEB_UI_STRING(&quot;file upload button&quot;, &quot;accessibility role description for a file upload button&quot;);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+String AXAttachmentRoleText()
+{
+    return WEB_UI_STRING(&quot;attachment&quot;, &quot;accessibility role description for an attachment element&quot;);
+}
+    
</ins><span class="cx"> String AXSearchFieldCancelButtonText()
</span><span class="cx"> {
</span><span class="cx">     return WEB_UI_STRING(&quot;cancel&quot;, &quot;accessibility description for a search field cancel button&quot;);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformLocalizedStringsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (198941 => 198942)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/LocalizedStrings.h        2016-04-01 05:34:46 UTC (rev 198941)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h        2016-04-01 06:31:37 UTC (rev 198942)
</span><span class="lines">@@ -167,6 +167,7 @@
</span><span class="cx">     String AXFooterRoleDescriptionText();
</span><span class="cx">     String AXFileUploadButtonText();
</span><span class="cx">     String AXSearchFieldCancelButtonText();
</span><ins>+    String AXAttachmentRoleText();
</ins><span class="cx">     
</span><span class="cx">     String AXButtonActionVerb();
</span><span class="cx">     String AXRadioButtonActionVerb();
</span></span></pre>
</div>
</div>

</body>
</html>