Changeset 214112 in webkit

Timestamp:

Mar 17, 2017, 12:48:36 PM (8 years ago)

Author:

n_wang@apple.com

Message:

AX: VoiceOver no longer works corectly with editable text in the web
​https://bugs.webkit.org/show_bug.cgi?id=169801

Reviewed by Chris Fleizach.

Source/WebCore:

The issue is that since we are entering text controls when getting the text marker,
the end text marker of the input tag might associate to the placeholder div instead of
the input tag itself.
Fixed the issue by checking the shadow elements using shadowHost() instead of isShadowRoot().
Also, only enter text controls when navigating by characters/indexes, so that both Mac and
iOS will get the correct text marker ranges for shadow host elements.

Tests: accessibility/ios-simulator/element-text-range-for-text-control.html

accessibility/mac/text-markers-for-input-with-placeholder.html

• accessibility/AXObjectCache.cpp:

(WebCore::AXObjectCache::traverseToOffsetInRange):
(WebCore::AXObjectCache::startOrEndCharacterOffsetForRange):
(WebCore::AXObjectCache::characterOffsetForIndex):

• accessibility/AXObjectCache.h:

LayoutTests:

• accessibility/ios-simulator/element-text-range-for-text-control-expected.txt: Added.
• accessibility/ios-simulator/element-text-range-for-text-control.html: Added.
• accessibility/mac/text-markers-for-input-with-placeholder-expected.txt: Added.
• accessibility/mac/text-markers-for-input-with-placeholder.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/ios-simulator/element-text-range-for-text-control-expected.txt (added)
• LayoutTests/accessibility/ios-simulator/element-text-range-for-text-control.html (added)
• LayoutTests/accessibility/mac/text-markers-for-input-with-placeholder-expected.txt (added)
• LayoutTests/accessibility/mac/text-markers-for-input-with-placeholder.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AXObjectCache.cpp (modified) (6 diffs)
• Source/WebCore/accessibility/AXObjectCache.h (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-17  Nan Wang  <n_wang@apple.com>
+
+        AX: VoiceOver no longer works corectly with editable text in the web
+        https://bugs.webkit.org/show_bug.cgi?id=169801
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/ios-simulator/element-text-range-for-text-control-expected.txt: Added.
+        * accessibility/ios-simulator/element-text-range-for-text-control.html: Added.
+        * accessibility/mac/text-markers-for-input-with-placeholder-expected.txt: Added.
+        * accessibility/mac/text-markers-for-input-with-placeholder.html: Added.
+
 2017-03-17  Dave Hyatt  <hyatt@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-17  Nan Wang  <n_wang@apple.com>
+
+        AX: VoiceOver no longer works corectly with editable text in the web
+        https://bugs.webkit.org/show_bug.cgi?id=169801
+
+        Reviewed by Chris Fleizach.
+
+        The issue is that since we are entering text controls when getting the text marker,
+        the end text marker of the input tag might associate to the placeholder div instead of 
+        the input tag itself. 
+        Fixed the issue by checking the shadow elements using shadowHost() instead of isShadowRoot().
+        Also, only enter text controls when navigating by characters/indexes, so that both Mac and
+        iOS will get the correct text marker ranges for shadow host elements.
+
+        Tests: accessibility/ios-simulator/element-text-range-for-text-control.html
+               accessibility/mac/text-markers-for-input-with-placeholder.html
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::traverseToOffsetInRange):
+        (WebCore::AXObjectCache::startOrEndCharacterOffsetForRange):
+        (WebCore::AXObjectCache::characterOffsetForIndex):
+        * accessibility/AXObjectCache.h:
+
 2017-03-17  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -1556 +1556 @@
     bool toNodeEnd = option & TraverseOptionToNodeEnd;
     bool validateOffset = option & TraverseOptionValidateOffset;
+    bool doNotEnterTextControls = option & TraverseOptionDoNotEnterTextControls;
     
     int offsetInCharacter = 0;
@@ -1565 +1566 @@
     int lastStartOffset = 0;
     
-    TextIterator iterator(range.get(), TextIteratorEntersTextControls);
+    TextIterator iterator(range.get(), doNotEnterTextControls ? TextIteratorDefaultBehavior : TextIteratorEntersTextControls);
     
     // When the range has zero length, there might be replaced node or brTag that we need to increment the characterOffset.
@@ -1618 +1619 @@
                         currentNode = childNode;
                         hasReplacedNodeOrBR = true;
-                    } else if (currentNode->isShadowRoot()) {
+                    } else if (Element *shadowHost = currentNode->shadowHost()) {
                         // Since we are entering text controls, we should set the currentNode
                         // to be the shadow host when there's no content.
-                        currentNode = currentNode->shadowHost();
-                        continue;
+                        if (nodeIsTextControl(shadowHost)) {
+                            currentNode = currentNode->shadowHost();
+                            continue;
+                        }
                     } else if (currentNode != previousNode) {
                         // We should set the start offset and length for the current node in case this is the last iteration.
@@ -1838 +1841 @@
 }
 
-CharacterOffset AXObjectCache::startOrEndCharacterOffsetForRange(RefPtr<Range> range, bool isStart)
+CharacterOffset AXObjectCache::startOrEndCharacterOffsetForRange(RefPtr<Range> range, bool isStart, bool enterTextControls)
 {
     if (!range)
@@ -1866 +1869 @@
     }
     
-    return traverseToOffsetInRange(WTFMove(copyRange), offset, isStart ? TraverseOptionDefault : TraverseOptionToNodeEnd, stayWithinRange);
+    TraverseOption options = isStart ? TraverseOptionDefault : TraverseOptionToNodeEnd;
+    if (!enterTextControls)
+        options = static_cast<TraverseOption>(options | TraverseOptionDoNotEnterTextControls);
+    return traverseToOffsetInRange(WTFMove(copyRange), offset, options, stayWithinRange);
 }
 
@@ -2617 +2623 @@
     
     RefPtr<Range> range = obj->elementRange();
-    CharacterOffset start = startOrEndCharacterOffsetForRange(range, true);
-    CharacterOffset end = startOrEndCharacterOffsetForRange(range, false);
+    CharacterOffset start = startOrEndCharacterOffsetForRange(range, true, true);
+    CharacterOffset end = startOrEndCharacterOffsetForRange(range, false, true);
     CharacterOffset result = start;
     for (int i = 0; i < index; i++) {

trunk/Source/WebCore/accessibility/AXObjectCache.h

@@ -223 +223 @@
     CharacterOffset previousCharacterOffset(const CharacterOffset&, bool ignorePreviousNodeEnd = true);
     void startOrEndTextMarkerDataForRange(TextMarkerData&, RefPtr<Range>, bool);
-    CharacterOffset startOrEndCharacterOffsetForRange(RefPtr<Range>, bool);
+    CharacterOffset startOrEndCharacterOffsetForRange(RefPtr<Range>, bool, bool enterTextControls = false);
     AccessibilityObject* accessibilityObjectForTextMarkerData(TextMarkerData&);
     RefPtr<Range> rangeForUnorderedCharacterOffsets(const CharacterOffset&, const CharacterOffset&);
@@ -352 +352 @@
     
     // CharacterOffset functions.
-    enum TraverseOption { TraverseOptionDefault = 1 << 0, TraverseOptionToNodeEnd = 1 << 1, TraverseOptionIncludeStart = 1 << 2, TraverseOptionValidateOffset = 1 << 3 };
+    enum TraverseOption { TraverseOptionDefault = 1 << 0, TraverseOptionToNodeEnd = 1 << 1, TraverseOptionIncludeStart = 1 << 2, TraverseOptionValidateOffset = 1 << 3, TraverseOptionDoNotEnterTextControls = 1 << 4 };
     Node* nextNode(Node*) const;
     Node* previousNode(Node*) const;