<!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>[214623] 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/214623">214623</a></dd>
<dt>Author</dt> <dd>jcraig@apple.com</dd>
<dt>Date</dt> <dd>2017-03-30 14:13:21 -0700 (Thu, 30 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: Expose a new AXSubrole for explicit ARIA "group" role
https://bugs.webkit.org/show_bug.cgi?id=169810
<rdar://problem/31039693>
Reviewed by Chris Fleizach.
Source/WebCore:
Split GroupRole into generics (GroupRole) and explicit groups
(ApplicationGroupRole) so we can expose a subrole on the explicit
groups. Account for the change in ARIA Tree and Menu hierachies.
Update the computedRoleValue for WebKit Inspector usage, too.
Updated existing tests.
Test: accessibility/list-detection2.html:
Test: accessibility/roles-computedRoleString.html:
Test: inspector/dom/getAccessibilityPropertiesForNode.html:
Test: inspector/dom/highlightFrame.html:
Test: inspector/dom/highlightSelector.html:
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::helpText):
(WebCore::AccessibilityNodeObject::hierarchicalLevel):
(WebCore::AccessibilityNodeObject::remapAriaRoleDueToParent):
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::accessibleNameDerivesFromContent):
(WebCore::AccessibilityObject::ariaTreeItemContent):
(WebCore::initializeRoleMap):
(WebCore::AccessibilityObject::computedRoleString):
* accessibility/AccessibilityObject.h:
* accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
(atkRole):
* accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
(-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(createAccessibilityRoleMap):
(-[WebAccessibilityObjectWrapper subrole]):
Source/WebKit/win:
Account for Windows platform role mapping.
* AccessibleBase.cpp:
(MSAARole):
LayoutTests:
* accessibility/list-detection2-expected.txt:
* accessibility/list-detection2.html:
* accessibility/roles-computedRoleString.html:
* inspector/dom/getAccessibilityPropertiesForNode-expected.txt:
* inspector/dom/highlightFrame-expected.txt:
* inspector/dom/highlightSelector-expected.txt:
* platform/mac/accessibility/roles-computedRoleString-expected.txt:
* platform/mac/accessibility/roles-exposed-expected.txt:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitylistdetection2expectedtxt">trunk/LayoutTests/accessibility/list-detection2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitylistdetection2html">trunk/LayoutTests/accessibility/list-detection2.html</a></li>
<li><a href="#trunkLayoutTestsaccessibilityrolescomputedRoleStringhtml">trunk/LayoutTests/accessibility/roles-computedRoleString.html</a></li>
<li><a href="#trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNodeexpectedtxt">trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordomhighlightFrameexpectedtxt">trunk/LayoutTests/inspector/dom/highlightFrame-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectordomhighlightSelectorexpectedtxt">trunk/LayoutTests/inspector/dom/highlightSelector-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityrolescomputedRoleStringexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/roles-computedRoleString-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityrolesexposedexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/roles-exposed-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="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp">trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm">trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebKitwinAccessibleBasecpp">trunk/Source/WebKit/win/AccessibleBase.cpp</a></li>
<li><a href="#trunkSourceWebKitwinChangeLog">trunk/Source/WebKit/win/ChangeLog</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/ChangeLog 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2017-03-30 James Craig <jcraig@apple.com>
+
+ AX: Expose a new AXSubrole for explicit ARIA "group" role
+ https://bugs.webkit.org/show_bug.cgi?id=169810
+ <rdar://problem/31039693>
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/list-detection2-expected.txt:
+ * accessibility/list-detection2.html:
+ * accessibility/roles-computedRoleString.html:
+ * inspector/dom/getAccessibilityPropertiesForNode-expected.txt:
+ * inspector/dom/highlightFrame-expected.txt:
+ * inspector/dom/highlightSelector-expected.txt:
+ * platform/mac/accessibility/roles-computedRoleString-expected.txt:
+ * platform/mac/accessibility/roles-exposed-expected.txt:
+
</ins><span class="cx"> 2017-03-30 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> webrtc/video-stats.html and webrtc/video-replace-track.html are flaky
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitylistdetection2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/list-detection2-expected.txt (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/list-detection2-expected.txt 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/accessibility/list-detection2-expected.txt 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -17,9 +17,9 @@
</span><span class="cx"> PASS: ul w/ bullet content on inline ::before -> list.
</span><span class="cx"> PASS: ol w/ counter content on ::before -> list.
</span><span class="cx"> PASS: ol w/ counter content on inline ::before -> list.
</span><del>-PASS: ul w/ background image (NOT A LIST) -> group.
-PASS: ul w/ background on ::before (NOT A LIST) -> group.
-PASS: ul w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST) -> group.
-PASS: ol w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST) -> group.
-PASS: ul w/o explicit role and no markers (NOT A LIST) -> group.
</del><ins>+PASS: ul w/ background image (NOT A LIST) -> .
+PASS: ul w/ background on ::before (NOT A LIST) -> .
+PASS: ul w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST) -> .
+PASS: ol w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST) -> .
+PASS: ul w/o explicit role and no markers (NOT A LIST) -> .
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitylistdetection2html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/list-detection2.html (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/list-detection2.html 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/accessibility/list-detection2.html 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -118,12 +118,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> <h1>EXPLICIT FAILURE CASES: These next examples are <strong>NOT</strong> lists because these "list markers" are faked as background images. One is even a background image on a ::before pseudo-element, but that does not count as a listmarker. List markers should only be inferred by the <code>content</code> property or the <code>list-style</code> properties.</h1>
</span><del>- <ul data-role="group" class="ex nomarkers backgroundmarkers" data-note=" w/ background image (NOT A LIST)">
</del><ins>+ <ul data-role="" class="ex nomarkers backgroundmarkers" data-note=" w/ background image (NOT A LIST)">
</ins><span class="cx"> <li>foo</li>
</span><span class="cx"> <li>bar</li>
</span><span class="cx"> <li>baz</li>
</span><span class="cx"> </ul>
</span><del>- <ul data-role="group" class="ex nomarkers backgroundmarkersbefore" data-note=" w/ background on ::before (NOT A LIST)">
</del><ins>+ <ul data-role="" class="ex nomarkers backgroundmarkersbefore" data-note=" w/ background on ::before (NOT A LIST)">
</ins><span class="cx"> <li>foo</li>
</span><span class="cx"> <li>bar</li>
</span><span class="cx"> <li>baz</li>
</span><span class="lines">@@ -130,17 +130,17 @@
</span><span class="cx"> </ul>
</span><span class="cx">
</span><span class="cx"> <h1>EXPLICIT FAILURE CASES: These next examples are <strong>NOT</strong> there is no explicit role or any style or list markers to indicate this is actually intended as a list.</h1>
</span><del>- <ul data-role="group" class="ex inline" data-note=" w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST)">
</del><ins>+ <ul data-role="" class="ex inline" data-note=" w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST)">
</ins><span class="cx"> <li>foo</li>
</span><span class="cx"> <li>bar</li>
</span><span class="cx"> <li>baz</li>
</span><span class="cx"> </ul>
</span><del>- <ol data-role="group" class="ex inline" data-note=" w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST)">
</del><ins>+ <ol data-role="" class="ex inline" data-note=" w/o explicit role and displayed inline, which defaults to no markers (NOT A LIST)">
</ins><span class="cx"> <li>foo</li>
</span><span class="cx"> <li>bar</li>
</span><span class="cx"> <li>baz</li>
</span><span class="cx"> </ol>
</span><del>- <ul data-role="group" class="ex nomarkers" data-note=" w/o explicit role and no markers (NOT A LIST)">
</del><ins>+ <ul data-role="" class="ex nomarkers" data-note=" w/o explicit role and no markers (NOT A LIST)">
</ins><span class="cx"> <li>foo</li>
</span><span class="cx"> <li>bar</li>
</span><span class="cx"> <li>baz</li>
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityrolescomputedRoleStringhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/roles-computedRoleString.html (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/roles-computedRoleString.html 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/accessibility/roles-computedRoleString.html 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> <!-- skipped <output> -->
</span><span class="cx"> <p data-role="" class="ex">X</p>
</span><span class="cx"> <!-- skipped <param> -->
</span><del>-<pre data-role="group" class="ex">X</pre>
</del><ins>+<pre data-role="" class="ex">X</pre>
</ins><span class="cx"> <progress data-role="progressbar" class="ex" value="0.75">X</progress>
</span><span class="cx"> <q data-role="" class="ex">X</q>
</span><span class="cx"> <!-- skipped <ruby/rp/rt> -->
</span><span class="lines">@@ -77,7 +77,7 @@
</span><span class="cx"> <s data-role="" class="ex">X</s>
</span><span class="cx"> <samp data-role="" class="ex">X</samp>
</span><span class="cx"> <!-- skipped <script> -->
</span><del>-<section data-role="group" class="ex" data-note=":not([aria-label]:not([aria-labelledby])">X</section>
</del><ins>+<section data-role="" class="ex" data-note=":not([aria-label]:not([aria-labelledby])">X</section>
</ins><span class="cx"> <section data-role="region" class="ex" aria-label="x" data-note="[aria-label]">X</section>
</span><span class="cx"> <section data-role="region" class="ex" aria-labelledby="section-label" data-note="[aria-labelledby]">
</span><span class="cx"> <h2 id="section-label">X</h2>
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomgetAccessibilityPropertiesForNodeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode-expected.txt (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode-expected.txt 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/inspector/dom/getAccessibilityPropertiesForNode-expected.txt 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> </ul>
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><del>- role: group
</del><ins>+ role:
</ins><span class="cx"> childNodeIds.length: 1
</span><span class="cx"> parentNodeId: exists
</span><span class="cx">
</span><span class="lines">@@ -968,7 +968,7 @@
</span><span class="cx"> <script style="display:block;"></script>
</span><span class="cx"> exists: true
</span><span class="cx"> label:
</span><del>- role: group
</del><ins>+ role:
</ins><span class="cx"> ignored: true
</span><span class="cx"> parentNodeId: exists
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomhighlightFrameexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/highlightFrame-expected.txt (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/highlightFrame-expected.txt 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/inspector/dom/highlightFrame-expected.txt 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -11,10 +11,10 @@
</span><span class="cx"> PASS: Should not be a highlight for the main frame.
</span><span class="cx">
</span><span class="cx"> -- Running test case: HighlightChildFrame1
</span><del>-Highlight Object: [{"scrollOffset":{"x":0,"y":0},"fragments":[{"quads":[[{"x":8,"y":50},{"x":312,"y":50},{"x":312,"y":204},{"x":8,"y":204}],[{"x":8,"y":50},{"x":312,"y":50},{"x":312,"y":204},{"x":8,"y":204}],[{"x":10,"y":52},{"x":310,"y":52},{"x":310,"y":202},{"x":10,"y":202}],[{"x":10,"y":52},{"x":310,"y":52},{"x":310,"y":202},{"x":10,"y":202}]],"contentColor":"rgba(0, 0, 0, 0)","contentOutlineColor":"rgba(0, 0, 0, 0)","paddingColor":"rgba(0, 0, 0, 0)","borderColor":"rgba(0, 0, 0, 0)","marginColor":"rgba(0, 0, 0,
0)"}],"elementData":{"tagName":"iframe","idValue":"frame-1","size":{"width":304,"height":154},"role":"group"}}]
</del><ins>+Highlight Object: [{"scrollOffset":{"x":0,"y":0},"fragments":[{"quads":[[{"x":8,"y":50},{"x":312,"y":50},{"x":312,"y":204},{"x":8,"y":204}],[{"x":8,"y":50},{"x":312,"y":50},{"x":312,"y":204},{"x":8,"y":204}],[{"x":10,"y":52},{"x":310,"y":52},{"x":310,"y":202},{"x":10,"y":202}],[{"x":10,"y":52},{"x":310,"y":52},{"x":310,"y":202},{"x":10,"y":202}]],"contentColor":"rgba(0, 0, 0, 0)","contentOutlineColor":"rgba(0, 0, 0, 0)","paddingColor":"rgba(0, 0, 0, 0)","borderColor":"rgba(0, 0, 0, 0)","marginColor":"rgba(0, 0, 0, 0
)"}],"elementData":{"tagName":"iframe","idValue":"frame-1","size":{"width":304,"height":154},"role":""}}]
</ins><span class="cx">
</span><span class="cx"> -- Running test case: HighlightChildFrame2
</span><del>-Highlight Object: [{"scrollOffset":{"x":0,"y":0},"fragments":[{"quads":[[{"x":316,"y":50},{"x":620,"y":50},{"x":620,"y":204},{"x":316,"y":204}],[{"x":316,"y":50},{"x":620,"y":50},{"x":620,"y":204},{"x":316,"y":204}],[{"x":318,"y":52},{"x":618,"y":52},{"x":618,"y":202},{"x":318,"y":202}],[{"x":318,"y":52},{"x":618,"y":52},{"x":618,"y":202},{"x":318,"y":202}]],"contentColor":"rgba(0, 0, 0, 0)","contentOutlineColor":"rgba(0, 0, 0, 0)","paddingColor":"rgba(0, 0, 0, 0)","borderColor":"rgba(0, 0, 0, 0)","marginColor":"rg
ba(0, 0, 0, 0)"}],"elementData":{"tagName":"iframe","idValue":"frame-2","size":{"width":304,"height":154},"role":"group"}}]
</del><ins>+Highlight Object: [{"scrollOffset":{"x":0,"y":0},"fragments":[{"quads":[[{"x":316,"y":50},{"x":620,"y":50},{"x":620,"y":204},{"x":316,"y":204}],[{"x":316,"y":50},{"x":620,"y":50},{"x":620,"y":204},{"x":316,"y":204}],[{"x":318,"y":52},{"x":618,"y":52},{"x":618,"y":202},{"x":318,"y":202}],[{"x":318,"y":52},{"x":618,"y":52},{"x":618,"y":202},{"x":318,"y":202}]],"contentColor":"rgba(0, 0, 0, 0)","contentOutlineColor":"rgba(0, 0, 0, 0)","paddingColor":"rgba(0, 0, 0, 0)","borderColor":"rgba(0, 0, 0, 0)","marginColor":"rgb
a(0, 0, 0, 0)"}],"elementData":{"tagName":"iframe","idValue":"frame-2","size":{"width":304,"height":154},"role":""}}]
</ins><span class="cx">
</span><span class="cx"> -- Running test case: BadFrameId
</span><span class="cx"> PASS: Should produce an error.
</span></span></pre></div>
<a id="trunkLayoutTestsinspectordomhighlightSelectorexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/dom/highlightSelector-expected.txt (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/dom/highlightSelector-expected.txt 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/inspector/dom/highlightSelector-expected.txt 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> PASS: Should highlight 2 element(s).
</span><span class="cx"> Highlighted Elements:
</span><span class="cx"> {"tagName":"div","idValue":"","classes":["class-one",".escaped"],"size":{"width":10,"height":20},"role":""}
</span><del>-{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":"group"}
</del><ins>+{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":""}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: MainFrameWithMultipleClassSelector
</span><span class="cx"> - Frame: <main-frame>
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> Highlighted Elements:
</span><span class="cx"> {"tagName":"div","idValue":"","classes":["class-one",".escaped"],"size":{"width":10,"height":20},"role":""}
</span><span class="cx"> {"tagName":"div","idValue":"id-one","classes":["class-two"],"size":{"width":100,"height":200},"role":""}
</span><del>-{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":"group"}
</del><ins>+{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":""}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: MissingOptionalFrameIdShouldUseMainFrame
</span><span class="cx"> - Frame: Not Provided
</span><span class="lines">@@ -49,7 +49,7 @@
</span><span class="cx"> - Selector: iframe.class-one
</span><span class="cx"> PASS: Should highlight 1 element(s).
</span><span class="cx"> Highlighted Elements:
</span><del>-{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":"group"}
</del><ins>+{"tagName":"iframe","idValue":"","classes":["class-one"],"size":{"width":304,"height":154},"role":""}
</ins><span class="cx">
</span><span class="cx"> -- Running test case: MainFrameNonMatchingSelector
</span><span class="cx"> - Frame: <main-frame>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityrolescomputedRoleStringexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/roles-computedRoleString-expected.txt (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/roles-computedRoleString-expected.txt 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/platform/mac/accessibility/roles-computedRoleString-expected.txt 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -49,10 +49,10 @@
</span><span class="cx"> PASS: ol -> list.
</span><span class="cx"> PASS: li -> listitem.
</span><span class="cx"> PASS: p -> .
</span><del>-PASS: pre -> group.
</del><ins>+PASS: pre -> .
</ins><span class="cx"> PASS: progress -> progressbar.
</span><span class="cx"> PASS: samp -> .
</span><del>-PASS: section:not([aria-label]:not([aria-labelledby]) -> group.
</del><ins>+PASS: section:not([aria-label]:not([aria-labelledby]) -> .
</ins><span class="cx"> PASS: section[aria-label] -> region.
</span><span class="cx"> PASS: section[aria-labelledby] -> region.
</span><span class="cx"> PASS: select:not([multiple]) -> button.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityrolesexposedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -901,7 +901,7 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-biblioentry]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-bibliography]
</span><span class="lines">@@ -921,7 +921,7 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-colophon]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-conclusion]
</span><span class="lines">@@ -936,7 +936,7 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-credit]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-credits]
</span><span class="lines">@@ -946,12 +946,12 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-dedication]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-endnote]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-endnotes]
</span><span class="lines">@@ -961,7 +961,7 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-epigraph]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-epilogue]
</span><span class="lines">@@ -976,12 +976,12 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-example]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-footnote]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-foreword]
</span><span class="lines">@@ -1016,12 +1016,12 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-notice]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-pagebreak]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-pagelist]
</span><span class="lines">@@ -1046,12 +1046,12 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-pullquote]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-qna]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-subtitle]
</span><span class="lines">@@ -1061,7 +1061,7 @@
</span><span class="cx">
</span><span class="cx"> div[role=doc-tip]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=doc-toc]
</span><span class="lines">@@ -1111,7 +1111,7 @@
</span><span class="cx">
</span><span class="cx"> div[role=group]
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXApplicationGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> div[role=heading]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebCore/ChangeLog 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -1,3 +1,42 @@
</span><ins>+2017-03-30 James Craig <jcraig@apple.com>
+
+ AX: Expose a new AXSubrole for explicit ARIA "group" role
+ https://bugs.webkit.org/show_bug.cgi?id=169810
+ <rdar://problem/31039693>
+
+ Reviewed by Chris Fleizach.
+
+ Split GroupRole into generics (GroupRole) and explicit groups
+ (ApplicationGroupRole) so we can expose a subrole on the explicit
+ groups. Account for the change in ARIA Tree and Menu hierachies.
+ Update the computedRoleValue for WebKit Inspector usage, too.
+
+ Updated existing tests.
+
+ Test: accessibility/list-detection2.html:
+ Test: accessibility/roles-computedRoleString.html:
+ Test: inspector/dom/getAccessibilityPropertiesForNode.html:
+ Test: inspector/dom/highlightFrame.html:
+ Test: inspector/dom/highlightSelector.html:
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::helpText):
+ (WebCore::AccessibilityNodeObject::hierarchicalLevel):
+ (WebCore::AccessibilityNodeObject::remapAriaRoleDueToParent):
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::accessibleNameDerivesFromContent):
+ (WebCore::AccessibilityObject::ariaTreeItemContent):
+ (WebCore::initializeRoleMap):
+ (WebCore::AccessibilityObject::computedRoleString):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
+ (atkRole):
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (createAccessibilityRoleMap):
+ (-[WebAccessibilityObjectWrapper subrole]):
+
</ins><span class="cx"> 2017-03-30 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> We are spending a lot of time bzero'ing AudioChannel buffers on uni-watch.com
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -1606,7 +1606,7 @@
</span><span class="cx"> AccessibilityObject* axObj = axObjectCache()->getOrCreate(ancestor);
</span><span class="cx"> if (axObj) {
</span><span class="cx"> AccessibilityRole role = axObj->roleValue();
</span><del>- if (role != GroupRole && role != UnknownRole)
</del><ins>+ if (role != ApplicationGroupRole && role != GroupRole && role != UnknownRole)
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1633,7 +1633,7 @@
</span><span class="cx"> unsigned level = 1;
</span><span class="cx"> for (AccessibilityObject* parent = parentObject(); parent; parent = parent->parentObject()) {
</span><span class="cx"> AccessibilityRole parentRole = parent->ariaRoleAttribute();
</span><del>- if (parentRole == GroupRole)
</del><ins>+ if (parentRole == ApplicationGroupRole)
</ins><span class="cx"> level++;
</span><span class="cx"> else if (parentRole == TreeRole)
</span><span class="cx"> break;
</span><span class="lines">@@ -2150,7 +2150,7 @@
</span><span class="cx"> if (role == ListBoxOptionRole && parentAriaRole == MenuRole)
</span><span class="cx"> return MenuItemRole;
</span><span class="cx"> // An aria "menuitem" may map to MenuButton or MenuItem depending on its parent.
</span><del>- if (role == MenuItemRole && parentAriaRole == GroupRole)
</del><ins>+ if (role == MenuItemRole && parentAriaRole == ApplicationGroupRole)
</ins><span class="cx"> return MenuButtonRole;
</span><span class="cx">
</span><span class="cx"> // If the parent had a different role, then we don't need to continue searching up the chain.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -300,6 +300,7 @@
</span><span class="cx"> case ApplicationAlertRole:
</span><span class="cx"> case ApplicationAlertDialogRole:
</span><span class="cx"> case ApplicationDialogRole:
</span><ins>+ case ApplicationGroupRole:
</ins><span class="cx"> case ApplicationLogRole:
</span><span class="cx"> case ApplicationMarqueeRole:
</span><span class="cx"> case ApplicationStatusRole:
</span><span class="lines">@@ -1829,7 +1830,7 @@
</span><span class="cx"> // The ARIA tree item content are the item that are not other tree items or their containing groups.
</span><span class="cx"> for (const auto& child : children()) {
</span><span class="cx"> AccessibilityRole role = child->roleValue();
</span><del>- if (role == TreeItemRole || role == GroupRole)
</del><ins>+ if (role == TreeItemRole || role == GroupRole || role == ApplicationGroupRole)
</ins><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> result.append(child);
</span><span class="lines">@@ -2110,23 +2111,23 @@
</span><span class="cx"> { "doc-afterword", LandmarkRegionRole },
</span><span class="cx"> { "doc-appendix", LandmarkRegionRole },
</span><span class="cx"> { "doc-backlink", WebCoreLinkRole },
</span><del>- { "doc-biblioentry", GroupRole },
</del><ins>+ { "doc-biblioentry", ApplicationGroupRole },
</ins><span class="cx"> { "doc-bibliography", LandmarkRegionRole },
</span><span class="cx"> { "doc-biblioref", WebCoreLinkRole },
</span><span class="cx"> { "doc-chapter", LandmarkRegionRole },
</span><del>- { "doc-colophon", GroupRole },
</del><ins>+ { "doc-colophon", ApplicationGroupRole },
</ins><span class="cx"> { "doc-conclusion", LandmarkRegionRole },
</span><span class="cx"> { "doc-cover", ImageRole },
</span><del>- { "doc-credit", GroupRole },
</del><ins>+ { "doc-credit", ApplicationGroupRole },
</ins><span class="cx"> { "doc-credits", LandmarkRegionRole },
</span><del>- { "doc-dedication", GroupRole },
- { "doc-endnote", GroupRole },
</del><ins>+ { "doc-dedication", ApplicationGroupRole },
+ { "doc-endnote", ApplicationGroupRole },
</ins><span class="cx"> { "doc-endnotes", LandmarkRegionRole },
</span><del>- { "doc-epigraph", GroupRole },
</del><ins>+ { "doc-epigraph", ApplicationGroupRole },
</ins><span class="cx"> { "doc-epilogue", LandmarkRegionRole },
</span><span class="cx"> { "doc-errata", LandmarkRegionRole },
</span><del>- { "doc-example", GroupRole },
- { "doc-footnote", GroupRole },
</del><ins>+ { "doc-example", ApplicationGroupRole },
+ { "doc-footnote", ApplicationGroupRole },
</ins><span class="cx"> { "doc-foreword", LandmarkRegionRole },
</span><span class="cx"> { "doc-glossary", LandmarkRegionRole },
</span><span class="cx"> { "doc-glossref", WebCoreLinkRole },
</span><span class="lines">@@ -2133,16 +2134,16 @@
</span><span class="cx"> { "doc-index", LandmarkNavigationRole },
</span><span class="cx"> { "doc-introduction", LandmarkRegionRole },
</span><span class="cx"> { "doc-noteref", WebCoreLinkRole },
</span><del>- { "doc-notice", GroupRole },
- { "doc-pagebreak", GroupRole },
</del><ins>+ { "doc-notice", ApplicationGroupRole },
+ { "doc-pagebreak", ApplicationGroupRole },
</ins><span class="cx"> { "doc-pagelist", LandmarkNavigationRole },
</span><span class="cx"> { "doc-part", LandmarkRegionRole },
</span><span class="cx"> { "doc-preface", LandmarkRegionRole },
</span><span class="cx"> { "doc-prologue", LandmarkRegionRole },
</span><del>- { "doc-pullquote", GroupRole },
- { "doc-qna", GroupRole },
</del><ins>+ { "doc-pullquote", ApplicationGroupRole },
+ { "doc-qna", ApplicationGroupRole },
</ins><span class="cx"> { "doc-subtitle", HeadingRole },
</span><del>- { "doc-tip", GroupRole },
</del><ins>+ { "doc-tip", ApplicationGroupRole },
</ins><span class="cx"> { "doc-toc", LandmarkNavigationRole },
</span><span class="cx"> { "grid", GridRole },
</span><span class="cx"> { "gridcell", GridCellRole },
</span><span class="lines">@@ -2154,7 +2155,7 @@
</span><span class="cx"> { "document", DocumentRole },
</span><span class="cx"> { "form", FormRole },
</span><span class="cx"> { "rowheader", RowHeaderRole },
</span><del>- { "group", GroupRole },
</del><ins>+ { "group", ApplicationGroupRole },
</ins><span class="cx"> { "heading", HeadingRole },
</span><span class="cx"> { "img", ImageRole },
</span><span class="cx"> { "link", WebCoreLinkRole },
</span><span class="lines">@@ -2244,6 +2245,8 @@
</span><span class="cx"> {
</span><span class="cx"> // FIXME: Need a few special cases that aren't in the RoleMap: option, etc. http://webkit.org/b/128296
</span><span class="cx"> AccessibilityRole role = roleValue();
</span><ins>+ if (role == GroupRole)
+ return ""; // Special-casing an empty value because generic block elements (GroupRole) are not the same as role="group" (ApplicationGroupRole).
</ins><span class="cx"> if (role == HorizontalRuleRole)
</span><span class="cx"> role = SplitterRole;
</span><span class="cx"> if (role == PopUpButtonRole || role == ToggleButtonRole)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx"> ApplicationAlertRole,
</span><span class="cx"> ApplicationAlertDialogRole,
</span><span class="cx"> ApplicationDialogRole,
</span><ins>+ ApplicationGroupRole,
</ins><span class="cx"> ApplicationLogRole,
</span><span class="cx"> ApplicationMarqueeRole,
</span><span class="cx"> ApplicationStatusRole,
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityatkWebKitAccessibleWrapperAtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -548,6 +548,7 @@
</span><span class="cx"> case SVGRootRole:
</span><span class="cx"> case TabPanelRole:
</span><span class="cx"> return ATK_ROLE_PANEL;
</span><ins>+ case ApplicationGroupRole:
</ins><span class="cx"> case GroupRole:
</span><span class="cx"> return coreObject->isStyleFormatGroup() ? ATK_ROLE_SECTION : ATK_ROLE_PANEL;
</span><span class="cx"> case RowHeaderRole:
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityiosWebAccessibilityObjectWrapperIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -833,6 +833,7 @@
</span><span class="cx"> case ApplicationAlertRole:
</span><span class="cx"> case ApplicationAlertDialogRole:
</span><span class="cx"> case ApplicationDialogRole:
</span><ins>+ case ApplicationGroupRole:
</ins><span class="cx"> case ApplicationLogRole:
</span><span class="cx"> case ApplicationMarqueeRole:
</span><span class="cx"> case ApplicationStatusRole:
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -1866,6 +1866,7 @@
</span><span class="cx"> { ApplicationAlertRole, NSAccessibilityGroupRole },
</span><span class="cx"> { ApplicationAlertDialogRole, NSAccessibilityGroupRole },
</span><span class="cx"> { ApplicationDialogRole, NSAccessibilityGroupRole },
</span><ins>+ { ApplicationGroupRole, NSAccessibilityGroupRole },
</ins><span class="cx"> { ApplicationLogRole, NSAccessibilityGroupRole },
</span><span class="cx"> { ApplicationMarqueeRole, NSAccessibilityGroupRole },
</span><span class="cx"> { ApplicationStatusRole, NSAccessibilityGroupRole },
</span><span class="lines">@@ -2023,6 +2024,8 @@
</span><span class="cx"> return @"AXApplicationAlertDialog";
</span><span class="cx"> case ApplicationDialogRole:
</span><span class="cx"> return @"AXApplicationDialog";
</span><ins>+ case ApplicationGroupRole:
+ return @"AXApplicationGroup";
</ins><span class="cx"> case ApplicationLogRole:
</span><span class="cx"> return @"AXApplicationLog";
</span><span class="cx"> case ApplicationMarqueeRole:
</span></span></pre></div>
<a id="trunkSourceWebKitwinAccessibleBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/AccessibleBase.cpp (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/AccessibleBase.cpp 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebKit/win/AccessibleBase.cpp 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -887,6 +887,7 @@
</span><span class="cx"> return ROLE_SYSTEM_COLUMN;
</span><span class="cx"> case WebCore::RowRole:
</span><span class="cx"> return ROLE_SYSTEM_ROW;
</span><ins>+ case WebCore::ApplicationGroupRole:
</ins><span class="cx"> case WebCore::GroupRole:
</span><span class="cx"> case WebCore::RadioGroupRole:
</span><span class="cx"> return ROLE_SYSTEM_GROUPING;
</span></span></pre></div>
<a id="trunkSourceWebKitwinChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/win/ChangeLog (214622 => 214623)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/win/ChangeLog 2017-03-30 21:10:54 UTC (rev 214622)
+++ trunk/Source/WebKit/win/ChangeLog 2017-03-30 21:13:21 UTC (rev 214623)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-30 James Craig <jcraig@apple.com>
+
+ AX: Expose a new AXSubrole for explicit ARIA "group" role
+ https://bugs.webkit.org/show_bug.cgi?id=169810
+ <rdar://problem/31039693>
+
+ Reviewed by Chris Fleizach.
+
+ Account for Windows platform role mapping.
+
+ * AccessibleBase.cpp:
+ (MSAARole):
+
</ins><span class="cx"> 2017-03-24 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2] Add a UI delegate SPI hook to enable or disable navigation on drop
</span></span></pre>
</div>
</div>
</body>
</html>