<!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>[185536] 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/185536">185536</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-06-13 01:29:23 -0700 (Sat, 13 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: WebKit exposes all Ruby Text as Unknown (Japanese EPUB accessibility blocker)
https://bugs.webkit.org/show_bug.cgi?id=141303
Patch by Andres Gonzalez <agonzalez334@nc.rr.com> on 2015-06-13
Reviewed by Chris Fleizach.
Source/WebCore:
Test: accessibility/ruby-hierarchy-roles.html
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(createAccessibilityRoleMap):
(-[WebAccessibilityObjectWrapper subrole]):
LayoutTests:
* accessibility/ruby-hierarchy-roles-expected.txt: Added.
* accessibility/ruby-hierarchy-roles.html: Added.
* platform/mac-mavericks/accessibility/ruby-hierarchy-roles-expected.txt: Added.
* platform/mac/accessibility/ruby-hierarchy-roles-expected.txt: 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="#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="#trunkLayoutTestsaccessibilityrubyhierarchyrolesexpectedtxt">trunk/LayoutTests/accessibility/ruby-hierarchy-roles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityrubyhierarchyroleshtml">trunk/LayoutTests/accessibility/ruby-hierarchy-roles.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityrubyhierarchyrolesexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/ruby-hierarchy-roles-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacmavericksaccessibilityrubyhierarchyrolesexpectedtxt">trunk/LayoutTests/platform/mac-mavericks/accessibility/ruby-hierarchy-roles-expected.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185535 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-06-13 08:16:24 UTC (rev 185535)
+++ trunk/LayoutTests/ChangeLog 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2015-06-13 Andres Gonzalez <agonzalez334@nc.rr.com>
+
+ AX: WebKit exposes all Ruby Text as Unknown (Japanese EPUB accessibility blocker)
+ https://bugs.webkit.org/show_bug.cgi?id=141303
+
+ Reviewed by Chris Fleizach.
+
+ * accessibility/ruby-hierarchy-roles-expected.txt: Added.
+ * accessibility/ruby-hierarchy-roles.html: Added.
+ * platform/mac-mavericks/accessibility/ruby-hierarchy-roles-expected.txt: Added.
+ * platform/mac/accessibility/ruby-hierarchy-roles-expected.txt: Added.
+
</ins><span class="cx"> 2015-06-12 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX:ARIA Toggle buttons aren't properly conveyed on iOS using VoiceOver
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityrubyhierarchyrolesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ruby-hierarchy-roles-expected.txt (0 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ruby-hierarchy-roles-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/ruby-hierarchy-roles-expected.txt 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+This tests that the ruby containers are exposed with the appropriate hierarchy and roles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+basetext rubytext
</ins></span></pre></div>
<a id="trunkLayoutTestsaccessibilityrubyhierarchyroleshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/accessibility/ruby-hierarchy-roles.html (0 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/ruby-hierarchy-roles.html (rev 0)
+++ trunk/LayoutTests/accessibility/ruby-hierarchy-roles.html 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+ <head>
+ <script src="../resources/js-test-pre.js"></script>
+ </head>
+ <body>
+ <ruby id="rubyElemId">
+ <rb>basetext</rb>
+ <rp>(</rp>
+ <rt>rubytext</rt>
+ <rp>)</rp>
+ </ruby>
+
+ <script>
+ if (window.accessibilityController) {
+ description("This tests that the ruby containers are exposed with the appropriate hierarchy and roles.")
+ // At the moment, this is implemented only for OSX.
+ var platform = accessibilityController.platformName;
+ if ("mac" == platform) {
+ // Expected values for roles and subroles.
+ var expectedRubyRole = "AXRole: AXGroup"; // all ruby containers have AXGroup role
+ var expectedRubyInlineSubrole = "AXSubrole: AXRubyInline";
+ var expectedRubyBlockSubrole = "AXSubrole: AXRubyBlock";
+ var expectedRubyRunSubrole = "AXSubrole: AXRubyRun";
+ var expectedRubyTextSubrole = "AXSubrole: AXRubyText";
+ var expectedRubyBaseSubrole = "AXSubrole: AXRubyBase";
+
+ // Try inline style first, block style second
+ var rubyElem = document.getElementById("rubyElemId");
+ shouldBeTrue("rubyElem != null");
+ rubyElem.style.display = "inline";
+ checkHierarchyAndRoles(rubyElem);
+
+ rubyElem.style.display = "block";
+ checkHierarchyAndRoles(rubyElem);
+
+ function checkHierarchyAndRoles(rubyElem) {
+ axRuby = window.accessibilityController.accessibleElementById("rubyElemId");
+ shouldBeTrue("axRuby != null");
+ role = axRuby.role;
+ subrole = axRuby.subrole;
+ shouldBe("role", "expectedRubyRole");
+ if (rubyElem.style.display == "inline") {
+ shouldBe("subrole", "expectedRubyInlineSubrole");
+ }
+ else {
+ shouldBe("subrole", "expectedRubyBlockSubrole");
+ }
+
+ // RubyRun
+ axRubyRun = axRuby.childAtIndex(0);
+ shouldBeTrue("axRubyRun != null");
+ role = axRubyRun.role;
+ subrole = axRubyRun.subrole;
+ shouldBe("role", "expectedRubyRole");
+ shouldBe("subrole", "expectedRubyRunSubrole");
+
+ // RubyText
+ axRubyText = axRubyRun.childAtIndex(0);
+ shouldBeTrue("axRubyText != null");
+ role = axRubyText.role;
+ subrole = axRubyText.subrole;
+ shouldBe("role", "expectedRubyRole");
+ shouldBe("subrole", "expectedRubyTextSubrole");
+
+ // RubyBase
+ axRubyBase = axRubyRun.childAtIndex(1);
+ shouldBeTrue("axRubyBase != null");
+ role = axRubyBase.role;
+ subrole = axRubyBase.subrole;
+ shouldBe("role", "expectedRubyRole");
+ shouldBe("subrole", "expectedRubyBaseSubrole");
+ }
+ }
+ }
+ </script>
+ <script src="../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityrubyhierarchyrolesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/ruby-hierarchy-roles-expected.txt (0 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/ruby-hierarchy-roles-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/ruby-hierarchy-roles-expected.txt 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+This tests that the ruby containers are exposed with the appropriate hierarchy and roles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS rubyElem != null is true
+PASS axRuby != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyInlineSubrole
+PASS axRubyRun != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyRunSubrole
+PASS axRubyText != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyTextSubrole
+PASS axRubyBase != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyBaseSubrole
+PASS axRuby != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyBlockSubrole
+PASS axRubyRun != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyRunSubrole
+PASS axRubyText != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyTextSubrole
+PASS axRubyBase != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyBaseSubrole
+PASS successfullyParsed is true
+
+TEST COMPLETE
+basetext rubytext
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacmavericksaccessibilityrubyhierarchyrolesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-mavericks/accessibility/ruby-hierarchy-roles-expected.txt (0 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-mavericks/accessibility/ruby-hierarchy-roles-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-mavericks/accessibility/ruby-hierarchy-roles-expected.txt 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+This tests that the ruby containers are exposed with the appropriate hierarchy and roles.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS rubyElem != null is true
+PASS axRuby != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyInlineSubrole
+PASS axRubyRun != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyRunSubrole
+PASS axRubyText != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyTextSubrole
+PASS axRubyBase != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyBaseSubrole
+PASS axRuby != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyBlockSubrole
+PASS axRubyRun != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyRunSubrole
+PASS axRubyText != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyTextSubrole
+PASS axRubyBase != null is true
+PASS role is expectedRubyRole
+PASS subrole is expectedRubyBaseSubrole
+PASS successfullyParsed is true
+
+TEST COMPLETE
+basetext rubytext
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185535 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-06-13 08:16:24 UTC (rev 185535)
+++ trunk/Source/WebCore/ChangeLog 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-13 Andres Gonzalez <agonzalez334@nc.rr.com>
+
+ AX: WebKit exposes all Ruby Text as Unknown (Japanese EPUB accessibility blocker)
+ https://bugs.webkit.org/show_bug.cgi?id=141303
+
+ Reviewed by Chris Fleizach.
+
+ Test: accessibility/ruby-hierarchy-roles.html
+
+ * accessibility/AccessibilityObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::computeAccessibilityIsIgnored):
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (createAccessibilityRoleMap):
+ (-[WebAccessibilityObjectWrapper subrole]):
+
</ins><span class="cx"> 2015-06-12 Chris Fleizach <cfleizach@apple.com>
</span><span class="cx">
</span><span class="cx"> AX: iOS: after updating control, VoiceOver speaks aria-expanded states reversed (says "collapsed" when "expanded")
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (185535 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-06-13 08:16:24 UTC (rev 185535)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -177,6 +177,11 @@
</span><span class="cx"> RadioGroupRole,
</span><span class="cx"> RowHeaderRole,
</span><span class="cx"> RowRole,
</span><ins>+ RubyBaseRole,
+ RubyBlockRole,
+ RubyInlineRole,
+ RubyRunRole,
+ RubyTextRole,
</ins><span class="cx"> RulerRole,
</span><span class="cx"> RulerMarkerRole,
</span><span class="cx"> ScrollAreaRole,
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (185535 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-06-13 08:16:24 UTC (rev 185535)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -1382,7 +1382,11 @@
</span><span class="cx"> if (node && node->hasTagName(dfnTag))
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- // By default, objects should be ignored so that the AX hierarchy is not
</del><ins>+ // Make sure that ruby containers are not ignored.
+ if (m_renderer->isRubyRun() || m_renderer->isRubyBlock() || m_renderer->isRubyInline())
+ return false;
+
+ // By default, objects should be ignored so that the AX hierarchy is not
</ins><span class="cx"> // filled with unnecessary items.
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="lines">@@ -2575,9 +2579,18 @@
</span><span class="cx"> if (node && node->hasTagName(dlTag))
</span><span class="cx"> return DescriptionListRole;
</span><span class="cx">
</span><del>- if (node && (node->hasTagName(rpTag) || node->hasTagName(rtTag)))
- return AnnotationRole;
-
</del><ins>+ // Check for Ruby elements
+ if (m_renderer->isRubyText())
+ return RubyTextRole;
+ if (m_renderer->isRubyBase())
+ return RubyBaseRole;
+ if (m_renderer->isRubyRun())
+ return RubyRunRole;
+ if (m_renderer->isRubyBlock())
+ return RubyBlockRole;
+ if (m_renderer->isRubyInline())
+ return RubyInlineRole;
+
</ins><span class="cx"> // This return value is what will be used if AccessibilityTableCell determines
</span><span class="cx"> // the cell should not be treated as a cell (e.g. because it is a layout table.
</span><span class="cx"> // In ATK, there is a distinction between generic text block elements and other
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (185535 => 185536)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-06-13 08:16:24 UTC (rev 185535)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-06-13 08:29:23 UTC (rev 185536)
</span><span class="lines">@@ -120,6 +120,26 @@
</span><span class="cx"> #define NSAccessibilityContentSeparatorSubrole @"AXContentSeparator"
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#ifndef NSAccessibilityRubyBaseSubRole
+#define NSAccessibilityRubyBaseSubrole @"AXRubyBase"
+#endif
+
+#ifndef NSAccessibilityRubyBlockSubrole
+#define NSAccessibilityRubyBlockSubrole @"AXRubyBlock"
+#endif
+
+#ifndef NSAccessibilityRubyInlineSubrole
+#define NSAccessibilityRubyInlineSubrole @"AXRubyInline"
+#endif
+
+#ifndef NSAccessibilityRubyRunSubrole
+#define NSAccessibilityRubyRunSubrole @"AXRubyRun"
+#endif
+
+#ifndef NSAccessibilityRubyTextSubrole
+#define NSAccessibilityRubyTextSubrole @"AXRubyText"
+#endif
+
</ins><span class="cx"> // Miscellaneous
</span><span class="cx"> #ifndef NSAccessibilityBlockQuoteLevelAttribute
</span><span class="cx"> #define NSAccessibilityBlockQuoteLevelAttribute @"AXBlockQuoteLevel"
</span><span class="lines">@@ -1960,6 +1980,11 @@
</span><span class="cx"> { SwitchRole, NSAccessibilityCheckBoxRole },
</span><span class="cx"> { SearchFieldRole, NSAccessibilityTextFieldRole },
</span><span class="cx"> { PreRole, NSAccessibilityGroupRole },
</span><ins>+ { RubyBaseRole, NSAccessibilityGroupRole },
+ { RubyBlockRole, NSAccessibilityGroupRole },
+ { RubyInlineRole, NSAccessibilityGroupRole },
+ { RubyRunRole, NSAccessibilityGroupRole },
+ { RubyTextRole, NSAccessibilityGroupRole },
</ins><span class="cx"> };
</span><span class="cx"> AccessibilityRoleMap& roleMap = *new AccessibilityRoleMap;
</span><span class="cx">
</span><span class="lines">@@ -2142,6 +2167,22 @@
</span><span class="cx">
</span><span class="cx"> if (m_object->isSwitch())
</span><span class="cx"> return NSAccessibilitySwitchSubrole;
</span><ins>+
+ // Ruby subroles
+ switch (role) {
+ case RubyBaseRole:
+ return NSAccessibilityRubyBaseSubrole;
+ case RubyBlockRole:
+ return NSAccessibilityRubyBlockSubrole;
+ case RubyInlineRole:
+ return NSAccessibilityRubyInlineSubrole;
+ case RubyRunRole:
+ return NSAccessibilityRubyRunSubrole;
+ case RubyTextRole:
+ return NSAccessibilityRubyTextSubrole;
+ default:
+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>