<!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>[170793] 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/170793">170793</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-07-04 00:55:24 -0700 (Fri, 04 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/170359">r170359</a> - Source/WebCore: [ATK] Don't ignore links rendered as blocks.
https://bugs.webkit.org/show_bug.cgi?id=130941
Patch by Jarek Czekalski <jarekczek@poczta.onet.pl> on 2014-06-24
Reviewed by Mario Sanchez Prada.
* /m/usr/src/webkit-trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(WebCore::AccessibilityObject::objectFocusedAndCaretOffsetUnignored): Don't ignore links
when they are renderered with display:block.
LayoutTests: [ATK] Extended the test for accessibility of text inside "span" block in "a" block
with the tests for caret movements in these cases.
https://bugs.webkit.org/show_bug.cgi?id=130941
Patch by Jarek Czekalski <jarekczek@poczta.onet.pl> on 2014-06-24
Reviewed by Mario Sanchez Prada.
* platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt:
* platform/gtk/accessibility/text-in-span-block-in-a-block.html:
Added testing for text-caret-moved signal. Added one more "a" element to the set.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<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>
<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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (170792 => 170793)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-07-04 07:50:28 UTC (rev 170792)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-07-04 07:55:24 UTC (rev 170793)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-06-24 Jarek Czekalski <jarekczek@poczta.onet.pl>
+
+ [ATK] Extended the test for accessibility of text inside "span" block in "a" block
+ with the tests for caret movements in these cases.
+ https://bugs.webkit.org/show_bug.cgi?id=130941
+
+ Reviewed by Mario Sanchez Prada.
+
+ * platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt:
+ * platform/gtk/accessibility/text-in-span-block-in-a-block.html:
+ Added testing for text-caret-moved signal. Added one more "a" element to the set.
+
</ins><span class="cx"> 2014-06-13 Jarek Czekalski <jarekczek@poczta.onet.pl>
</span><span class="cx">
</span><span class="cx"> [ATK] Add test for accessibility of text inside "span" block in "a" block.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitytextinspanblockinablockexpectedtxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt (170792 => 170793)</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 2014-07-04 07:50:28 UTC (rev 170792)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt 2014-07-04 07:55:24 UTC (rev 170793)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> ,after
</span><span class="cx"> before,
</span><span class="cx"> six
</span><ins>+no span here
</ins><span class="cx"> This tests that text inside "a" block inside "span" block is accessible.
</span><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="lines">@@ -17,16 +18,25 @@
</span><span class="cx">
</span><span class="cx"> PASS accText is "AXValue:one"
</span><span class="cx"> PASS setCaretOffset(elem, 1) is true
</span><ins>+PASS caretMovedData is "Link|1"
</ins><span class="cx"> PASS accText is "AXValue:two"
</span><span class="cx"> PASS setCaretOffset(elem, 1) is true
</span><ins>+PASS caretMovedData is "Link|1"
</ins><span class="cx"> PASS accText is "AXValue:three"
</span><span class="cx"> PASS setCaretOffset(elem, 1) is true
</span><ins>+PASS caretMovedData is "Link|1"
</ins><span class="cx"> PASS accText is "AXValue:before,four,after"
</span><span class="cx"> PASS setCaretOffset(elem, 1) is true
</span><ins>+PASS caretMovedData is "Link|1"
</ins><span class="cx"> PASS accText is "AXValue:five,after"
</span><span class="cx"> PASS setCaretOffset(elem, 1) is true
</span><ins>+PASS caretMovedData is "Link|1"
</ins><span class="cx"> PASS accText is "AXValue:before,six"
</span><span class="cx"> PASS setCaretOffset(elem, 1) is true
</span><ins>+PASS caretMovedData is "Link|1"
+PASS accText is "AXValue:nospanhere"
+PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is "Link|1"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestsplatformgtkaccessibilitytextinspanblockinablockhtml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html (170792 => 170793)</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 2014-07-04 07:50:28 UTC (rev 170792)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html 2014-07-04 07:55:24 UTC (rev 170793)
</span><span class="lines">@@ -41,6 +41,8 @@
</span><span class="cx">
</span><span class="cx"> <a id="id6" href="x" style="display:block;">before,<span style="display:block;">six</span></a>
</span><span class="cx">
</span><ins>+<a id="id7" href="x" style="display:block;">no span here</a>
+
</ins><span class="cx"> <div id="console"></div>
</span><span class="cx">
</span><span class="cx"> <script>
</span><span class="lines">@@ -72,7 +74,7 @@
</span><span class="cx"> if (window.accessibilityController) {
</span><span class="cx"> var i, linkText, accText, id;
</span><span class="cx"> accessibilityController.addNotificationListener(globalListener)
</span><del>- for (i = 1; i <= 6; i++) {
</del><ins>+ for (i = 1; i <= 7; i++) {
</ins><span class="cx"> id = 'id' + i;
</span><span class="cx"> elem = accessibilityController.accessibleElementById(id);
</span><span class="cx"> linkText = stripNonWhite(document.links[id].textContent);
</span><span class="lines">@@ -80,8 +82,7 @@
</span><span class="cx"> shouldBeEqualToString("accText", "AXValue:" + linkText);
</span><span class="cx"> caretMovedData = '';
</span><span class="cx"> shouldBe("setCaretOffset(elem, 1)", "true");
</span><del>- // FIXME: This line will be added after fixing bug #130941.
- //shouldBeEqualToString("caretMovedData", "Link|1");
</del><ins>+ shouldBeEqualToString("caretMovedData", "Link|1");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (170792 => 170793)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-07-04 07:50:28 UTC (rev 170792)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-07-04 07:55:24 UTC (rev 170793)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-06-24 Jarek Czekalski <jarekczek@poczta.onet.pl>
+
+ [ATK] Don't ignore links rendered as blocks.
+ https://bugs.webkit.org/show_bug.cgi?id=130941
+
+ Reviewed by Mario Sanchez Prada.
+
+ * /m/usr/src/webkit-trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (WebCore::AccessibilityObject::objectFocusedAndCaretOffsetUnignored): Don't ignore links
+ when they are renderered with display:block.
+
</ins><span class="cx"> 2014-06-13 Jarek Czekalski <jarekczek@poczta.onet.pl>
</span><span class="cx">
</span><span class="cx"> [ATK] Fix text inside "span" block in "a" block was not accessible.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (170792 => 170793)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2014-07-04 07:50:28 UTC (rev 170792)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2014-07-04 07:55:24 UTC (rev 170793)
</span><span class="lines">@@ -1299,8 +1299,10 @@
</span><span class="cx"> if (!firstUnignoredParent)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- // Don't ignore links if the offset is being requested for a link.
- if (!referenceObject->isLink() && firstUnignoredParent->isLink())
</del><ins>+ // Don't ignore links if the offset is being requested for a link
+ // or if the link is a block.
+ if (!referenceObject->isLink() && firstUnignoredParent->isLink()
+ && !(firstUnignoredParent->renderer() && !firstUnignoredParent->renderer()->isInline()))
</ins><span class="cx"> firstUnignoredParent = firstUnignoredParent->parentObjectUnignored();
</span><span class="cx"> if (!firstUnignoredParent)
</span><span class="cx"> return 0;
</span></span></pre>
</div>
</div>
</body>
</html>