Diff
Modified: trunk/LayoutTests/ChangeLog (170358 => 170359)
--- trunk/LayoutTests/ChangeLog 2014-06-24 11:02:42 UTC (rev 170358)
+++ trunk/LayoutTests/ChangeLog 2014-06-24 11:09:22 UTC (rev 170359)
@@ -1,3 +1,15 @@
+2014-06-24 Jarek Czekalski <[email protected]>
+
+ [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.
+
2014-06-24 Michał Pakuła vel Rutka <[email protected]>
[EFL] Merge efl-wk2 and efl test expectations files
Modified: trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt (170358 => 170359)
--- trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt 2014-06-24 11:02:42 UTC (rev 170358)
+++ trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block-expected.txt 2014-06-24 11:09:22 UTC (rev 170359)
@@ -10,6 +10,7 @@
,after
before,
six
+no span here
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".
@@ -17,16 +18,25 @@
PASS accText is "AXValue:one"
PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is "Link|1"
PASS accText is "AXValue:two"
PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is "Link|1"
PASS accText is "AXValue:three"
PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is "Link|1"
PASS accText is "AXValue:before,four,after"
PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is "Link|1"
PASS accText is "AXValue:five,after"
PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is "Link|1"
PASS accText is "AXValue:before,six"
PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is "Link|1"
+PASS accText is "AXValue:nospanhere"
+PASS setCaretOffset(elem, 1) is true
+PASS caretMovedData is "Link|1"
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html (170358 => 170359)
--- trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html 2014-06-24 11:02:42 UTC (rev 170358)
+++ trunk/LayoutTests/platform/gtk/accessibility/text-in-span-block-in-a-block.html 2014-06-24 11:09:22 UTC (rev 170359)
@@ -41,6 +41,8 @@
<a id="id6" href="" style="display:block;">before,<span style="display:block;">six</span></a>
+<a id="id7" href="" style="display:block;">no span here</a>
+
<div id="console"></div>
<script>
@@ -72,7 +74,7 @@
if (window.accessibilityController) {
var i, linkText, accText, id;
accessibilityController.addNotificationListener(globalListener)
- for (i = 1; i <= 6; i++) {
+ for (i = 1; i <= 7; i++) {
id = 'id' + i;
elem = accessibilityController.accessibleElementById(id);
linkText = stripNonWhite(document.links[id].textContent);
@@ -80,8 +82,7 @@
shouldBeEqualToString("accText", "AXValue:" + linkText);
caretMovedData = '';
shouldBe("setCaretOffset(elem, 1)", "true");
- // FIXME: This line will be added after fixing bug #130941.
- //shouldBeEqualToString("caretMovedData", "Link|1");
+ shouldBeEqualToString("caretMovedData", "Link|1");
}
}
Modified: trunk/Source/WebCore/ChangeLog (170358 => 170359)
--- trunk/Source/WebCore/ChangeLog 2014-06-24 11:02:42 UTC (rev 170358)
+++ trunk/Source/WebCore/ChangeLog 2014-06-24 11:09:22 UTC (rev 170359)
@@ -1,3 +1,14 @@
+2014-06-24 Jarek Czekalski <[email protected]>
+
+ [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.
+
2014-06-24 Carlos Garcia Campos <[email protected]>
Unreviewed. Update GObject DOM bindings test results after r170351.
Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (170358 => 170359)
--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2014-06-24 11:02:42 UTC (rev 170358)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2014-06-24 11:09:22 UTC (rev 170359)
@@ -1317,8 +1317,10 @@
if (!firstUnignoredParent)
return 0;
- // Don't ignore links if the offset is being requested for a link.
- if (!referenceObject->isLink() && firstUnignoredParent->isLink())
+ // 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()))
firstUnignoredParent = firstUnignoredParent->parentObjectUnignored();
if (!firstUnignoredParent)
return 0;
