<!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>[170792] releases/WebKitGTK/webkit-2.4</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/170792">170792</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-04 00:50:28 -0700 (Fri, 04 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/169936">r169936</a> - Source/WebCore: [ATK] Fix text inside "span" block in "a" block was not accessible.
https://bugs.webkit.org/show_bug.cgi?id=132349
Patch by Jarek Czekalski <jarekczek@poczta.onet.pl> on 2014-06-13
Reviewed by Mario Sanchez Prada.
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp: Add link role
to the list of roles whose objects always expose atk_text interface.
LayoutTests: [ATK] Add test for accessibility of text inside "span" block in "a" block.
https://bugs.webkit.org/show_bug.cgi?id=132349
Patch by Jarek Czekalski <jarekczek@poczta.onet.pl> on 2014-06-13
Reviewed by Mario Sanchez Prada.
* platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt: Added.
* platform/gtk/accessibility/text-in-span-block-in-a-block.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitytextinspanblockinablockexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitytextinspanblockinablockhtml">releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (170791 => 170792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-07-04 07:43:35 UTC (rev 170791)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-07-04 07:50:28 UTC (rev 170792)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-06-13 Jarek Czekalski <jarekczek@poczta.onet.pl>
+
+ [ATK] Add test for accessibility of text inside "span" block in "a" block.
+ https://bugs.webkit.org/show_bug.cgi?id=132349
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt: Added.
+ * platform/gtk/accessibility/text-in-span-block-in-a-block.html: Added.
+
</ins><span class="cx"> 2014-05-30 Jarek Czekalski <jarekczek@poczta.onet.pl>
</span><span class="cx">
</span><span class="cx"> [ATK] Convert caret offset tests from testatk.c.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitytextinspanblockinablockexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt (0 => 170792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt 2014-07-04 07:50:28 UTC (rev 170792)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+one
+before
+two
+three
+before,
+four
+,after
+before
+five
+,after
+before,
+six
+This tests that text inside "a" block inside "span" block is accessible.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS accText is "AXValue:one"
+PASS setCaretOffset(elem, 1) is true
+PASS accText is "AXValue:two"
+PASS setCaretOffset(elem, 1) is true
+PASS accText is "AXValue:three"
+PASS setCaretOffset(elem, 1) is true
+PASS accText is "AXValue:before,four,after"
+PASS setCaretOffset(elem, 1) is true
+PASS accText is "AXValue:five,after"
+PASS setCaretOffset(elem, 1) is true
+PASS accText is "AXValue:before,six"
+PASS setCaretOffset(elem, 1) is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitytextinspanblockinablockhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html (0 => 170792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html 2014-07-04 07:50:28 UTC (rev 170792)
</span><span class="lines">@@ -0,0 +1,93 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../../resources/js-test-pre.js"></script>
+<script src="../resources/atk-helpers.js"></script>
+</head>
+
+<body>
+
+<!-- Suspected "a" element in several different configurations. -->
+
+<div>
+ <a id="id1" href="x" style="display:block;">
+ <span style="display:block;">one</span>
+ </a>
+</div>
+
+<div>
+ <div>before</div>
+ <a id="id2" href="x" style="display:block;">
+ <span style="display:block;">two</span>
+ </a>
+</div>
+
+<a id="id3" href="x" style="display:block;"><span style="display:block;">three</span></a>
+
+<div>
+ <a id="id4" href="x" style="display:block;">
+ before,
+ <span style="display:block;">four</span>
+ ,after
+ </a>
+</div>
+
+<div>
+ <div>before</div>
+ <a id="id5" href="x" style="display:block;"><span style="display:block;">five</span>
+ ,after
+ </a>
+</div>
+
+<a id="id6" href="x" style="display:block;">before,<span style="display:block;">six</span></a>
+
+<div id="console"></div>
+
+<script>
+var caretMovedData;
+
+function stripNonWhite(s)
+{
+ var s2 = "";
+ var i;
+ for(i = 0; i < s.length; i++)
+ if (s[i] != ' ' && s[i] != '\n')
+ s2 += s[i];
+ return s2.replace(/<\\n>/g, "");
+}
+
+function globalListener(object, name, offset)
+{
+ var role = object.role.replace('AXRole: AX', '');
+ if (name == 'AXTextCaretMoved') {
+ caretMovedData += role + '|' + offset;
+ }
+}
+
+if (window.testRunner) {
+ testRunner.overridePreference("WebKitEnableCaretBrowsing", true);
+ testRunner.dumpAsText();
+}
+
+if (window.accessibilityController) {
+ var i, linkText, accText, id;
+ accessibilityController.addNotificationListener(globalListener)
+ for (i = 1; i <= 6; i++) {
+ id = 'id' + i;
+ elem = accessibilityController.accessibleElementById(id);
+ linkText = stripNonWhite(document.links[id].textContent);
+ accText = stripNonWhite(elem.stringValue);
+ shouldBeEqualToString("accText", "AXValue:" + linkText);
+ caretMovedData = '';
+ shouldBe("setCaretOffset(elem, 1)", "true");
+ // FIXME: This line will be added after fixing bug #130941.
+ //shouldBeEqualToString("caretMovedData", "Link|1");
+ }
+}
+
+description('This tests that text inside "a" block inside "span" block is accessible.');
+
+</script>
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (170791 => 170792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-07-04 07:43:35 UTC (rev 170791)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-07-04 07:50:28 UTC (rev 170792)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-06-13 Jarek Czekalski <jarekczek@poczta.onet.pl>
+
+ [ATK] Fix text inside "span" block in "a" block was not accessible.
+ https://bugs.webkit.org/show_bug.cgi?id=132349
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp: Add link role
+ to the list of roles whose objects always expose atk_text interface.
+
</ins><span class="cx"> 2014-06-11 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Use a different user agent string depending on the site
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (170791 => 170792)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2014-07-04 07:43:35 UTC (rev 170791)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2014-07-04 07:50:28 UTC (rev 170792)
</span><span class="lines">@@ -1096,7 +1096,8 @@
</span><span class="cx">
</span><span class="cx"> static bool roleIsTextType(AccessibilityRole role)
</span><span class="cx"> {
</span><del>- return role == ParagraphRole || role == HeadingRole || role == DivRole || role == CellRole || role == ListItemRole;
</del><ins>+ return role == ParagraphRole || role == HeadingRole || role == DivRole || role == CellRole
+ || role == LinkRole || role == WebCoreLinkRole || role == ListItemRole;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static guint16 getInterfaceMaskFromObject(AccessibilityObject* coreObject)
</span></span></pre>
</div>
</div>
</body>
</html>