<!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>[244187] 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/244187">244187</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-04-11 01:25:36 -0700 (Thu, 11 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[GTK] Layout test accessibility/aria-hidden-false-works-in-subtrees.html fails after <a href="http://trac.webkit.org/projects/webkit/changeset/184890">r184890</a>
https://bugs.webkit.org/show_bug.cgi?id=146718
<rdar://problem/21722487>

Reviewed by Joanmarie Diggs.

Source/WebCore:

Allow to get the text under element for nodes hidden in DOM but explicitly exposed to accessibility with
aria-hidden="false".

Fixes: accessibility/aria-hidden-false-works-in-subtrees.html

* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::textUnderElement const):
* accessibility/atk/WebKitAccessible.cpp:
(roleIsTextType): Also consider ApplicationGroup role as text elements, so that <div>text</div> is equivalent to
<div role="roup">test</div>.

LayoutTests:

Update test to ATK behavior, rebaseline it and remove the expectations.

* accessibility/aria-hidden-false-works-in-subtrees.html:
* platform/gtk/TestExpectations:
* platform/gtk/accessibility/aria-hidden-false-works-in-subtrees-expected.txt:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariahiddenfalseworksinsubtreeshtml">trunk/LayoutTests/accessibility/aria-hidden-false-works-in-subtrees.html</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkaccessibilityariahiddenfalseworksinsubtreesexpectedtxt">trunk/LayoutTests/platform/gtk/accessibility/aria-hidden-false-works-in-subtrees-expected.txt</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="#trunkSourceWebCoreaccessibilityatkWebKitAccessiblecpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessible.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244186 => 244187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-04-11 06:48:20 UTC (rev 244186)
+++ trunk/LayoutTests/ChangeLog 2019-04-11 08:25:36 UTC (rev 244187)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2019-04-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Layout test accessibility/aria-hidden-false-works-in-subtrees.html fails after r184890
+        https://bugs.webkit.org/show_bug.cgi?id=146718
+        <rdar://problem/21722487>
+
+        Reviewed by Joanmarie Diggs.
+
+        Update test to ATK behavior, rebaseline it and remove the expectations.
+
+        * accessibility/aria-hidden-false-works-in-subtrees.html:
+        * platform/gtk/TestExpectations:
+        * platform/gtk/accessibility/aria-hidden-false-works-in-subtrees-expected.txt:
+
</ins><span class="cx"> 2019-04-10  Said Abou-Hallawa  <sabouhallawa@apple.com>
</span><span class="cx"> 
</span><span class="cx">         requestAnimationFrame should execute before the next frame
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariahiddenfalseworksinsubtreeshtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-hidden-false-works-in-subtrees.html (244186 => 244187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-hidden-false-works-in-subtrees.html 2019-04-11 06:48:20 UTC (rev 244186)
+++ trunk/LayoutTests/accessibility/aria-hidden-false-works-in-subtrees.html    2019-04-11 08:25:36 UTC (rev 244187)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src="../resources/js-test-pre.js"></script>
</span><ins>+<script src="../resources/accessibility-helper.js"></script>
</ins><span class="cx"> </head>
</span><span class="cx"> <body id="body">
</span><span class="cx"> 
</span><span class="lines">@@ -84,7 +85,7 @@
</span><span class="cx">         }
</span><span class="cx">         var indent = "";
</span><span class="cx">         for (var k = 0; k < level; k++) { indent += "  "; }
</span><del>-        debug(indent + element.role + "\n" + indent + element.description + "\n");
</del><ins>+        debug(indent + element.role + "\n" + indent + platformValueForW3CName(element, true) + "\n");
</ins><span class="cx">         var childrenCount = element.childrenCount;
</span><span class="cx">         for (var k = 0; k < childrenCount; k++) {
</span><span class="cx">             dumpAccessibilityChildren(element.childAtIndex(k), level+1);
</span><span class="lines">@@ -98,16 +99,30 @@
</span><span class="cx">         dumpAccessibilityChildren(root, 0);
</span><span class="cx"> 
</span><span class="cx">         // Text inside aria-hidden=false inherits from parent.
</span><del>-        var object = accessibilityController.accessibleElementById("group3").childAtIndex(0);
-        shouldBe("object.role", "'AXRole: AXStaticText'");
</del><ins>+        var object;
+        if (accessibilityController.platformName == "atk") {
+            object = accessibilityController.accessibleElementById("group3");
+            shouldBe("object.role", "'AXRole: AXSection'");
+        } else {
+            object = accessibilityController.accessibleElementById("group3").childAtIndex(0);
+            shouldBe("object.role", "'AXRole: AXStaticText'");
+        }
</ins><span class="cx">         var stringValue = object.stringValue.replace(/\n/g, '');
</span><span class="cx">         shouldBe("stringValue", "'AXValue: text3'");
</span><span class="cx"> 
</span><span class="cx">         // Text inside nested aria-hidden=false inherits from parent.
</span><del>-        object = accessibilityController.accessibleElementById("group4").childAtIndex(0).childAtIndex(0);
-        shouldBe("object.role", "'AXRole: AXStaticText'");
</del><ins>+        if (accessibilityController.platformName == "atk") {
+            object = accessibilityController.accessibleElementById("group4").childAtIndex(0);
+            shouldBe("object.role", "'AXRole: AXGroup'");
+        } else {
+            object = accessibilityController.accessibleElementById("group4").childAtIndex(0).childAtIndex(0);
+            shouldBe("object.role", "'AXRole: AXStaticText'");
+        }
</ins><span class="cx">         stringValue = object.stringValue.replace(/\n/g, '');
</span><del>-        shouldBe("stringValue", "'AXValue:     text4  '");
</del><ins>+        if (accessibilityController.platformName == "atk")
+            shouldBe("stringValue", "'AXValue: text4'");
+        else
+            shouldBe("stringValue", "'AXValue:     text4  '");
</ins><span class="cx"> 
</span><span class="cx">         // When not all the parents have aria-hidden=false, element should not be visible.
</span><span class="cx">         object = accessibilityController.accessibleElementById("group5").childAtIndex(0);
</span><span class="lines">@@ -115,12 +130,18 @@
</span><span class="cx"> 
</span><span class="cx">         // Objects that don't have aria-hidden=false are not visible when the parents have that attribute.
</span><span class="cx">         object = accessibilityController.accessibleElementById("group6").childAtIndex(0);
</span><del>-        shouldBe("object.role", "'AXRole: AXGroup'");
</del><ins>+        if (accessibilityController.platformName == "atk")
+            shouldBe("object.role", "'AXRole: AXSection'");
+        else
+            shouldBe("object.role", "'AXRole: AXGroup'");
</ins><span class="cx">         shouldBe("object.childrenCount", "0");
</span><span class="cx"> 
</span><span class="cx">         // When all objects have aria-hidden=false, then the elements are visible.
</span><span class="cx">         object = accessibilityController.accessibleElementById("group7").childAtIndex(0);
</span><del>-        shouldBe("object.role", "'AXRole: AXGroup'");
</del><ins>+        if (accessibilityController.platformName == "atk")
+            shouldBe("object.role", "'AXRole: AXSection'");
+        else
+            shouldBe("object.role", "'AXRole: AXGroup'");
</ins><span class="cx">         shouldBe("object.childrenCount", "1");
</span><span class="cx">         shouldBe("object.childAtIndex(0).role", "'AXRole: AXButton'");
</span><span class="cx">     }
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (244186 => 244187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations  2019-04-11 06:48:20 UTC (rev 244186)
+++ trunk/LayoutTests/platform/gtk/TestExpectations     2019-04-11 08:25:36 UTC (rev 244187)
</span><span class="lines">@@ -898,8 +898,6 @@
</span><span class="cx"> # Requires ENABLE(MEDIA_CAPTURE)
</span><span class="cx"> webkit.org/b/85958 fast/forms/file/file-input-capture.html [ Failure ]
</span><span class="cx"> 
</span><del>-webkit.org/b/146718 accessibility/aria-hidden-false-works-in-subtrees.html [ Failure ]
-
</del><span class="cx"> webkit.org/b/146720 media/accessiblity-describes-video.html [ Failure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/146724 fast/text/word-break-keep-all.html [ ImageOnlyFailure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkaccessibilityariahiddenfalseworksinsubtreesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/accessibility/aria-hidden-false-works-in-subtrees-expected.txt (244186 => 244187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/accessibility/aria-hidden-false-works-in-subtrees-expected.txt    2019-04-11 06:48:20 UTC (rev 244186)
+++ trunk/LayoutTests/platform/gtk/accessibility/aria-hidden-false-works-in-subtrees-expected.txt       2019-04-11 08:25:36 UTC (rev 244187)
</span><span class="lines">@@ -1,4 +1,3 @@
</span><del>-
</del><span class="cx"> This tests that a sub-tree within a node marked with aria-hidden=false will be exposed in the AX tree.
</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">@@ -5,14 +4,24 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> AXRole: AXSection
</span><del>-AXDescription: group0
</del><ins>+AXTitle: group0
</ins><span class="cx"> 
</span><span class="cx">   AXRole: AXGroup
</span><del>-  AXDescription: group2
</del><ins>+  AXTitle: group2
</ins><span class="cx"> 
</span><span class="cx">     AXRole: AXButton
</span><del>-    AXDescription: button1
</del><ins>+    AXTitle: button1
</ins><span class="cx"> 
</span><ins>+PASS object.role is 'AXRole: AXSection'
+PASS stringValue is 'AXValue: text3'
+PASS object.role is 'AXRole: AXGroup'
+PASS stringValue is 'AXValue: text4'
+PASS !object || !object.isValid is true
+PASS object.role is 'AXRole: AXSection'
+PASS object.childrenCount is 0
+PASS object.role is 'AXRole: AXSection'
+PASS object.childrenCount is 1
+PASS object.childAtIndex(0).role is 'AXRole: AXButton'
</ins><span class="cx"> Non-rendered iframe content should not be visible when aria-hidden=true. The first child should be a group and NOT static text.
</span><span class="cx"> iFrame child role: AXRole: AXWebArea
</span><span class="cx"> PASS successfullyParsed is true
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244186 => 244187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-11 06:48:20 UTC (rev 244186)
+++ trunk/Source/WebCore/ChangeLog      2019-04-11 08:25:36 UTC (rev 244187)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2019-04-11  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] Layout test accessibility/aria-hidden-false-works-in-subtrees.html fails after r184890
+        https://bugs.webkit.org/show_bug.cgi?id=146718
+        <rdar://problem/21722487>
+
+        Reviewed by Joanmarie Diggs.
+
+        Allow to get the text under element for nodes hidden in DOM but explicitly exposed to accessibility with
+        aria-hidden="false".
+
+        Fixes: accessibility/aria-hidden-false-works-in-subtrees.html
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::textUnderElement const):
+        * accessibility/atk/WebKitAccessible.cpp:
+        (roleIsTextType): Also consider ApplicationGroup role as text elements, so that <div>text</div> is equivalent to
+        <div role="roup">test</div>.
+
</ins><span class="cx"> 2019-04-10  Said Abou-Hallawa  <sabouhallawa@apple.com>
</span><span class="cx"> 
</span><span class="cx">         requestAnimationFrame should execute before the next frame
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (244186 => 244187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp   2019-04-11 06:48:20 UTC (rev 244186)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp      2019-04-11 08:25:36 UTC (rev 244187)
</span><span class="lines">@@ -1746,10 +1746,14 @@
</span><span class="cx">     if (is<Text>(node))
</span><span class="cx">         return downcast<Text>(*node).wholeText();
</span><span class="cx"> 
</span><ins>+    bool isAriaVisible = AccessibilityObject::matchedParent(*this, true, [] (const AccessibilityObject& object) {
+        return equalLettersIgnoringASCIICase(object.getAttribute(aria_hiddenAttr), "false");
+    }) != nullptr;
+
</ins><span class="cx">     // The Accname specification states that if the current node is hidden, and not directly
</span><span class="cx">     // referenced by aria-labelledby or aria-describedby, and is not a host language text
</span><span class="cx">     // alternative, the empty string should be returned.
</span><del>-    if (isHidden() && !is<HTMLLabelElement>(node) && (node && !ancestorsOfType<HTMLCanvasElement>(*node).first())) {
</del><ins>+    if (isDOMHidden() && !isAriaVisible && !is<HTMLLabelElement>(node) && (node && !ancestorsOfType<HTMLCanvasElement>(*node).first())) {
</ins><span class="cx">         AccessibilityObject::AccessibilityChildrenVector labelFor;
</span><span class="cx">         AccessibilityObject::AccessibilityChildrenVector descriptionFor;
</span><span class="cx">         ariaLabelledByReferencingElements(labelFor);
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessiblecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessible.cpp (244186 => 244187)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessible.cpp      2019-04-11 06:48:20 UTC (rev 244186)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessible.cpp 2019-04-11 08:25:36 UTC (rev 244187)
</span><span class="lines">@@ -1181,7 +1181,8 @@
</span><span class="cx">         || role == AccessibilityRole::Pre
</span><span class="cx">         || role == AccessibilityRole::GridCell
</span><span class="cx">         || role == AccessibilityRole::TextGroup
</span><del>-        || role == AccessibilityRole::ApplicationTextGroup;
</del><ins>+        || role == AccessibilityRole::ApplicationTextGroup
+        || role == AccessibilityRole::ApplicationGroup;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> static guint16 interfaceMaskFromObject(AccessibilityObject* coreObject)
</span></span></pre>
</div>
</div>

</body>
</html>