Changeset 64084 in webkit

Timestamp:

Jul 26, 2010 3:49:18 PM (14 years ago)

Author:

Chris Fleizach

Message:

AX: remove intValue() hasIntValue() from AccessibilityObject
​https://bugs.webkit.org/show_bug.cgi?id=43006

Reviewed by Darin Adler.

These methods are very Mac centric. The mac centric code should be moved into the Mac wrapper.

No new tests, existing tests cover changes to logic.

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::checkboxOrRadioValue):

• accessibility/AccessibilityObject.h:

(WebCore::):

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::selectedRadioButton):
(WebCore::AccessibilityRenderObject::selectedTabItem):
(WebCore::AccessibilityRenderObject::checkboxOrRadioValue):

• accessibility/AccessibilityRenderObject.h:
• accessibility/mac/AccessibilityObjectWrapper.mm:

(-[AccessibilityObjectWrapper accessibilityAttributeValue:]):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• accessibility/AccessibilityObject.cpp (modified) (1 diff)
• accessibility/AccessibilityObject.h (modified) (3 diffs)
• accessibility/AccessibilityRenderObject.cpp (modified) (3 diffs)
• accessibility/AccessibilityRenderObject.h (modified) (1 diff)
• accessibility/mac/AccessibilityObjectWrapper.mm (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-07-26  Chris Fleizach  <cfleizach@apple.com>
+
+        Reviewed by Darin Adler.
+
+        AX: remove intValue() hasIntValue() from AccessibilityObject
+        https://bugs.webkit.org/show_bug.cgi?id=43006
+
+        These methods are very Mac centric. The mac centric code should be moved into the Mac wrapper.
+
+        No new tests, existing tests cover changes to logic.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::checkboxOrRadioValue):
+        * accessibility/AccessibilityObject.h:
+        (WebCore::):
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::selectedRadioButton):
+        (WebCore::AccessibilityRenderObject::selectedTabItem):
+        (WebCore::AccessibilityRenderObject::checkboxOrRadioValue):
+        * accessibility/AccessibilityRenderObject.h:
+        * accessibility/mac/AccessibilityObjectWrapper.mm:
+        (-[AccessibilityObjectWrapper accessibilityAttributeValue:]):
+
 2010-07-26  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/WebCore/accessibility/AccessibilityObject.cpp

@@ -978 +978 @@
 }
     
-int AccessibilityObject::intValue() const
-{
-    if (isPasswordField())
-        return 0;
-    
-    if (isHeading())
-        return headingLevel();
-    
+AccessibilityButtonState AccessibilityObject::checkboxOrRadioValue() const
+{
     // If this is a real checkbox or radio button, AccessibilityRenderObject will handle.
     // If it's an ARIA checkbox or radio, the aria-checked attribute should be used.
-    if (isCheckboxOrRadio())
-        return equalIgnoringCase(getAttribute(aria_checkedAttr), "true");
-    
-    return 0;
-}
-
-bool AccessibilityObject::hasIntValue() const
-{
-    if (isHeading())
-        return true;
-    
-    if (isCheckboxOrRadio())
-        return true;
-    
-    return false;
+
+    const AtomicString& result = getAttribute(aria_checkedAttr);
+    if (equalIgnoringCase(result, "true"))
+        return ButtonStateOn;
+    
+    return ButtonStateOff;
 }
     

trunk/WebCore/accessibility/AccessibilityObject.h

@@ -210 +210 @@
     DefaultBehavior,
 };
+    
+enum AccessibilityButtonState {
+    ButtonStateOff = 0,
+    ButtonStateOn, 
+};
 
 struct VisiblePositionRange {
@@ -328 +333 @@
     virtual bool canSetExpandedAttribute() const { return false; }
     
-    bool hasIntValue() const;
-    virtual int intValue() const;
-    
     // A programmatic way to set a name on an AccessibleObject.
     virtual void setAccessibleName(String&) { }
@@ -339 +341 @@
 
     virtual int headingLevel() const { return 0; }
+    virtual AccessibilityButtonState checkboxOrRadioValue() const;
     virtual String valueDescription() const { return String(); }
     virtual float valueForRange() const { return 0.0f; }

trunk/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -725 +725 @@
     for (int i = 0; i < count; ++i) {
         AccessibilityObject* object = m_children[i].get();
-        if (object->roleValue() == RadioButtonRole && object->intValue() == 1)
+        if (object->roleValue() == RadioButtonRole && object->checkboxOrRadioValue() == ButtonStateOn)
             return object;
     }
@@ -743 +743 @@
     for (int i = 0; i < count; ++i) {
         AccessibilityObject* object = m_children[i].get();
-        if (object->isTabItem() && object->intValue() == 1)
+        if (object->isTabItem() && object->isChecked())
             return object;
     }
@@ -1010 +1010 @@
 }    
     
-int AccessibilityRenderObject::intValue() const
-{
-    if (isCheckboxOrRadio())
-        return isChecked() ? 1 : 0;
-
-    return AccessibilityObject::intValue();
+AccessibilityButtonState AccessibilityRenderObject::checkboxOrRadioValue() const
+{
+    return isChecked() ? ButtonStateOn : ButtonStateOff;
 }
 

trunk/WebCore/accessibility/AccessibilityRenderObject.h

@@ -118 +118 @@
     
     virtual int headingLevel() const;
-    virtual int intValue() const;
+    virtual AccessibilityButtonState checkboxOrRadioValue() const;
     virtual String valueDescription() const;
     virtual float valueForRange() const;

trunk/WebCore/accessibility/mac/AccessibilityObjectWrapper.mm

@@ -1516 +1516 @@
         if (m_object->isProgressIndicator() || m_object->isSlider() || m_object->isScrollbar())
             return [NSNumber numberWithFloat:m_object->valueForRange()];
-        if (m_object->hasIntValue())
-            return [NSNumber numberWithInt:m_object->intValue()];
+        if (m_object->isHeading())
+            return [NSNumber numberWithInt:m_object->headingLevel()];
+        
+        if (m_object->isCheckboxOrRadio()) {
+            switch (m_object->checkboxOrRadioValue()) {
+            case ButtonStateOff:
+                return [NSNumber numberWithInt:0];
+            case ButtonStateOn:
+                return [NSNumber numberWithInt:1];
+            }
+        }
 
         // radio groups return the selected radio button as the AXValue