<!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>[195463] 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/195463">195463</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2016-01-22 11:31:22 -0800 (Fri, 22 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: <code> group and friends should have a custom subrole
https://bugs.webkit.org/show_bug.cgi?id=153282
Reviewed by Mario Sanchez Prada.
Source/WebCore:
Add some custom subroles for the mac for code, ins, del, cite, var, samp, pre, kbd,
so that assistive tech can recognize them.
Test: accessibility/mac/subroles-for-formatted-groups.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::isStyleFormatGroup):
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper subrole]):
LayoutTests:
* accessibility/duplicate-child-nodes-expected.txt:
* accessibility/mac/subroles-for-formatted-groups-expected.txt: Added.
* accessibility/mac/subroles-for-formatted-groups.html: Added.
* accessibility/roles-computedRoleString-expected.txt:
* accessibility/roles-computedRoleString.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityduplicatechildnodesexpectedtxt">trunk/LayoutTests/accessibility/duplicate-child-nodes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityrolescomputedRoleStringexpectedtxt">trunk/LayoutTests/accessibility/roles-computedRoleString-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityrolescomputedRoleStringhtml">trunk/LayoutTests/accessibility/roles-computedRoleString.html</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="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsaccessibilitymacsubrolesforformattedgroupsexpectedtxt">trunk/LayoutTests/accessibility/mac/subroles-for-formatted-groups-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacsubrolesforformattedgroupshtml">trunk/LayoutTests/accessibility/mac/subroles-for-formatted-groups.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/LayoutTests/ChangeLog 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-22 Chris Fleizach <cfleizach@apple.com>
+
+ AX: <code> group and friends should have a custom subrole
+ https://bugs.webkit.org/show_bug.cgi?id=153282
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/duplicate-child-nodes-expected.txt:
+ * accessibility/mac/subroles-for-formatted-groups-expected.txt: Added.
+ * accessibility/mac/subroles-for-formatted-groups.html: Added.
+ * accessibility/roles-computedRoleString-expected.txt:
+ * accessibility/roles-computedRoleString.html:
+
</ins><span class="cx"> 2016-01-22 Skachkov Oleksandr <gskachkov@gmail.com>
</span><span class="cx">
</span><span class="cx"> [ES6] Arrow function. Default arguments in arrow functions
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityduplicatechildnodesexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/duplicate-child-nodes-expected.txt (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/duplicate-child-nodes-expected.txt 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/LayoutTests/accessibility/duplicate-child-nodes-expected.txt 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><ins>+PASS webArea.childAtIndex(0).isEqual(webArea.childAtIndex(1)) is false
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacsubrolesforformattedgroupsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/subroles-for-formatted-groups-expected.txt (0 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/subroles-for-formatted-groups-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/subroles-for-formatted-groups-expected.txt 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+code
+kbd
+sample
+pre
+var insert delete cite
+This test makes sure that formatting style groups.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+code: AXSubrole: AXCodeStyleGroup
+kbd: AXSubrole: AXKeyboardInputStyleGroup
+samp: AXSubrole: AXSampleStyleGroup
+pre: AXSubrole: AXPreformattedStyleGroup
+var: AXSubrole: AXVariableStyleGroup
+ins: AXSubrole: AXInsertStyleGroup
+del: AXSubrole: AXDeleteStyleGroup
+cite: AXSubrole: AXCiteStyleGroup
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacsubrolesforformattedgroupshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/mac/subroles-for-formatted-groups.html (0 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/subroles-for-formatted-groups.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/subroles-for-formatted-groups.html 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -0,0 +1,39 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src="../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<code id="code">code</code><br>
+<kbd id="kbd">kbd</kbd><br>
+<samp id="samp">sample</samp><br>
+<pre id="pre">pre</pre>
+<var id="var">var</var>
+<ins id="ins">insert</ins>
+<del id="del">delete</del>
+<cite id="cite">cite</cite>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This test makes sure that formatting style groups.");
+
+ if (window.accessibilityController) {
+ debug("code: " + accessibilityController.accessibleElementById('code').subrole);
+ debug("kbd: " + accessibilityController.accessibleElementById('kbd').subrole);
+ debug("samp: " + accessibilityController.accessibleElementById('samp').subrole);
+ debug("pre: " + accessibilityController.accessibleElementById('pre').subrole);
+ debug("var: " + accessibilityController.accessibleElementById('var').subrole);
+ debug("ins: " + accessibilityController.accessibleElementById('ins').subrole);
+ debug("del: " + accessibilityController.accessibleElementById('del').subrole);
+ debug("cite: " + accessibilityController.accessibleElementById('cite').subrole);
+ }
+
+</script>
+
+<script src="../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityrolescomputedRoleStringexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/roles-computedRoleString-expected.txt (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/roles-computedRoleString-expected.txt 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/LayoutTests/accessibility/roles-computedRoleString-expected.txt 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -42,14 +42,16 @@
</span><span class="cx"> PASS: input[type='time'] -> .
</span><span class="cx"> PASS: input[type='url'] -> .
</span><span class="cx"> PASS: input[type='week'] -> .
</span><ins>+PASS: ins -> group.
</ins><span class="cx"> PASS: math -> math.
</span><span class="cx"> PASS: meter -> progressbar.
</span><span class="cx"> PASS: nav -> navigation.
</span><span class="cx"> PASS: ol -> list.
</span><span class="cx"> PASS: li -> listitem.
</span><span class="cx"> PASS: p -> .
</span><del>-PASS: pre -> .
</del><ins>+PASS: pre -> group.
</ins><span class="cx"> PASS: progress -> progressbar.
</span><ins>+PASS: samp -> group.
</ins><span class="cx"> PASS: section -> region.
</span><span class="cx"> PASS: select:not([multiple]) -> .
</span><span class="cx"> PASS: select[multiple] -> listbox.
</span><span class="lines">@@ -74,6 +76,7 @@
</span><span class="cx"> PASS: textarea -> textbox.
</span><span class="cx"> PASS: ul -> list.
</span><span class="cx"> PASS: li -> listitem.
</span><ins>+PASS: var -> group.
</ins><span class="cx"> PASS: div[role="command"] -> .
</span><span class="cx"> PASS: div[role="composite"] -> .
</span><span class="cx"> PASS: div[role="input"] -> .
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityrolescomputedRoleStringhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/roles-computedRoleString.html (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/roles-computedRoleString.html 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/LayoutTests/accessibility/roles-computedRoleString.html 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx"> <input type="time" value="X" data-role="" class="ex" data-note="[type='time']">
</span><span class="cx"> <input type="url" value="X" data-role="" class="ex" data-note="[type='url']">
</span><span class="cx"> <input type="week" value="X" data-role="" class="ex" data-note="[type='week']">
</span><del>-<ins data-role="" class="ex">X</ins>
</del><ins>+<ins data-role="group" class="ex">X</ins>
</ins><span class="cx"> <mark data-role="" class="ex">X</mark>
</span><span class="cx"> <math data-role="math" class="ex">X</math>
</span><span class="cx"> <!-- skipped <menu> -->
</span><span class="lines">@@ -69,12 +69,12 @@
</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="" class="ex">X</pre>
</del><ins>+<pre data-role="group" 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="cx"> <s data-role="" class="ex">X</s>
</span><del>-<samp data-role="" class="ex">X</samp>
</del><ins>+<samp data-role="group" class="ex">X</samp>
</ins><span class="cx"> <!-- skipped <script> -->
</span><span class="cx"> <section data-role="region" class="ex">X</section>
</span><span class="cx"> <select data-role="" class="ex" data-note=":not([multiple])">
</span><span class="lines">@@ -140,7 +140,7 @@
</span><span class="cx"> <ul data-role="list" class="ex">
</span><span class="cx"> <li data-role="listitem" class="ex">X</li>
</span><span class="cx"> </ul>
</span><del>-<var data-role="" class="ex">X</var>
</del><ins>+<var data-role="group" class="ex">X</var>
</ins><span class="cx"> <wbr data-role="" class="ex">X</wbr>
</span><span class="cx">
</span><span class="cx"> <!-- ==================================================================================================== -->
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityrolesexposedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/LayoutTests/platform/mac/accessibility/roles-exposed-expected.txt 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -70,24 +70,24 @@
</span><span class="cx"> AXRoleDescription:
</span><span class="cx">
</span><span class="cx"> cite
</span><del>- AXRole:
- AXSubrole:
- AXRoleDescription:
</del><ins>+ AXRole: AXGroup
+ AXSubrole: AXCiteStyleGroup
+ AXRoleDescription: group
</ins><span class="cx">
</span><span class="cx"> code
</span><del>- AXRole:
- AXSubrole:
- AXRoleDescription:
</del><ins>+ AXRole: AXGroup
+ AXSubrole: AXCodeStyleGroup
+ AXRoleDescription: group
</ins><span class="cx">
</span><span class="cx"> del:not([datetime])
</span><del>- AXRole:
- AXSubrole:
- AXRoleDescription:
</del><ins>+ AXRole: AXGroup
+ AXSubrole: AXDeleteStyleGroup
+ AXRoleDescription: group
</ins><span class="cx">
</span><span class="cx"> del[datetime]
</span><del>- AXRole:
- AXSubrole:
- AXRoleDescription:
</del><ins>+ AXRole: AXGroup
+ AXSubrole: AXDeleteStyleGroup
+ AXRoleDescription: group
</ins><span class="cx">
</span><span class="cx"> dfn
</span><span class="cx"> AXRole: AXGroup
</span><span class="lines">@@ -335,14 +335,14 @@
</span><span class="cx"> AXRoleDescription: text field
</span><span class="cx">
</span><span class="cx"> ins:not([datetime])
</span><del>- AXRole:
- AXSubrole:
- AXRoleDescription:
</del><ins>+ AXRole: AXGroup
+ AXSubrole: AXInsertStyleGroup
+ AXRoleDescription: group
</ins><span class="cx">
</span><span class="cx"> ins[datetime]
</span><del>- AXRole:
- AXSubrole:
- AXRoleDescription:
</del><ins>+ AXRole: AXGroup
+ AXSubrole: AXInsertStyleGroup
+ AXRoleDescription: group
</ins><span class="cx">
</span><span class="cx"> map
</span><span class="cx"> AXRole:
</span><span class="lines">@@ -556,7 +556,7 @@
</span><span class="cx">
</span><span class="cx"> pre
</span><span class="cx"> AXRole: AXGroup
</span><del>- AXSubrole:
</del><ins>+ AXSubrole: AXPreformattedStyleGroup
</ins><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> progress
</span><span class="lines">@@ -575,9 +575,9 @@
</span><span class="cx"> AXRoleDescription:
</span><span class="cx">
</span><span class="cx"> samp
</span><del>- AXRole:
- AXSubrole:
- AXRoleDescription:
</del><ins>+ AXRole: AXGroup
+ AXSubrole: AXSampleStyleGroup
+ AXRoleDescription: group
</ins><span class="cx">
</span><span class="cx"> section
</span><span class="cx"> AXRole: AXGroup
</span><span class="lines">@@ -730,9 +730,9 @@
</span><span class="cx"> AXRoleDescription: group
</span><span class="cx">
</span><span class="cx"> var
</span><del>- AXRole:
- AXSubrole:
- AXRoleDescription:
</del><ins>+ AXRole: AXGroup
+ AXSubrole: AXVariableStyleGroup
+ AXRoleDescription: group
</ins><span class="cx">
</span><span class="cx"> wbr
</span><span class="cx"> AXRole:
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/Source/WebCore/ChangeLog 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-01-22 Chris Fleizach <cfleizach@apple.com>
+
+ AX: <code> group and friends should have a custom subrole
+ https://bugs.webkit.org/show_bug.cgi?id=153282
+
+ Reviewed by Mario Sanchez Prada.
+
+ Add some custom subroles for the mac for code, ins, del, cite, var, samp, pre, kbd,
+ so that assistive tech can recognize them.
+
+ Test: accessibility/mac/subroles-for-formatted-groups.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::isStyleFormatGroup):
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper subrole]):
+
</ins><span class="cx"> 2016-01-22 Enrica Casucci <enrica@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove dependency from DataDetectorsCore on iOS.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -2940,6 +2940,18 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+bool AccessibilityObject::isStyleFormatGroup() const
+{
+ Node* node = this->node();
+ if (!node)
+ return false;
+
+ return node->hasTagName(kbdTag) || node->hasTagName(codeTag)
+ || node->hasTagName(preTag) || node->hasTagName(sampTag)
+ || node->hasTagName(varTag) || node->hasTagName(citeTag)
+ || node->hasTagName(insTag) || node->hasTagName(delTag);
+}
+
</ins><span class="cx"> bool AccessibilityObject::isContainedByPasswordField() 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 (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -540,7 +540,8 @@
</span><span class="cx"> bool isMeter() const;
</span><span class="cx"> bool isSplitter() const { return roleValue() == SplitterRole; }
</span><span class="cx"> bool isToolbar() const { return roleValue() == ToolbarRole; }
</span><del>-
</del><ins>+ bool isStyleFormatGroup() const;
+
</ins><span class="cx"> virtual bool isChecked() const { return false; }
</span><span class="cx"> virtual bool isEnabled() const { return false; }
</span><span class="cx"> virtual bool isSelected() const { return false; }
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -1386,6 +1386,9 @@
</span><span class="cx"> if (node && node->hasTagName(dfnTag))
</span><span class="cx"> return false;
</span><span class="cx">
</span><ins>+ if (isStyleFormatGroup())
+ return false;
+
</ins><span class="cx"> // Make sure that ruby containers are not ignored.
</span><span class="cx"> if (m_renderer->isRubyRun() || m_renderer->isRubyBlock() || m_renderer->isRubyInline())
</span><span class="cx"> return false;
</span><span class="lines">@@ -2581,7 +2584,10 @@
</span><span class="cx"> return SVGRootRole;
</span><span class="cx"> if (node && node->hasTagName(SVGNames::gTag))
</span><span class="cx"> return GroupRole;
</span><del>-
</del><ins>+
+ if (isStyleFormatGroup())
+ return GroupRole;
+
</ins><span class="cx"> #if ENABLE(MATHML)
</span><span class="cx"> if (node && node->hasTagName(MathMLNames::mathTag))
</span><span class="cx"> return DocumentMathRole;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (195462 => 195463)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-01-22 19:31:06 UTC (rev 195462)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2016-01-22 19:31:22 UTC (rev 195463)
</span><span class="lines">@@ -2361,6 +2361,27 @@
</span><span class="cx"> if (m_object->isSwitch())
</span><span class="cx"> return NSAccessibilitySwitchSubrole;
</span><span class="cx">
</span><ins>+ if (role == GroupRole) {
+ if (Node* node = m_object->node()) {
+ if (node->hasTagName(kbdTag))
+ return @"AXKeyboardInputStyleGroup";
+ if (node->hasTagName(codeTag))
+ return @"AXCodeStyleGroup";
+ if (node->hasTagName(preTag))
+ return @"AXPreformattedStyleGroup";
+ if (node->hasTagName(sampTag))
+ return @"AXSampleStyleGroup";
+ if (node->hasTagName(varTag))
+ return @"AXVariableStyleGroup";
+ if (node->hasTagName(citeTag))
+ return @"AXCiteStyleGroup";
+ if (node->hasTagName(insTag))
+ return @"AXInsertStyleGroup";
+ if (node->hasTagName(delTag))
+ return @"AXDeleteStyleGroup";
+ }
+ }
+
</ins><span class="cx"> // Ruby subroles
</span><span class="cx"> switch (role) {
</span><span class="cx"> case RubyBaseRole:
</span></span></pre>
</div>
</div>
</body>
</html>