Changeset 185974 in webkit

Timestamp:

Jun 25, 2015 6:00:21 PM (9 years ago)

Author:

commit-queue@webkit.org

Message:

Bug 146300 AX: AccessibilityObject focus events that don't cause a selection
change can leave m_isSynchronizingSelection set to true
​https://bugs.webkit.org/show_bug.cgi?id=146300

Patch by Doug Russell <​d_russell@apple.com> on 2015-06-25
Reviewed by Chris Fleizach.

Added a clearTextSelectionIntent() convenience function to be used after any
event that can, but isn't guaranteed to result in a selection change. Matches
calls to setTextSelectionIntent() convenience function.
Added support for tests listening for focus change notifications.

Source/WebCore:

Test: platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html

• accessibility/AccessibilityRenderObject.cpp:

(WebCore::clearTextSelectionIntent):
(WebCore::AccessibilityRenderObject::setSelectedTextRange):
(WebCore::AccessibilityRenderObject::setFocused):
(WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange):

• accessibility/mac/AXObjectCacheMac.mm:

(WebCore::AXObjectCache::platformHandleFocusedUIElementChanged):

LayoutTests:

• platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt: Added.
• platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt (added)
• LayoutTests/platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (5 diffs)
• Source/WebCore/accessibility/mac/AXObjectCacheMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2015-06-25  Doug Russell  <d_russell@apple.com>
+
+        Bug 146300 AX: AccessibilityObject focus events that don't cause a selection 
+        change can leave m_isSynchronizingSelection set to true
+        https://bugs.webkit.org/show_bug.cgi?id=146300
+
+        Reviewed by Chris Fleizach.
+
+        Added a clearTextSelectionIntent() convenience function to be used after any
+        event that can, but isn't guaranteed to result in a selection change. Matches
+        calls to setTextSelectionIntent() convenience function.
+        Added support for tests listening for focus change notifications.
+
+        * platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing-expected.txt: Added.
+        * platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html: Added.
+
 2015-06-25  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-25  Doug Russell  <d_russell@apple.com>
+
+        Bug 146300 AX: AccessibilityObject focus events that don't cause a selection 
+        change can leave m_isSynchronizingSelection set to true
+        https://bugs.webkit.org/show_bug.cgi?id=146300
+
+        Reviewed by Chris Fleizach.
+
+        Added a clearTextSelectionIntent() convenience function to be used after any
+        event that can, but isn't guaranteed to result in a selection change. Matches
+        calls to setTextSelectionIntent() convenience function.
+        Added support for tests listening for focus change notifications.
+
+        Test: platform/mac/accessibility/focus-setting-selection-syncronizing-not-clearing.html
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::clearTextSelectionIntent):
+        (WebCore::AccessibilityRenderObject::setSelectedTextRange):
+        (WebCore::AccessibilityRenderObject::setFocused):
+        (WebCore::AccessibilityRenderObject::setSelectedVisiblePositionRange):
+        * accessibility/mac/AXObjectCacheMac.mm:
+        (WebCore::AXObjectCache::platformHandleFocusedUIElementChanged):
+
 2015-06-25  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1499 +1499 @@
 }
 
-static void setTextSelectionIntent(const AccessibilityRenderObject& renderObject, AXTextStateChangeType type)
-{
-    AXObjectCache* cache = renderObject.axObjectCache();
+static void setTextSelectionIntent(AXObjectCache* cache, AXTextStateChangeType type)
+{
     if (!cache)
         return;
@@ -1509 +1508 @@
 }
 
+static void clearTextSelectionIntent(AXObjectCache* cache)
+{
+    if (!cache)
+        return;
+    cache->setTextSelectionIntent(AXTextStateChangeIntent());
+    cache->setIsSynchronizingSelection(false);
+}
+
 void AccessibilityRenderObject::setSelectedTextRange(const PlainTextRange& range)
 {
     if (isNativeTextControl()) {
-        setTextSelectionIntent(*this, range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
+        setTextSelectionIntent(axObjectCache(), range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
         HTMLTextFormControlElement& textControl = downcast<RenderTextControl>(*m_renderer).textFormControlElement();
         textControl.setSelectionRange(range.start, range.start + range.length);
+        clearTextSelectionIntent(axObjectCache());
         return;
     }
@@ -1520 +1528 @@
     Node* node = m_renderer->node();
     VisibleSelection newSelection(Position(node, range.start, Position::PositionIsOffsetInAnchor), Position(node, range.start + range.length, Position::PositionIsOffsetInAnchor), DOWNSTREAM);
-    setTextSelectionIntent(*this, range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
+    setTextSelectionIntent(axObjectCache(), range.length ? AXTextStateChangeTypeSelectionExtend : AXTextStateChangeTypeSelectionMove);
     m_renderer->frame().selection().setSelection(newSelection, FrameSelection::defaultSetSelectionOptions());
+    clearTextSelectionIntent(axObjectCache());
 }
 
@@ -1675 +1684 @@
         document->setFocusedElement(nullptr);
 
-    setTextSelectionIntent(*this, AXTextStateChangeTypeSelectionMove);
+    setTextSelectionIntent(axObjectCache(), AXTextStateChangeTypeSelectionMove);
     downcast<Element>(*node).focus();
+    clearTextSelectionIntent(axObjectCache());
 }
 
@@ -1990 +2000 @@
     // make selection and tell the document to use it. if it's zero length, then move to that position
     if (range.start == range.end) {
-        setTextSelectionIntent(*this, AXTextStateChangeTypeSelectionMove);
+        setTextSelectionIntent(axObjectCache(), AXTextStateChangeTypeSelectionMove);
         m_renderer->frame().selection().moveTo(range.start, UserTriggered);
+        clearTextSelectionIntent(axObjectCache());
     }
     else {
-        setTextSelectionIntent(*this, AXTextStateChangeTypeSelectionExtend);
+        setTextSelectionIntent(axObjectCache(), AXTextStateChangeTypeSelectionExtend);
         VisibleSelection newSelection = VisibleSelection(range.start, range.end);
         m_renderer->frame().selection().setSelection(newSelection, FrameSelection::defaultSetSelectionOptions());
+        clearTextSelectionIntent(axObjectCache());
     }
 }

trunk/Source/WebCore/accessibility/mac/AXObjectCacheMac.mm

@@ -334 +334 @@
 {
     wkAccessibilityHandleFocusChanged();
+    // AXFocusChanged is a test specific notification name and not something a real AT will be listening for
+    if (UNLIKELY(axShouldRepostNotificationsForTests))
+        [rootWebArea()->wrapper() accessibilityPostedNotification:@"AXFocusChanged" userInfo:nil];
 }