Changeset 228827 in webkit

Timestamp:

Feb 20, 2018 11:02:25 AM (6 years ago)

Author:

n_wang@apple.com

Message:

AX: AOM: Dispatch accessibleclick event
​https://bugs.webkit.org/show_bug.cgi?id=180898
<rdar://problem/36086710>

Reviewed by Ryosuke Niwa.

Source/WebCore:

Accessibility events.
Spec: ​https://wicg.github.io/aom/spec/phase2.html

This patch allows developers to register event handlers on Elements
for custom accessibility events.

Accessibility events go through a capturing and bubbling phase just
like DOM events, but in the accessibility tree.

Implemented "accessibleclick" event.

Test: accessibility/mac/AOM-events.html

• accessibility/AccessibilityObject.cpp:

(WebCore::AccessibilityObject::press):
(WebCore::AccessibilityObject::dispatchAccessibilityEvent):

• accessibility/AccessibilityObject.h:
• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityPerformAction:]):

• dom/Element.idl:
• dom/EventDispatcher.cpp:

(WebCore::dispatchEventWithType):
(WebCore::EventDispatcher::dispatchEvent):

• dom/EventDispatcher.h:
• dom/EventNames.h:
• dom/EventPath.cpp:

(WebCore::EventPath::EventPath):

• dom/EventPath.h:

Tools:

• WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:

(WTR::AccessibilityUIElement::syncPress):

• WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
• WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:

(WTR::AccessibilityUIElement::syncPress):

LayoutTests:

• accessibility/mac/AOM-events-expected.txt: Added.
• accessibility/mac/AOM-events.html: Added.
• js/dom/dom-static-property-for-in-iteration-expected.txt:
• platform/mac-wk1/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/mac/AOM-events-expected.txt (added)
• LayoutTests/accessibility/mac/AOM-events.html (added)
• LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac-wk1/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/AccessibilityObject.cpp (modified) (3 diffs)
• Source/WebCore/accessibility/AccessibilityObject.h (modified) (2 diffs)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (1 diff)
• Source/WebCore/dom/Element.idl (modified) (1 diff)
• Source/WebCore/dom/EventDispatcher.cpp (modified) (2 diffs)
• Source/WebCore/dom/EventDispatcher.h (modified) (2 diffs)
• Source/WebCore/dom/EventNames.h (modified) (1 diff)
• Source/WebCore/dom/EventPath.cpp (modified) (1 diff)
• Source/WebCore/dom/EventPath.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-02-20  Nan Wang  <n_wang@apple.com>
+
+        AX: AOM: Dispatch accessibleclick event
+        https://bugs.webkit.org/show_bug.cgi?id=180898
+        <rdar://problem/36086710>
+
+        Reviewed by Ryosuke Niwa.
+
+        * accessibility/mac/AOM-events-expected.txt: Added.
+        * accessibility/mac/AOM-events.html: Added.
+        * js/dom/dom-static-property-for-in-iteration-expected.txt:
+        * platform/mac-wk1/TestExpectations:
+
 2018-02-19  Dean Jackson  <dino@apple.com>
 

trunk/LayoutTests/js/dom/dom-static-property-for-in-iteration-expected.txt

@@ -135 +135 @@
 PASS a["innerHTML"] is nerget
 PASS a["outerHTML"] is <a id="foo" href="bar">nerget</a>
+PASS a["onaccessibleclick"] is null
 PASS a["oncopy"] is null
 PASS a["oncut"] is null

trunk/LayoutTests/platform/mac-wk1/TestExpectations

@@ -487 +487 @@
 webkit.org/b/172044 [ Debug ] imported/w3c/web-platform-tests/IndexedDB/open-request-queue.html [ Pass Timeout ]
 
+webkit.org/b/180898 accessibility/mac/AOM-events.html [ Skip ]
+
 # User-installed fonts test infrastructure is not present in WK1
 webkit.org/b/180062 fast/text/user-installed-fonts [ ImageOnlyFailure ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-20  Nan Wang  <n_wang@apple.com>
+
+        AX: AOM: Dispatch accessibleclick event
+        https://bugs.webkit.org/show_bug.cgi?id=180898
+        <rdar://problem/36086710>
+
+        Reviewed by Ryosuke Niwa.
+
+        Accessibility events.
+        Spec: https://wicg.github.io/aom/spec/phase2.html
+
+        This patch allows developers to register event handlers on Elements
+        for custom accessibility events.
+
+        Accessibility events go through a capturing and bubbling phase just
+        like DOM events, but in the accessibility tree.
+
+        Implemented "accessibleclick" event.
+
+        Test: accessibility/mac/AOM-events.html
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::press):
+        (WebCore::AccessibilityObject::dispatchAccessibilityEvent):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityPerformAction:]):
+        * dom/Element.idl:
+        * dom/EventDispatcher.cpp:
+        (WebCore::dispatchEventWithType):
+        (WebCore::EventDispatcher::dispatchEvent):
+        * dom/EventDispatcher.h:
+        * dom/EventNames.h:
+        * dom/EventPath.cpp:
+        (WebCore::EventPath::EventPath):
+        * dom/EventPath.h:
+
 2018-02-20  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebCore/accessibility/AccessibilityObject.cpp

@@ -38 +38 @@
 #include "Editor.h"
 #include "ElementIterator.h"
+#include "Event.h"
+#include "EventDispatcher.h"
 #include "EventHandler.h"
 #include "FloatRect.h"
@@ -992 +994 @@
         pressElement = hitTestElement;
     
+    // dispatch accessibleclick event
+    if (auto* cache = axObjectCache()) {
+        if (auto* pressObject = cache->getOrCreate(pressElement)) {
+            auto event = Event::create(eventNames().accessibleclickEvent, true, true);
+            pressObject->dispatchAccessibilityEvent(event);
+            if (event->defaultPrevented())
+                return true;
+        }
+    }
+    
     UserGestureIndicator gestureIndicator(ProcessingUserGesture, document);
     
@@ -2140 +2152 @@
         return element->attributeWithoutSynchronization(attribute);
     return nullAtom();
+}
+
+void AccessibilityObject::dispatchAccessibilityEvent(Event& event)
+{
+    Vector<Element*> eventPath;
+    for (auto* parentObject = this; parentObject; parentObject = parentObject->parentObject()) {
+        if (auto* parentElement = parentObject->element())
+            eventPath.append(parentElement);
+    }
+    
+    EventDispatcher::dispatchEvent(eventPath, event);
 }
 

trunk/Source/WebCore/accessibility/AccessibilityObject.h

@@ -90 +90 @@
 class ScrollView;
 class Widget;
-
-enum class AXPropertyName;
 
 typedef unsigned AXID;
@@ -897 +895 @@
     const AtomicString& getAttribute(const QualifiedName&) const;
     bool hasTagName(const QualifiedName&) const;
-
-    bool hasProperty(AXPropertyName) const;
-    const String stringValueForProperty(AXPropertyName) const;
-    std::optional<bool> boolValueForProperty(AXPropertyName) const;
-    int intValueForProperty(AXPropertyName) const;
-    unsigned unsignedValueForProperty(AXPropertyName) const;
-    double doubleValueForProperty(AXPropertyName) const;
-    Element* elementValueForProperty(AXPropertyName) const;
+    
+    void dispatchAccessibilityEvent(Event&);
 
     virtual VisiblePositionRange visiblePositionRange() const { return VisiblePositionRange(); }

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

@@ -3578 +3578 @@
         [self accessibilityPerformPressAction];
     
+    // Used in layout tests, so that we don't have to wait for the async press action.
+    else if ([action isEqualToString:@"AXSyncPressAction"])
+        [self _accessibilityPerformPressAction];
+    
     else if ([action isEqualToString:NSAccessibilityShowMenuAction])
         [self accessibilityPerformShowMenuAction];

trunk/Source/WebCore/dom/Element.idl

@@ -141 +141 @@
     // Non standard event handler (https://developer.apple.com/reference/webkitjs/element/1629580-onwebkitplaybacktargetavailabili).
     [NotEnumerable, Conditional=WIRELESS_PLAYBACK_TARGET] attribute EventHandler onwebkitplaybacktargetavailabilitychanged;
+
+    // Accessibility events.
+    [EnabledAtRuntime=AccessibilityObjectModel] attribute EventHandler onaccessibleclick;
 };
 

trunk/Source/WebCore/dom/EventDispatcher.cpp

@@ -178 +178 @@
 }
 
-void EventDispatcher::dispatchEvent(const Vector<EventTarget*>& targets, Event& event)
+template<typename T>
+static void dispatchEventWithType(const Vector<T*>& targets, Event& event)
 {
     ASSERT(targets.size() >= 1);
@@ -191 +192 @@
 }
 
-}
+void EventDispatcher::dispatchEvent(const Vector<EventTarget*>& targets, Event& event)
+{
+    dispatchEventWithType<EventTarget>(targets, event);
+}
+
+void EventDispatcher::dispatchEvent(const Vector<Element*>& targets, Event& event)
+{
+    dispatchEventWithType<Element>(targets, event);
+}
+
+}

trunk/Source/WebCore/dom/EventDispatcher.h

@@ -25 +25 @@
 namespace WebCore {
 
+class Element;
 class Event;
 class EventTarget;
@@ -33 +34 @@
 void dispatchEvent(Node&, Event&);
 void dispatchEvent(const Vector<EventTarget*>&, Event&);
+void dispatchEvent(const Vector<Element*>&, Event&);
 
 void dispatchScopedEvent(Node&, Event&);

trunk/Source/WebCore/dom/EventNames.h

@@ -46 +46 @@
     macro(DOMSubtreeModified) \
     macro(abort) \
+    macro(accessibleclick) \
     macro(activate) \
     macro(active) \

trunk/Source/WebCore/dom/EventPath.cpp

@@ -271 +271 @@
 }
 
+EventPath::EventPath(const Vector<Element*>& targets)
+{
+    for (auto* target : targets) {
+        ASSERT(target);
+        Node* origin = *targets.begin();
+        if (!target->isClosedShadowHidden(*origin))
+            m_path.append(std::make_unique<EventContext>(target, target, origin));
+    }
+}
+
 EventPath::EventPath(const Vector<EventTarget*>& targets)
 {

trunk/Source/WebCore/dom/EventPath.h

@@ -34 +34 @@
     EventPath(Node& origin, Event&);
     explicit EventPath(const Vector<EventTarget*>&);
+    explicit EventPath(const Vector<Element*>&);
 
     bool isEmpty() const { return m_path.isEmpty(); }

trunk/Tools/ChangeLog

@@ +1 @@
+2018-02-20  Nan Wang  <n_wang@apple.com>
+
+        AX: AOM: Dispatch accessibleclick event
+        https://bugs.webkit.org/show_bug.cgi?id=180898
+        <rdar://problem/36086710>
+
+        Reviewed by Ryosuke Niwa.
+
+        * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+        (WTR::AccessibilityUIElement::syncPress):
+        * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+        * WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm:
+        (WTR::AccessibilityUIElement::syncPress):
+
 2018-02-20  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h

@@ -98 +98 @@
     void showMenu();
     void press();
+#if PLATFORM(MAC)
+    void syncPress();
+#else
+    void syncPress() { press(); }
+#endif
 
     // Attributes - platform-independent implementations

trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl

@@ -117 +117 @@
     void decrement();
     void press();
+    void syncPress();
     void showMenu();
 

trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityUIElementMac.mm

@@ -1433 +1433 @@
 }
 
+void AccessibilityUIElement::syncPress()
+{
+    BEGIN_AX_OBJC_EXCEPTIONS
+    [m_element accessibilityPerformAction:@"AXSyncPressAction"];
+    END_AX_OBJC_EXCEPTIONS
+}
+
 void AccessibilityUIElement::setSelectedChild(AccessibilityUIElement* element) const
 {