<!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>[166917] 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/166917">166917</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2014-04-08 00:59:22 -0700 (Tue, 08 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Regression: AX: image labels no longer exposed to AX API in SVG test case
https://bugs.webkit.org/show_bug.cgi?id=131208
Reviewed by Daniel Bates.
Source/WebCore:
accessibleNameForNode should work on any Element, not just HTML elements.
Test: accessibility/svg-labelledby.html
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::accessibleNameForNode):
LayoutTests:
* accessibility/svg-labelledby-expected.txt: Added.
* accessibility/svg-labelledby.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>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitysvglabelledbyexpectedtxt">trunk/LayoutTests/accessibility/svg-labelledby-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitysvglabelledbyhtml">trunk/LayoutTests/accessibility/svg-labelledby.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166916 => 166917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-04-08 07:37:37 UTC (rev 166916)
+++ trunk/LayoutTests/ChangeLog 2014-04-08 07:59:22 UTC (rev 166917)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-07 Chris Fleizach <cfleizach@apple.com>
+
+ Regression: AX: image labels no longer exposed to AX API in SVG test case
+ https://bugs.webkit.org/show_bug.cgi?id=131208
+
+ Reviewed by Daniel Bates.
+
+ * accessibility/svg-labelledby-expected.txt: Added.
+ * accessibility/svg-labelledby.html: Added.
+
</ins><span class="cx"> 2014-04-07 Martin Robinson <mrobinson@igalia.com>
</span><span class="cx">
</span><span class="cx"> Skipped some HighDPI tests for GTK+
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitysvglabelledbyexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/svg-labelledby-expected.txt (0 => 166917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/svg-labelledby-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/svg-labelledby-expected.txt 2014-04-08 07:59:22 UTC (rev 166917)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+
+This tests that aria-labelledby works on SVG elements.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+SVG Element: AXDescription: Sudan
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitysvglabelledbyhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/svg-labelledby.html (0 => 166917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/svg-labelledby.html (rev 0)
+++ trunk/LayoutTests/accessibility/svg-labelledby.html 2014-04-08 07:59:22 UTC (rev 166917)
</span><span class="lines">@@ -0,0 +1,38 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../resources/js-test-pre.js"></script>
+</head>
+<body>
+
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+
+<g>
+<path xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="label_Sudan" id="Sudan" class="land sd" d="M463.9996,262.5474 C464.6068,261.08 464.8456,259.8488 466.2004,258.8924 C467.4688,257.9972 468.4984,257.3418 467.6728,255.7866 C465.5044,251.7018 467.4568,250.881 470.4796,248.463 C469.6648,247.6832 468.3076,244.3892 469.6348,243.686 C471.7432,242.5664 472.0024,240.5502 473.458,238.6974 C475.2736,236.3838 472.2136,234.2072 475.1188,232.7696">
+ <set attributeName="opacity" from="1" to="0.5" begin="mouseover" end="mouseout"/>
+</path>
+</g>
+
+<text xmlns="http://www.w3.org/2000/svg" id="label_Sudan" x="80" y="790" font-size="24" visibility="hidden">
+ Sudan
+ <set attributeName="visibility" from="hidden" to="visible" begin="Sudan.mouseover" end="Sudan.mouseout"/>
+ </text>
+</svg>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that aria-labelledby works on SVG elements.");
+
+ if (window.accessibilityController) {
+ var image = accessibilityController.accessibleElementById("Sudan");
+ debug("SVG Element: " + image.description);
+ }
+
+</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 (166916 => 166917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-08 07:37:37 UTC (rev 166916)
+++ trunk/Source/WebCore/ChangeLog 2014-04-08 07:59:22 UTC (rev 166917)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-04-07 Chris Fleizach <cfleizach@apple.com>
+
+ Regression: AX: image labels no longer exposed to AX API in SVG test case
+ https://bugs.webkit.org/show_bug.cgi?id=131208
+
+ Reviewed by Daniel Bates.
+
+ accessibleNameForNode should work on any Element, not just HTML elements.
+
+ Test: accessibility/svg-labelledby.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::accessibleNameForNode):
+
</ins><span class="cx"> 2014-04-08 Andres Gomez <agomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] [EFL] Build fails with GCC < 4.8.x
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (166916 => 166917)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-04-08 07:37:37 UTC (rev 166916)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-04-08 07:59:22 UTC (rev 166917)
</span><span class="lines">@@ -1848,11 +1848,11 @@
</span><span class="cx"> // ARIA Implementer's Guide.
</span><span class="cx"> static String accessibleNameForNode(Node* node)
</span><span class="cx"> {
</span><del>- if (!node->isHTMLElement())
</del><ins>+ assert(node);
+ if (!node || !node->isElementNode())
</ins><span class="cx"> return String();
</span><span class="cx">
</span><del>- HTMLElement* element = toHTMLElement(node);
-
</del><ins>+ Element* element = toElement(node);
</ins><span class="cx"> const AtomicString& ariaLabel = element->fastGetAttribute(aria_labelAttr);
</span><span class="cx"> if (!ariaLabel.isEmpty())
</span><span class="cx"> return ariaLabel;
</span><span class="lines">@@ -1870,8 +1870,8 @@
</span><span class="cx"> String text;
</span><span class="cx"> if (axObject)
</span><span class="cx"> text = axObject->textUnderElement();
</span><del>- else if (node->isElementNode())
- text = toElement(node)->innerText();
</del><ins>+ else
+ text = element->innerText();
</ins><span class="cx">
</span><span class="cx"> if (!text.isEmpty())
</span><span class="cx"> return text;
</span></span></pre>
</div>
</div>
</body>
</html>