Changeset 210265 in webkit

Timestamp:

Jan 3, 2017 7:07:03 PM (7 years ago)

Author:

n_wang@apple.com

Message:

AX: Focus should jump into modal dialogs when one appears
​https://bugs.webkit.org/show_bug.cgi?id=166670

Reviewed by Chris Fleizach.

Source/WebCore:

Added a timer to let focus jump into a modal dialog if the web
author didn't handle the focus movement.

Test: accessibility/mac/aria-modal-auto-focus.html

• accessibility/AXObjectCache.cpp:

(WebCore::AXObjectCache::AXObjectCache):
(WebCore::AXObjectCache::~AXObjectCache):
(WebCore::firstFocusableChild):
(WebCore::AXObjectCache::focusAriaModalNode):
(WebCore::AXObjectCache::focusAriaModalNodeTimerFired):
(WebCore::AXObjectCache::handleAriaModalChange):

• accessibility/AXObjectCache.h:

(WebCore::AXObjectCache::focusAriaModalNode):

LayoutTests:

• accessibility/mac/aria-modal-auto-focus-expected.txt: Added.
• accessibility/mac/aria-modal-auto-focus.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/mac/aria-modal-auto-focus-expected.txt (added)
• LayoutTests/accessibility/mac/aria-modal-auto-focus.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AXObjectCache.cpp (modified) (5 diffs)
• Source/WebCore/accessibility/AXObjectCache.h (modified) (4 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-01-03  Nan Wang  <n_wang@apple.com>
+
+        AX: Focus should jump into modal dialogs when one appears
+        https://bugs.webkit.org/show_bug.cgi?id=166670
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/mac/aria-modal-auto-focus-expected.txt: Added.
+        * accessibility/mac/aria-modal-auto-focus.html: Added.
+
 2017-01-03  Brian Burg  <bburg@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-01-03  Nan Wang  <n_wang@apple.com>
+
+        AX: Focus should jump into modal dialogs when one appears
+        https://bugs.webkit.org/show_bug.cgi?id=166670
+
+        Reviewed by Chris Fleizach.
+
+        Added a timer to let focus jump into a modal dialog if the web
+        author didn't handle the focus movement.
+
+        Test: accessibility/mac/aria-modal-auto-focus.html
+
+        * accessibility/AXObjectCache.cpp:
+        (WebCore::AXObjectCache::AXObjectCache):
+        (WebCore::AXObjectCache::~AXObjectCache):
+        (WebCore::firstFocusableChild):
+        (WebCore::AXObjectCache::focusAriaModalNode):
+        (WebCore::AXObjectCache::focusAriaModalNodeTimerFired):
+        (WebCore::AXObjectCache::handleAriaModalChange):
+        * accessibility/AXObjectCache.h:
+        (WebCore::AXObjectCache::focusAriaModalNode):
+
 2017-01-03  Andy Estes  <aestes@apple.com>
 

trunk/Source/WebCore/accessibility/AXObjectCache.cpp

@@ -113 +113 @@
 static double AccessibilityPasswordValueChangeNotificationInterval = 0.025;
 static double AccessibilityLiveRegionChangedNotificationInterval = 0.020;
+static double AccessibilityFocusAriaModalNodeNotificationInterval = 0.050;
 
 AccessibilityObjectInclusion AXComputedObjectAttributeCache::getIgnored(AXID id) const
@@ -188 +189 @@
     , m_passwordNotificationPostTimer(*this, &AXObjectCache::passwordNotificationPostTimerFired)
     , m_liveRegionChangedPostTimer(*this, &AXObjectCache::liveRegionChangedNotificationPostTimerFired)
+    , m_focusAriaModalNodeTimer(*this, &AXObjectCache::focusAriaModalNodeTimerFired)
     , m_currentAriaModalNode(nullptr)
 {
@@ -197 +199 @@
     m_notificationPostTimer.stop();
     m_liveRegionChangedPostTimer.stop();
+    m_focusAriaModalNodeTimer.stop();
 
     for (const auto& object : m_objects.values()) {
@@ -1351 +1354 @@
 }
 
+static AccessibilityObject* firstFocusableChild(AccessibilityObject* obj)
+{
+    if (!obj)
+        return nullptr;
+    
+    for (auto* child = obj->firstChild(); child; child = child->nextSibling()) {
+        if (child->canSetFocusAttribute())
+            return child;
+        if (AccessibilityObject* focusable = firstFocusableChild(child))
+            return focusable;
+    }
+    return nullptr;
+}
+
+void AXObjectCache::focusAriaModalNode()
+{
+    if (m_focusAriaModalNodeTimer.isActive())
+        m_focusAriaModalNodeTimer.stop();
+    
+    m_focusAriaModalNodeTimer.startOneShot(AccessibilityFocusAriaModalNodeNotificationInterval);
+}
+
+void AXObjectCache::focusAriaModalNodeTimerFired()
+{
+    if (!m_currentAriaModalNode)
+        return;
+    
+    // Don't set focus if we are already focusing onto some element within
+    // the dialog.
+    if (m_currentAriaModalNode->contains(document().focusedElement()))
+        return;
+    
+    if (AccessibilityObject* currentAriaModalNodeObject = getOrCreate(m_currentAriaModalNode)) {
+        if (AccessibilityObject* focusable = firstFocusableChild(currentAriaModalNodeObject))
+            focusable->setFocused(true);
+    }
+}
+
 void AXObjectCache::handleScrollbarUpdate(ScrollView* view)
 {
@@ -1440 +1481 @@
         updateCurrentAriaModalNode();
     }
+    if (m_currentAriaModalNode)
+        focusAriaModalNode();
+    
     startCachingComputedObjectAttributesUntilTreeMutates();
 }

trunk/Source/WebCore/accessibility/AXObjectCache.h

@@ -303 +303 @@
     void postTextStateChangeNotification(const Position&, const AXTextStateChangeIntent&, const VisibleSelection&);
     void postLiveRegionChangeNotification(AccessibilityObject*);
+    void focusAriaModalNode();
 
     enum AXLoadingEvent {
@@ -383 +384 @@
 
     void liveRegionChangedNotificationPostTimerFired();
+    
+    void focusAriaModalNodeTimerFired();
 
     void postTextStateChangeNotification(AccessibilityObject*, const AXTextStateChangeIntent&, const VisibleSelection&);
@@ -420 +423 @@
     ListHashSet<RefPtr<AccessibilityObject>> m_liveRegionObjectsSet;
     
+    Timer m_focusAriaModalNodeTimer;
     Node* m_currentAriaModalNode;
     ListHashSet<Node*> m_ariaModalNodesSet;
@@ -496 +500 @@
 inline void AXObjectCache::postPlatformNotification(AccessibilityObject*, AXNotification) { }
 inline void AXObjectCache::postLiveRegionChangeNotification(AccessibilityObject*) { }
+inline void AXObjectCache::focusAriaModalNode() { }
 inline RefPtr<Range> AXObjectCache::rangeForNodeContents(Node*) { return nullptr; }
 inline void AXObjectCache::remove(AXID) { }