<!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>[160311] 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/160311">160311</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2013-12-09 06:17:27 -0800 (Mon, 09 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: WebKit ignores @alt on IMG elements with role="text"
https://bugs.webkit.org/show_bug.cgi?id=125363
Reviewed by Mario Sanchez Prada.
Source/WebCore:
If an <img> element has a different role, the alt attribute should still be used in the
name calculation if present.
Test: accessibility/alt-tag-on-image-with-nonimage-role.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::usesAltTagForTextComputation):
(WebCore::AccessibilityNodeObject::alternativeText):
(WebCore::AccessibilityNodeObject::accessibilityDescription):
(WebCore::AccessibilityNodeObject::text):
* accessibility/AccessibilityNodeObject.h:
LayoutTests:
* accessibility/alt-tag-on-image-with-nonimage-role-expected.txt: Added.
* accessibility/alt-tag-on-image-with-nonimage-role.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="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjecth">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilityalttagonimagewithnonimageroleexpectedtxt">trunk/LayoutTests/accessibility/alt-tag-on-image-with-nonimage-role-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityalttagonimagewithnonimagerolehtml">trunk/LayoutTests/accessibility/alt-tag-on-image-with-nonimage-role.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (160310 => 160311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2013-12-09 14:10:18 UTC (rev 160310)
+++ trunk/LayoutTests/ChangeLog 2013-12-09 14:17:27 UTC (rev 160311)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-09 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WebKit ignores @alt on IMG elements with role="text"
+ https://bugs.webkit.org/show_bug.cgi?id=125363
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/alt-tag-on-image-with-nonimage-role-expected.txt: Added.
+ * accessibility/alt-tag-on-image-with-nonimage-role.html: Added.
+
</ins><span class="cx"> 2013-12-09 Michal Poteralski <m.poteralski@samsung.com>
</span><span class="cx">
</span><span class="cx"> DataCloneError exception is not thrown when postMessage's second parameter
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityalttagonimagewithnonimageroleexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/alt-tag-on-image-with-nonimage-role-expected.txt (0 => 160311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/alt-tag-on-image-with-nonimage-role-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/alt-tag-on-image-with-nonimage-role-expected.txt 2013-12-09 14:17:27 UTC (rev 160311)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+This tests that setting a role on an img still allows the alt attribute to be used for the description..
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS text.stringValue is 'AXValue: TEST1'
+PASS group.description is 'AXDescription: TEST2'
+PASS button.description is 'AXDescription: TEST3'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityalttagonimagewithnonimagerolehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/alt-tag-on-image-with-nonimage-role.html (0 => 160311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/alt-tag-on-image-with-nonimage-role.html (rev 0)
+++ trunk/LayoutTests/accessibility/alt-tag-on-image-with-nonimage-role.html 2013-12-09 14:17:27 UTC (rev 160311)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<img alt="TEST1" src="resources/cake.png" role="text" id="text">
+
+<img alt="TEST2" src="resources/cake.png" role="group" id="group">
+
+<img alt="TEST3" src="resources/cake.png" role="button" id="button">
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that setting a role on an img still allows the alt attribute to be used for the description..");
+
+ if (window.accessibilityController) {
+
+ var text = accessibilityController.accessibleElementById("text");
+ shouldBe("text.stringValue", "'AXValue: TEST1'");
+
+ var group = accessibilityController.accessibleElementById("group");
+ shouldBe("group.description", "'AXDescription: TEST2'");
+
+ var button = accessibilityController.accessibleElementById("button");
+ shouldBe("button.description", "'AXDescription: TEST3'");
+ }
+
+</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 (160310 => 160311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2013-12-09 14:10:18 UTC (rev 160310)
+++ trunk/Source/WebCore/ChangeLog 2013-12-09 14:17:27 UTC (rev 160311)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2013-12-09 Chris Fleizach <cfleizach@apple.com>
+
+ AX: WebKit ignores @alt on IMG elements with role="text"
+ https://bugs.webkit.org/show_bug.cgi?id=125363
+
+ Reviewed by Mario Sanchez Prada.
+
+ If an <img> element has a different role, the alt attribute should still be used in the
+ name calculation if present.
+
+ Test: accessibility/alt-tag-on-image-with-nonimage-role.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::usesAltTagForTextComputation):
+ (WebCore::AccessibilityNodeObject::alternativeText):
+ (WebCore::AccessibilityNodeObject::accessibilityDescription):
+ (WebCore::AccessibilityNodeObject::text):
+ * accessibility/AccessibilityNodeObject.h:
+
</ins><span class="cx"> 2013-12-08 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> [WK2][Soup] Use didReceiveBuffer instead of didReceiveData
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (160310 => 160311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2013-12-09 14:10:18 UTC (rev 160310)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2013-12-09 14:17:27 UTC (rev 160311)
</span><span class="lines">@@ -1211,6 +1211,11 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool AccessibilityNodeObject::usesAltTagForTextComputation() const
+{
+ return isImage() || isInputImage() || isNativeImage() || isCanvas() || (node() && node()->hasTagName(imgTag));
+}
+
</ins><span class="cx"> void AccessibilityNodeObject::titleElementText(Vector<AccessibilityText>& textOrder) const
</span><span class="cx"> {
</span><span class="cx"> Node* node = this->node();
</span><span class="lines">@@ -1250,7 +1255,7 @@
</span><span class="cx"> if (!ariaLabel.isEmpty())
</span><span class="cx"> textOrder.append(AccessibilityText(ariaLabel, AlternativeText));
</span><span class="cx">
</span><del>- if (isImage() || isInputImage() || isNativeImage() || isCanvas()) {
</del><ins>+ if (usesAltTagForTextComputation()) {
</ins><span class="cx"> if (renderer() && renderer()->isRenderImage()) {
</span><span class="cx"> String renderAltText = toRenderImage(renderer())->altText();
</span><span class="cx">
</span><span class="lines">@@ -1479,7 +1484,7 @@
</span><span class="cx"> if (!ariaDescription.isEmpty())
</span><span class="cx"> return ariaDescription;
</span><span class="cx">
</span><del>- if (isImage() || isInputImage() || isNativeImage() || isCanvas()) {
</del><ins>+ if (usesAltTagForTextComputation()) {
</ins><span class="cx"> // Images should use alt as long as the attribute is present, even if empty.
</span><span class="cx"> // Otherwise, it should fallback to other methods, like the title attribute.
</span><span class="cx"> const AtomicString& alt = getAttribute(altAttr);
</span><span class="lines">@@ -1739,8 +1744,12 @@
</span><span class="cx"> String AccessibilityNodeObject::text() const
</span><span class="cx"> {
</span><span class="cx"> // If this is a user defined static text, use the accessible name computation.
</span><del>- if (ariaRoleAttribute() == StaticTextRole)
- return ariaAccessibilityDescription();
</del><ins>+ if (ariaRoleAttribute() == StaticTextRole) {
+ Vector<AccessibilityText> textOrder;
+ alternativeText(textOrder);
+ if (textOrder.size() > 0 && textOrder[0].text.length())
+ return textOrder[0].text;
+ }
</ins><span class="cx">
</span><span class="cx"> if (!isTextControl())
</span><span class="cx"> return String();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h (160310 => 160311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2013-12-09 14:10:18 UTC (rev 160310)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2013-12-09 14:17:27 UTC (rev 160311)
</span><span class="lines">@@ -201,6 +201,7 @@
</span><span class="cx"> String alternativeTextForWebArea() const;
</span><span class="cx"> void ariaLabeledByText(Vector<AccessibilityText>&) const;
</span><span class="cx"> virtual bool computeAccessibilityIsIgnored() const OVERRIDE;
</span><ins>+ bool usesAltTagForTextComputation() const;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> ACCESSIBILITY_OBJECT_TYPE_CASTS(AccessibilityNodeObject, isAccessibilityNodeObject())
</span></span></pre>
</div>
</div>
</body>
</html>