Changeset 64084 in webkit
- Timestamp:
- Jul 26, 2010 3:49:18 PM (14 years ago)
- Location:
- trunk/WebCore
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebCore/ChangeLog
r64083 r64084 1 2010-07-26 Chris Fleizach <cfleizach@apple.com> 2 3 Reviewed by Darin Adler. 4 5 AX: remove intValue() hasIntValue() from AccessibilityObject 6 https://bugs.webkit.org/show_bug.cgi?id=43006 7 8 These methods are very Mac centric. The mac centric code should be moved into the Mac wrapper. 9 10 No new tests, existing tests cover changes to logic. 11 12 * accessibility/AccessibilityObject.cpp: 13 (WebCore::AccessibilityObject::checkboxOrRadioValue): 14 * accessibility/AccessibilityObject.h: 15 (WebCore::): 16 * accessibility/AccessibilityRenderObject.cpp: 17 (WebCore::AccessibilityRenderObject::selectedRadioButton): 18 (WebCore::AccessibilityRenderObject::selectedTabItem): 19 (WebCore::AccessibilityRenderObject::checkboxOrRadioValue): 20 * accessibility/AccessibilityRenderObject.h: 21 * accessibility/mac/AccessibilityObjectWrapper.mm: 22 (-[AccessibilityObjectWrapper accessibilityAttributeValue:]): 23 1 24 2010-07-26 Ryosuke Niwa <rniwa@webkit.org> 2 25 -
trunk/WebCore/accessibility/AccessibilityObject.cpp
r63358 r64084 978 978 } 979 979 980 int AccessibilityObject::intValue() const 981 { 982 if (isPasswordField()) 983 return 0; 984 985 if (isHeading()) 986 return headingLevel(); 987 980 AccessibilityButtonState AccessibilityObject::checkboxOrRadioValue() const 981 { 988 982 // If this is a real checkbox or radio button, AccessibilityRenderObject will handle. 989 983 // If it's an ARIA checkbox or radio, the aria-checked attribute should be used. 990 if (isCheckboxOrRadio()) 991 return equalIgnoringCase(getAttribute(aria_checkedAttr), "true"); 992 993 return 0; 994 } 995 996 bool AccessibilityObject::hasIntValue() const 997 { 998 if (isHeading()) 999 return true; 1000 1001 if (isCheckboxOrRadio()) 1002 return true; 1003 1004 return false; 984 985 const AtomicString& result = getAttribute(aria_checkedAttr); 986 if (equalIgnoringCase(result, "true")) 987 return ButtonStateOn; 988 989 return ButtonStateOff; 1005 990 } 1006 991 -
trunk/WebCore/accessibility/AccessibilityObject.h
r63358 r64084 210 210 DefaultBehavior, 211 211 }; 212 213 enum AccessibilityButtonState { 214 ButtonStateOff = 0, 215 ButtonStateOn, 216 }; 212 217 213 218 struct VisiblePositionRange { … … 328 333 virtual bool canSetExpandedAttribute() const { return false; } 329 334 330 bool hasIntValue() const;331 virtual int intValue() const;332 333 335 // A programmatic way to set a name on an AccessibleObject. 334 336 virtual void setAccessibleName(String&) { } … … 339 341 340 342 virtual int headingLevel() const { return 0; } 343 virtual AccessibilityButtonState checkboxOrRadioValue() const; 341 344 virtual String valueDescription() const { return String(); } 342 345 virtual float valueForRange() const { return 0.0f; } -
trunk/WebCore/accessibility/AccessibilityRenderObject.cpp
r63358 r64084 725 725 for (int i = 0; i < count; ++i) { 726 726 AccessibilityObject* object = m_children[i].get(); 727 if (object->roleValue() == RadioButtonRole && object-> intValue() == 1)727 if (object->roleValue() == RadioButtonRole && object->checkboxOrRadioValue() == ButtonStateOn) 728 728 return object; 729 729 } … … 743 743 for (int i = 0; i < count; ++i) { 744 744 AccessibilityObject* object = m_children[i].get(); 745 if (object->isTabItem() && object->i ntValue() == 1)745 if (object->isTabItem() && object->isChecked()) 746 746 return object; 747 747 } … … 1010 1010 } 1011 1011 1012 int AccessibilityRenderObject::intValue() const 1013 { 1014 if (isCheckboxOrRadio()) 1015 return isChecked() ? 1 : 0; 1016 1017 return AccessibilityObject::intValue(); 1012 AccessibilityButtonState AccessibilityRenderObject::checkboxOrRadioValue() const 1013 { 1014 return isChecked() ? ButtonStateOn : ButtonStateOff; 1018 1015 } 1019 1016 -
trunk/WebCore/accessibility/AccessibilityRenderObject.h
r63358 r64084 118 118 119 119 virtual int headingLevel() const; 120 virtual int intValue() const;120 virtual AccessibilityButtonState checkboxOrRadioValue() const; 121 121 virtual String valueDescription() const; 122 122 virtual float valueForRange() const; -
trunk/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm
r62735 r64084 1516 1516 if (m_object->isProgressIndicator() || m_object->isSlider() || m_object->isScrollbar()) 1517 1517 return [NSNumber numberWithFloat:m_object->valueForRange()]; 1518 if (m_object->hasIntValue()) 1519 return [NSNumber numberWithInt:m_object->intValue()]; 1518 if (m_object->isHeading()) 1519 return [NSNumber numberWithInt:m_object->headingLevel()]; 1520 1521 if (m_object->isCheckboxOrRadio()) { 1522 switch (m_object->checkboxOrRadioValue()) { 1523 case ButtonStateOff: 1524 return [NSNumber numberWithInt:0]; 1525 case ButtonStateOn: 1526 return [NSNumber numberWithInt:1]; 1527 } 1528 } 1520 1529 1521 1530 // radio groups return the selected radio button as the AXValue
Note: See TracChangeset
for help on using the changeset viewer.