Changeset 94134 in webkit

Timestamp:

Aug 30, 2011 5:21:18 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Correctly report selected text range for accessibility APIs for role=textbox
​https://bugs.webkit.org/show_bug.cgi?id=65900

Patch by Alice Boxhall <​aboxhall@chromium.org> on 2011-08-30
Reviewed by Chris Fleizach.

Source/WebCore:

Test: accessibility/textbox-role-reports-selection.html

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::indexForVisiblePosition):
(WebCore::AccessibilityRenderObject::rootEditableElementForPosition):
(WebCore::AccessibilityRenderObject::nodeIsTextControl):
(WebCore::AccessibilityRenderObject::determineAriaRoleAttribute):

• accessibility/AccessibilityRenderObject.h:

LayoutTests:

• accessibility/textbox-role-reports-selection-expected.txt: Added.
• accessibility/textbox-role-reports-selection.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/textbox-role-reports-selection-expected.txt (added)
• LayoutTests/accessibility/textbox-role-reports-selection.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilityRenderObject.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-08-30  Alice Boxhall  <aboxhall@chromium.org>
+
+        Correctly report selected text range for accessibility APIs for role=textbox
+        https://bugs.webkit.org/show_bug.cgi?id=65900
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/textbox-role-reports-selection-expected.txt: Added.
+        * accessibility/textbox-role-reports-selection.html: Added.
+
 2011-08-30  Rachel Blum  <groby@chromium.org>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-08-30  Alice Boxhall  <aboxhall@chromium.org>
+
+        Correctly report selected text range for accessibility APIs for role=textbox
+        https://bugs.webkit.org/show_bug.cgi?id=65900
+
+        Reviewed by Chris Fleizach.
+
+        Test: accessibility/textbox-role-reports-selection.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::indexForVisiblePosition):
+        (WebCore::AccessibilityRenderObject::rootEditableElementForPosition):
+        (WebCore::AccessibilityRenderObject::nodeIsTextControl):
+        (WebCore::AccessibilityRenderObject::determineAriaRoleAttribute):
+        * accessibility/AccessibilityRenderObject.h:
+
 2011-08-30  Rachel Blum  <groby@chromium.org>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -2519 +2519 @@
     
     Position indexPosition = pos.deepEquivalent();
-    if (indexPosition.isNull() || pos.rootEditableElement() != node)
+    if (indexPosition.isNull() || rootEditableElementForPosition(indexPosition) != node)
         return 0;
     
@@ -2534 +2534 @@
     return TextIterator::rangeLength(range.get());
 #endif
+}
+
+Element* AccessibilityRenderObject::rootEditableElementForPosition(const Position& position) const
+{
+    // Find the root editable or pseudo-editable (i.e. having an editable ARIA role) element.
+    Element* result = 0;
+    
+    Element* rootEditableElement = position.rootEditableElement();
+
+    for (Element* e = position.element(); e && e != rootEditableElement; e = e->parentElement()) {
+        if (nodeIsTextControl(e))
+            result = e;
+        if (e->hasTagName(bodyTag))
+            break;
+    }
+
+    if (result)
+        return result;
+
+    return rootEditableElement;
+}
+
+bool AccessibilityRenderObject::nodeIsTextControl(const Node* node) const
+{
+    if (!node)
+        return false;
+
+    const AccessibilityObject* axObjectForNode = axObjectCache()->getOrCreate(node->renderer());
+    if (!axObjectForNode)
+        return false;
+
+    return axObjectForNode->isTextControl();
 }
 
@@ -3027 +3059 @@
     if (role)
         return role;
-    
+
     return UnknownRole;
 }

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -1 @@
-
 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
@@ -248 +247 @@
     virtual VisiblePosition visiblePositionForIndex(int) const;
     virtual int indexForVisiblePosition(const VisiblePosition&) const;
-    
+
     virtual PlainTextRange doAXRangeForLine(unsigned) const;
     virtual PlainTextRange doAXRangeForIndex(unsigned) const;
@@ -281 +280 @@
     String positionalDescriptionForMSAA() const;
     PlainTextRange ariaSelectedTextRange() const;
+    Element* rootEditableElementForPosition(const Position&) const;
+    bool nodeIsTextControl(const Node*) const;
 
     Element* menuElementForMenuButton() const;
@@ -287 +288 @@
     AccessibilityRole determineAriaRoleAttribute() const;
     AccessibilityRole remapAriaRoleDueToParent(AccessibilityRole) const;
-    
+
     bool isTabItemSelected() const;
     void alterSliderValue(bool increase);