<!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>[182012] 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/182012">182012</a></dd>
<dt>Author</dt> <dd>cfleizach@apple.com</dd>
<dt>Date</dt> <dd>2015-03-26 09:35:58 -0700 (Thu, 26 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>AX: [role="button"][aria-pressed] should be exposed as AXCheckbox:AXToggleButton, with role description of "toggle button"
https://bugs.webkit.org/show_bug.cgi?id=115298
Reviewed by Mario Sanchez Prada.
Source/WebCore:
A role=button + aria-pressed object should be exposed as AXCheckbox on Mac now. It should also convert the
aria-pressed state into a 0, 1, 2 number value for the Mac.
Test: platform/mac/accessibility/aria-pressed-button-attributes.html
* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::checkboxOrRadioValue):
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityObject::isToggleButton):
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
(createAccessibilityRoleMap):
(-[WebAccessibilityObjectWrapper subrole]):
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
LayoutTests:
* accessibility/aria-toggle-button-with-title.html:
Bad path for post test resources file, so that is fixed.
* platform/mac/accessibility/aria-pressed-button-attributes-expected.txt: Added.
* platform/mac/accessibility/aria-pressed-button-attributes.html: Added.
* platform/mac/accessibility/aria-toggle-button-with-title-expected.txt:
Updated to reflect the new role of this object.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityariatogglebuttonwithtitlehtml">trunk/LayoutTests/accessibility/aria-toggle-button-with-title.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityariatogglebuttonwithtitleexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/aria-toggle-button-with-title-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="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityariapressedbuttonattributesexpectedtxt">trunk/LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacaccessibilityariapressedbuttonattributeshtml">trunk/LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182011 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-26 16:24:06 UTC (rev 182011)
+++ trunk/LayoutTests/ChangeLog 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-03-26 Chris Fleizach <cfleizach@apple.com>
+
+ AX: [role="button"][aria-pressed] should be exposed as AXCheckbox:AXToggleButton, with role description of "toggle button"
+ https://bugs.webkit.org/show_bug.cgi?id=115298
+
+ Reviewed by Mario Sanchez Prada.
+
+ * accessibility/aria-toggle-button-with-title.html:
+ Bad path for post test resources file, so that is fixed.
+ * platform/mac/accessibility/aria-pressed-button-attributes-expected.txt: Added.
+ * platform/mac/accessibility/aria-pressed-button-attributes.html: Added.
+ * platform/mac/accessibility/aria-toggle-button-with-title-expected.txt:
+ Updated to reflect the new role of this object.
+
</ins><span class="cx"> 2015-03-26 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed gardening, skip failing tests on AArch64 Linux.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityariatogglebuttonwithtitlehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/aria-toggle-button-with-title.html (182011 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/aria-toggle-button-with-title.html 2015-03-26 16:24:06 UTC (rev 182011)
+++ trunk/LayoutTests/accessibility/aria-toggle-button-with-title.html 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -38,6 +38,6 @@
</span><span class="cx"> description("This tests that a toggle button properly exposes the title when there isn't a direct relation and textUnderElement is required to be used.");
</span><span class="cx">
</span><span class="cx"> </script>
</span><del>-<script src="../../../resources/js-test-post.js"></script>
</del><ins>+<script src="../resources/js-test-post.js"></script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityariapressedbuttonattributesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes-expected.txt (0 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes-expected.txt 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+Foo
+Bar
+This tests role=button with aria-pressed will create an AXCheckbox:AXToggle on Mac with the right AXValue
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Button1: AXRole: AXCheckBox
+Button1: AXSubrole: AXToggle
+Button1: AXValue: 1
+Button2: AXRole: AXCheckBox
+Button2: AXSubrole: AXToggle
+Button2: AXValue: 0
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityariapressedbuttonattributeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes.html (0 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes.html (rev 0)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-pressed-button-attributes.html 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<meta charset="utf-8">
+<script src="../../../resources/js-test-pre.js"></script>
+</head>
+<body id="body">
+
+<div id="button1" role="button" aria-pressed="true">Foo</div>
+
+<div id="button2" role="button" aria-pressed="false">Bar</div>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests role=button with aria-pressed will create an AXCheckbox:AXToggle on Mac with the right AXValue");
+
+ if (window.accessibilityController) {
+
+ var button1 = accessibilityController.accessibleElementById("button1");
+ debug("Button1: " + button1.role);
+ debug("Button1: " + button1.subrole);
+ debug("Button1: " + button1.stringValue);
+
+ var button2 = accessibilityController.accessibleElementById("button2");
+ debug("Button2: " + button2.role);
+ debug("Button2: " + button2.subrole);
+ debug("Button2: " + button2.stringValue);
+ }
+
+</script>
+
+<script src="../../../resources/js-test-post.js"></script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacaccessibilityariatogglebuttonwithtitleexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/accessibility/aria-toggle-button-with-title-expected.txt (182011 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/accessibility/aria-toggle-button-with-title-expected.txt 2015-03-26 16:24:06 UTC (rev 182011)
+++ trunk/LayoutTests/platform/mac/accessibility/aria-toggle-button-with-title-expected.txt 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -5,7 +5,10 @@
</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><del>-Role: AXRole: AXButton
</del><ins>+PASS successfullyParsed is true
+
+TEST COMPLETE
+Role: AXRole: AXCheckBox
</ins><span class="cx"> PASS tbutton1.title is 'AXTitle: Toggle button'
</span><span class="cx"> Role: AXRole: AXButton
</span><span class="cx"> PASS button.title is 'AXTitle: Button title'
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182011 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-26 16:24:06 UTC (rev 182011)
+++ trunk/Source/WebCore/ChangeLog 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-03-26 Chris Fleizach <cfleizach@apple.com>
+
+ AX: [role="button"][aria-pressed] should be exposed as AXCheckbox:AXToggleButton, with role description of "toggle button"
+ https://bugs.webkit.org/show_bug.cgi?id=115298
+
+ Reviewed by Mario Sanchez Prada.
+
+ A role=button + aria-pressed object should be exposed as AXCheckbox on Mac now. It should also convert the
+ aria-pressed state into a 0, 1, 2 number value for the Mac.
+
+ Test: platform/mac/accessibility/aria-pressed-button-attributes.html
+
+ * accessibility/AccessibilityObject.cpp:
+ (WebCore::AccessibilityObject::checkboxOrRadioValue):
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityObject::isToggleButton):
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper additionalAccessibilityAttributeNames]):
+ (createAccessibilityRoleMap):
+ (-[WebAccessibilityObjectWrapper subrole]):
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
</ins><span class="cx"> 2015-03-25 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> CSS blend modes do not parse when in the shadow tree
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (182011 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-03-26 16:24:06 UTC (rev 182011)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -2226,7 +2226,17 @@
</span><span class="cx"> {
</span><span class="cx"> // If this is a real checkbox or radio button, AccessibilityRenderObject will handle.
</span><span class="cx"> // If it's an ARIA checkbox, radio, or switch the aria-checked attribute should be used.
</span><ins>+ // If it's a toggle button, the aria-pressed attribute is consulted.
</ins><span class="cx">
</span><ins>+ if (isToggleButton()) {
+ const AtomicString& ariaPressed = getAttribute(aria_pressedAttr);
+ if (equalIgnoringCase(ariaPressed, "true"))
+ return ButtonStateOn;
+ if (equalIgnoringCase(ariaPressed, "mixed"))
+ return ButtonStateMixed;
+ return ButtonStateOff;
+ }
+
</ins><span class="cx"> const AtomicString& result = getAttribute(aria_checkedAttr);
</span><span class="cx"> if (equalIgnoringCase(result, "true"))
</span><span class="cx"> return ButtonStateOn;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (182011 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-03-26 16:24:06 UTC (rev 182011)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -502,6 +502,7 @@
</span><span class="cx"> virtual bool isMockObject() const { return false; }
</span><span class="cx"> virtual bool isMediaControlLabel() const { return false; }
</span><span class="cx"> bool isSwitch() const { return roleValue() == SwitchRole; }
</span><ins>+ bool isToggleButton() const { return roleValue() == ToggleButtonRole; }
</ins><span class="cx"> bool isTextControl() const;
</span><span class="cx"> bool isARIATextControl() const;
</span><span class="cx"> bool isTabList() const { return roleValue() == TabListRole; }
</span><span class="lines">@@ -599,7 +600,7 @@
</span><span class="cx"> virtual bool supportsARIAControls() const { return false; }
</span><span class="cx"> virtual void ariaControlsElements(AccessibilityChildrenVector&) const { }
</span><span class="cx"> virtual bool ariaHasPopup() const { return false; }
</span><del>- virtual bool ariaPressedIsPresent() const;
</del><ins>+ bool ariaPressedIsPresent() const;
</ins><span class="cx"> bool ariaIsMultiline() const;
</span><span class="cx"> String invalidStatus() const;
</span><span class="cx"> bool supportsARIAExpanded() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (182011 => 182012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-03-26 16:24:06 UTC (rev 182011)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2015-03-26 16:35:58 UTC (rev 182012)
</span><span class="lines">@@ -1191,6 +1191,9 @@
</span><span class="cx"> if (m_object->supportsARIAOwns())
</span><span class="cx"> [additional addObject:NSAccessibilityOwnsAttribute];
</span><span class="cx">
</span><ins>+ if (m_object->isToggleButton())
+ [additional addObject:NSAccessibilityValueAttribute];
+
</ins><span class="cx"> if (m_object->supportsARIAExpanded())
</span><span class="cx"> [additional addObject:NSAccessibilityExpandedAttribute];
</span><span class="cx">
</span><span class="lines">@@ -1944,7 +1947,7 @@
</span><span class="cx"> { FormRole, NSAccessibilityGroupRole },
</span><span class="cx"> { SpinButtonRole, NSAccessibilityIncrementorRole },
</span><span class="cx"> { FooterRole, NSAccessibilityGroupRole },
</span><del>- { ToggleButtonRole, NSAccessibilityButtonRole },
</del><ins>+ { ToggleButtonRole, NSAccessibilityCheckBoxRole },
</ins><span class="cx"> { CanvasRole, NSAccessibilityImageRole },
</span><span class="cx"> { SVGRootRole, NSAccessibilityGroupRole },
</span><span class="cx"> { LegendRole, NSAccessibilityGroupRole },
</span><span class="lines">@@ -1998,13 +2001,15 @@
</span><span class="cx">
</span><span class="cx"> if (m_object->isAttachment()) {
</span><span class="cx"> NSView* attachView = [self attachmentView];
</span><del>- if ([[attachView accessibilityAttributeNames] containsObject:NSAccessibilitySubroleAttribute]) {
</del><ins>+ if ([[attachView accessibilityAttributeNames] containsObject:NSAccessibilitySubroleAttribute])
</ins><span class="cx"> return [attachView accessibilityAttributeValue:NSAccessibilitySubroleAttribute];
</span><del>- }
</del><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_object->roleValue() == HorizontalRuleRole)
</del><ins>+ AccessibilityRole role = m_object->roleValue();
+ if (role == HorizontalRuleRole)
</ins><span class="cx"> return NSAccessibilityContentSeparatorSubrole;
</span><ins>+ if (role == ToggleButtonRole)
+ return NSAccessibilityToggleSubrole;
</ins><span class="cx">
</span><span class="cx"> if (is<AccessibilitySpinButtonPart>(*m_object)) {
</span><span class="cx"> if (downcast<AccessibilitySpinButtonPart>(*m_object).isIncrementor())
</span><span class="lines">@@ -2029,7 +2034,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // ARIA content subroles.
</span><del>- switch (m_object->roleValue()) {
</del><ins>+ switch (role) {
</ins><span class="cx"> case LandmarkApplicationRole:
</span><span class="cx"> return @"AXLandmarkApplication";
</span><span class="cx"> case LandmarkBannerRole:
</span><span class="lines">@@ -2085,7 +2090,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_object->roleValue() == MathElementRole) {
</del><ins>+ if (role == MathElementRole) {
</ins><span class="cx"> if (m_object->isMathFraction())
</span><span class="cx"> return @"AXMathFraction";
</span><span class="cx"> if (m_object->isMathFenced())
</span><span class="lines">@@ -2122,9 +2127,9 @@
</span><span class="cx"> return @"AXMathMultiscript";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_object->roleValue() == VideoRole)
</del><ins>+ if (role == VideoRole)
</ins><span class="cx"> return @"AXVideo";
</span><del>- if (m_object->roleValue() == AudioRole)
</del><ins>+ if (role == AudioRole)
</ins><span class="cx"> return @"AXAudio";
</span><span class="cx">
</span><span class="cx"> if (m_object->isMediaTimeline())
</span><span class="lines">@@ -2449,7 +2454,7 @@
</span><span class="cx"> if (m_object->isHeading())
</span><span class="cx"> return [NSNumber numberWithInt:m_object->headingLevel()];
</span><span class="cx">
</span><del>- if (m_object->isCheckboxOrRadio() || m_object->isMenuItem() || m_object->isSwitch()) {
</del><ins>+ if (m_object->isCheckboxOrRadio() || m_object->isMenuItem() || m_object->isSwitch() || m_object->isToggleButton()) {
</ins><span class="cx"> switch (m_object->checkboxOrRadioValue()) {
</span><span class="cx"> case ButtonStateOff:
</span><span class="cx"> return [NSNumber numberWithInt:0];
</span></span></pre>
</div>
</div>
</body>
</html>