<!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>[242528] 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/242528">242528</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-05 20:01:47 -0800 (Tue, 05 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: Add remote search support for keyboard focusable element search type
https://bugs.webkit.org/show_bug.cgi?id=195336

Patch by Eric Liang <ericliang@apple.com> on 2019-03-05
Reviewed by Chris Fleizach.

Source/WebCore:

Added AXKeyboardFocusable search key to return default keyboard-focusable elements for accessibility.

Test: accessibility/mac/search-predicate-keyboard-focusable.html

* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::isAccessibilityObjectSearchMatchAtIndex):
(WebCore::AccessibilityObject::isKeyboardFocusable const):
* accessibility/AccessibilityObject.h:
* accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
(createAccessibilitySearchKeyMap):

LayoutTests:

Added test that verifies search with AXKeyboardFocusableSearchKey returns the default keyboard-focusable elements.

* accessibility/mac/search-predicate-keyboard-focusable-expected.txt: Added.
* accessibility/mac/search-predicate-keyboard-focusable.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="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacsearchpredicatekeyboardfocusableexpectedtxt">trunk/LayoutTests/accessibility/mac/search-predicate-keyboard-focusable-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacsearchpredicatekeyboardfocusablehtml">trunk/LayoutTests/accessibility/mac/search-predicate-keyboard-focusable.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (242527 => 242528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-03-06 02:15:57 UTC (rev 242527)
+++ trunk/LayoutTests/ChangeLog 2019-03-06 04:01:47 UTC (rev 242528)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2019-03-05  Eric Liang  <ericliang@apple.com>
+
+        AX: Add remote search support for keyboard focusable element search type
+        https://bugs.webkit.org/show_bug.cgi?id=195336
+
+        Reviewed by Chris Fleizach.
+
+        Added test that verifies search with AXKeyboardFocusableSearchKey returns the default keyboard-focusable elements.
+
+        * accessibility/mac/search-predicate-keyboard-focusable-expected.txt: Added.
+        * accessibility/mac/search-predicate-keyboard-focusable.html: Added.
+
</ins><span class="cx"> 2019-03-05  Daniel Bates  <dabates@apple.com>
</span><span class="cx"> 
</span><span class="cx">         [iOS] Should not scroll when checkbox, radio, submit, reset, or button is spacebar activated
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacsearchpredicatekeyboardfocusableexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/search-predicate-keyboard-focusable-expected.txt (0 => 242528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/search-predicate-keyboard-focusable-expected.txt                             (rev 0)
+++ trunk/LayoutTests/accessibility/mac/search-predicate-keyboard-focusable-expected.txt        2019-03-06 04:01:47 UTC (rev 242528)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+first blockquote level 1
+
+ checkbox

+
+first heading level 1
+
+link
+list item
+radio button
+first table heading level 1
+tree item
+test button 1
+test button 2
+This tests AXKeyboardFocusableSearchKey gives the default focusable elements.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS resultElement.role is 'AXRole: AXTextField'
+PASS resultElement.role is 'AXRole: AXCheckBox'
+PASS resultElement.role is 'AXRole: AXButton'
+PASS resultElement.title is 'AXTitle: Submit'
+PASS resultElement.role is 'AXRole: AXComboBox'
+PASS resultElement.role is 'AXRole: AXLink'
+PASS resultElement.role is 'AXRole: AXButton'
+PASS resultElement.title is 'AXTitle: test button 1'
+PASS resultElement.role is 'AXRole: AXButton'
+PASS resultElement.title is 'AXTitle: test button 2'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacsearchpredicatekeyboardfocusablehtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/search-predicate-keyboard-focusable.html (0 => 242528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/search-predicate-keyboard-focusable.html                             (rev 0)
+++ trunk/LayoutTests/accessibility/mac/search-predicate-keyboard-focusable.html        2019-03-06 04:01:47 UTC (rev 242528)
</span><span class="lines">@@ -0,0 +1,73 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+<div id="content">
+<blockquote id="start">first blockquote level 1</blockquote>
+<form>
+<input type="text" /><br />
+<input type="checkbox" value="Checkbox" /> checkbox<br />
+<input type="submit" value="Submit" />
+<input type="text" role="combobox">
+</form>
+<img id="image" src="resources/cake.png" alt="Test">
+<h1>first heading level 1</h1>
+<a href="#image">link</a>
+<ol><li>list item</li></ol>
+<ul role="radiogroup"><li role="radio">radio button</li></ul>
+<table>
+<thead><tr><td>first table heading level 1</td></tr></thead>
+</table>
+<ul role="tree"><li role="treeitem">tree item</li></ul>
+
+<div id="group" style="overflow: scroll; width:100px; height:100px;">
+    <button id="button">test button 1</button><BR>
+</div>
+<button id="button">test button 2</button>
+
+<p id="description"></p>
+<div id="console"></div>
+
+</div>
+<script>
+    description("This tests AXKeyboardFocusableSearchKey gives the default focusable elements.");
+
+    if (window.accessibilityController) {
+        document.getElementById("body").focus();
+        var containerElement = accessibilityController.focusedElement;
+        var resultElement = accessibilityController.accessibleElementById("start");
+
+        resultElement = containerElement.uiElementForSearchPredicate(resultElement, true, "AXKeyboardFocusableSearchKey", "", false);
+        shouldBe("resultElement.role", "'AXRole: AXTextField'");
+
+        resultElement = containerElement.uiElementForSearchPredicate(resultElement, true, "AXKeyboardFocusableSearchKey", "", false);
+        shouldBe("resultElement.role", "'AXRole: AXCheckBox'");
+
+        resultElement = containerElement.uiElementForSearchPredicate(resultElement, true, "AXKeyboardFocusableSearchKey", "", false);
+        shouldBe("resultElement.role", "'AXRole: AXButton'");
+        shouldBe("resultElement.title", "'AXTitle: Submit'");
+
+        resultElement = containerElement.uiElementForSearchPredicate(resultElement, true, "AXKeyboardFocusableSearchKey", "", false);
+        shouldBe("resultElement.role", "'AXRole: AXComboBox'");
+
+        resultElement = containerElement.uiElementForSearchPredicate(resultElement, true, "AXKeyboardFocusableSearchKey", "", false);
+        shouldBe("resultElement.role", "'AXRole: AXLink'");
+
+        resultElement = containerElement.uiElementForSearchPredicate(resultElement, true, "AXKeyboardFocusableSearchKey", "", false);
+        shouldBe("resultElement.role", "'AXRole: AXButton'");
+        shouldBe("resultElement.title", "'AXTitle: test button 1'");
+
+        resultElement = containerElement.uiElementForSearchPredicate(resultElement, true, "AXKeyboardFocusableSearchKey", "", false);
+        shouldBe("resultElement.role", "'AXRole: AXButton'");
+        shouldBe("resultElement.title", "'AXTitle: test button 2'");
+    } else {
+        testFailed("Could not load accessibility controller");
+    }
+
+</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 (242527 => 242528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-03-06 02:15:57 UTC (rev 242527)
+++ trunk/Source/WebCore/ChangeLog      2019-03-06 04:01:47 UTC (rev 242528)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2019-03-05  Eric Liang  <ericliang@apple.com>
+
+        AX: Add remote search support for keyboard focusable element search type
+        https://bugs.webkit.org/show_bug.cgi?id=195336
+
+        Reviewed by Chris Fleizach.
+
+        Added AXKeyboardFocusable search key to return default keyboard-focusable elements for accessibility.
+
+        Test: accessibility/mac/search-predicate-keyboard-focusable.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::isAccessibilityObjectSearchMatchAtIndex):
+        (WebCore::AccessibilityObject::isKeyboardFocusable const):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/mac/WebAccessibilityObjectWrapperBase.mm:
+        (createAccessibilitySearchKeyMap):
+
</ins><span class="cx"> 2019-03-05  Don Olmstead  <don.olmstead@sony.com>
</span><span class="cx"> 
</span><span class="cx">         [WinCairo] Enable CSS Typed OM
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (242527 => 242528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp       2019-03-06 02:15:57 UTC (rev 242527)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp  2019-03-06 04:01:47 UTC (rev 242528)
</span><span class="lines">@@ -195,6 +195,9 @@
</span><span class="cx">     case AccessibilitySearchKey::Highlighted:
</span><span class="cx">         return axObject->hasHighlighting();
</span><span class="cx">             
</span><ins>+    case AccessibilitySearchKey::KeyboardFocusable:
+        return axObject->isKeyboardFocusable();
+        
</ins><span class="cx">     case AccessibilitySearchKey::ItalicFont:
</span><span class="cx">         return axObject->hasItalicFont();
</span><span class="cx">         
</span><span class="lines">@@ -3493,6 +3496,13 @@
</span><span class="cx">     return node && node->hasTagName(figureTag);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+bool AccessibilityObject::isKeyboardFocusable() const
+{
+    if (auto element = this->element())
+        return element->isFocusable();
+    return false;
+}
+
</ins><span class="cx"> bool AccessibilityObject::isOutput() const
</span><span class="cx"> {
</span><span class="cx">     Node* node = this->node();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (242527 => 242528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2019-03-06 02:15:57 UTC (rev 242527)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h    2019-03-06 04:01:47 UTC (rev 242528)
</span><span class="lines">@@ -215,6 +215,7 @@
</span><span class="cx">     Heading,
</span><span class="cx">     Highlighted,
</span><span class="cx">     ItalicFont,
</span><ins>+    KeyboardFocusable,
</ins><span class="cx">     Landmark,
</span><span class="cx">     Link,
</span><span class="cx">     List,
</span><span class="lines">@@ -441,6 +442,7 @@
</span><span class="cx">     bool isSubscriptStyleGroup() const;
</span><span class="cx">     bool isSuperscriptStyleGroup() const;
</span><span class="cx">     bool isFigureElement() const;
</span><ins>+    bool isKeyboardFocusable() const;
</ins><span class="cx">     bool isSummary() const { return roleValue() == AccessibilityRole::Summary; }
</span><span class="cx">     bool isOutput() const;
</span><span class="cx">     
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperBasemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm (242527 => 242528)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm      2019-03-06 02:15:57 UTC (rev 242527)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm 2019-03-06 04:01:47 UTC (rev 242528)
</span><span class="lines">@@ -166,6 +166,10 @@
</span><span class="cx"> #define NSAccessibilityHighlightedSearchKey @"AXHighlightedSearchKey"
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><ins>+#ifndef NSAccessibilityKeyboardFocusableSearchKey
+#define NSAccessibilityKeyboardFocusableSearchKey @"AXKeyboardFocusableSearchKey"
+#endif
+
</ins><span class="cx"> #ifndef NSAccessibilityItalicFontSearchKey
</span><span class="cx"> #define NSAccessibilityItalicFontSearchKey @"AXItalicFontSearchKey"
</span><span class="cx"> #endif
</span><span class="lines">@@ -695,6 +699,7 @@
</span><span class="cx">         { NSAccessibilityHeadingSameLevelSearchKey, AccessibilitySearchKey::HeadingSameLevel },
</span><span class="cx">         { NSAccessibilityHeadingSearchKey, AccessibilitySearchKey::Heading },
</span><span class="cx">         { NSAccessibilityHighlightedSearchKey, AccessibilitySearchKey::Highlighted },
</span><ins>+        { NSAccessibilityKeyboardFocusableSearchKey, AccessibilitySearchKey::KeyboardFocusable },
</ins><span class="cx">         { NSAccessibilityItalicFontSearchKey, AccessibilitySearchKey::ItalicFont },
</span><span class="cx">         { NSAccessibilityLandmarkSearchKey, AccessibilitySearchKey::Landmark },
</span><span class="cx">         { NSAccessibilityLinkSearchKey, AccessibilitySearchKey::Link },
</span></span></pre>
</div>
</div>

</body>
</html>