Changeset 168042 in webkit

Timestamp:

Apr 30, 2014 1:47:16 PM (10 years ago)

Author:

Chris Fleizach

Message:

AX: Make "contenteditable" regions into AXTextAreas
​https://bugs.webkit.org/show_bug.cgi?id=132379

Reviewed by Mario Sanchez Prada.

Source/WebCore:
Make contenteditable regions into AXTextAreas. This will allow for a more standardized
interface for interaction with assistive technologies.

Test: accessibility/content-editable-as-textarea.html

• accessibility/AccessibilityNodeObject.cpp:

(WebCore::AccessibilityNodeObject::hasContentEditableAttributeSet):

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::contentEditableAttributeIsEnabled):

• accessibility/AccessibilityObject.h:
• accessibility/AccessibilityRenderObject.cpp:

(WebCore::AccessibilityRenderObject::documentBasedSelectedTextRange):
(WebCore::AccessibilityRenderObject::selectedText):
(WebCore::AccessibilityRenderObject::selectedTextRange):
(WebCore::AccessibilityRenderObject::renderObjectIsObservable):
(WebCore::AccessibilityRenderObject::determineAccessibilityRole):
(WebCore::AccessibilityRenderObject::ariaSelectedTextRange): Deleted.

• accessibility/AccessibilityRenderObject.h:

LayoutTests:

• accessibility/content-editable-as-textarea.html: Added.
• platform/mac-mountainlion/accessibility/content-editable-as-textarea-expected.txt: Added.
• platform/mac/accessibility/content-editable-as-textarea-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/content-editable-as-textarea.html (added)
• LayoutTests/platform/mac-mountainlion/accessibility/content-editable-as-textarea-expected.txt (added)
• LayoutTests/platform/mac/accessibility/content-editable-as-textarea-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityNodeObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (5 diffs)
• Source/WebCore/accessibility/AccessibilityRenderObject.h (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-04-30  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Make "contenteditable" regions into AXTextAreas
+        https://bugs.webkit.org/show_bug.cgi?id=132379
+
+        Reviewed by Mario Sanchez Prada.
+
+        * accessibility/content-editable-as-textarea.html: Added.
+        * platform/mac-mountainlion/accessibility/content-editable-as-textarea-expected.txt: Added.
+        * platform/mac/accessibility/content-editable-as-textarea-expected.txt: Added.
+
 2014-04-30  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-04-29  Chris Fleizach  <cfleizach@apple.com>
+
+        AX: Make "contenteditable" regions into AXTextAreas
+        https://bugs.webkit.org/show_bug.cgi?id=132379
+
+        Reviewed by Mario Sanchez Prada.
+
+        Make contenteditable regions into AXTextAreas. This will allow for a more standardized
+        interface for interaction with assistive technologies.
+
+        Test: accessibility/content-editable-as-textarea.html
+
+        * accessibility/AccessibilityNodeObject.cpp:
+        (WebCore::AccessibilityNodeObject::hasContentEditableAttributeSet):
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::contentEditableAttributeIsEnabled):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::documentBasedSelectedTextRange):
+        (WebCore::AccessibilityRenderObject::selectedText):
+        (WebCore::AccessibilityRenderObject::selectedTextRange):
+        (WebCore::AccessibilityRenderObject::renderObjectIsObservable):
+        (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+        (WebCore::AccessibilityRenderObject::ariaSelectedTextRange): Deleted.
+        * accessibility/AccessibilityRenderObject.h:
+
 2014-04-30  Brian J. Burg  <burg@cs.washington.edu>
 

trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp

@@ -2013 +2013 @@
 bool AccessibilityNodeObject::hasContentEditableAttributeSet() const
 {
-    if (!hasAttribute(contenteditableAttr))
-        return false;
-    const AtomicString& contentEditableValue = getAttribute(contenteditableAttr);
-    // Both "true" (case-insensitive) and the empty string count as true.
-    return contentEditableValue.isEmpty() || equalIgnoringCase(contentEditableValue, "true");
+    return contentEditableAttributeIsEnabled(element());
 }
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -1315 +1315 @@
     return obj->document().axObjectCache()->getOrCreate(obj);
 }
-
+    
+bool AccessibilityObject::contentEditableAttributeIsEnabled(Element* element)
+{
+    if (!element)
+        return false;
+    
+    if (!element->hasAttribute(contenteditableAttr))
+        return false;
+    
+    const AtomicString& contentEditableValue = element->fastGetAttribute(contenteditableAttr);
+    // Both "true" (case-insensitive) and the empty string count as true.
+    return contentEditableValue.isEmpty() || equalIgnoringCase(contentEditableValue, "true");
+}
+    
 #if HAVE(ACCESSIBILITY)
 int AccessibilityObject::lineForPosition(const VisiblePosition& visiblePos) const

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -844 +844 @@
     static const String defaultLiveRegionStatusForRole(AccessibilityRole);
     static bool liveRegionStatusIsEnabled(const AtomicString&);
+    static bool contentEditableAttributeIsEnabled(Element*);
     
     bool supportsARIAAttributes() const;

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1421 +1421 @@
 }
 
-PlainTextRange AccessibilityRenderObject::ariaSelectedTextRange() const
+PlainTextRange AccessibilityRenderObject::documentBasedSelectedTextRange() const
 {
     Node* node = m_renderer->node();
@@ -1450 +1450 @@
     }
     
-    if (ariaRoleAttribute() == UnknownRole)
-        return String();
-    
-    return doAXStringForRange(ariaSelectedTextRange());
+    return doAXStringForRange(documentBasedSelectedTextRange());
 }
 
@@ -1484 +1481 @@
     }
     
-    if (ariaRole == UnknownRole)
-        return PlainTextRange();
-    
-    return ariaSelectedTextRange();
+    return documentBasedSelectedTextRange();
 }
 
@@ -2395 +2389 @@
     // AX clients will listen for AXSelectedChildrenChanged on listboxes.
     Node* node = renderer->node();
+    if (!node)
+        return false;
+    
     if (nodeHasRole(node, "listbox") || (renderer->isBoxModelObject() && toRenderBoxModelObject(renderer)->isListBox()))
         return true;
 
     // Textboxes should send out notifications.
-    if (nodeHasRole(node, "textbox"))
+    if (nodeHasRole(node, "textbox") || (node->isElementNode() && contentEditableAttributeIsEnabled(toElement(node))))
         return true;
     
@@ -2511 +2508 @@
 #endif
     }
-
+    
+    if (hasContentEditableAttributeSet())
+        return TextAreaRole;
+    
     if (isFileUploadButton())
         return ButtonRole;

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h

@@ -234 +234 @@
     bool hasTextAlternative() const;
     String positionalDescriptionForMSAA() const;
-    PlainTextRange ariaSelectedTextRange() const;
+    PlainTextRange documentBasedSelectedTextRange() const;
     Element* rootEditableElementForPosition(const Position&) const;
     bool nodeIsTextControl(const Node*) const;