Changeset 229344 in webkit

Timestamp:

Mar 6, 2018 2:49:27 PM (6 years ago)

Author:

n_wang@apple.com

Message:

AX: Flaky test after r229310
​https://bugs.webkit.org/show_bug.cgi?id=183376
<rdar://problem/38188685>

Reviewed by Chris Fleizach.

Source/WebCore:

The test that forces the context menu to show sometimes locks up
the test runner. Also, we missed a case where calling AXShowMenu
action on a combobox is not dispatching the accessibility event.

Using the combobox example to test the event dispatching in order to
avoid the test hang.

• accessibility/mac/WebAccessibilityObjectWrapperMac.mm:

(-[WebAccessibilityObjectWrapper accessibilityPerformShowMenuAction]):
(-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):

LayoutTests:

• accessibility/mac/AOM-events-all-expected.txt:
• accessibility/mac/AOM-events-all.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/accessibility/mac/AOM-events-all-expected.txt (modified) (1 diff)
• LayoutTests/accessibility/mac/AOM-events-all.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-03-06  Nan Wang  <n_wang@apple.com>
+
+        AX: Flaky test after r229310
+        https://bugs.webkit.org/show_bug.cgi?id=183376
+        <rdar://problem/38188685>
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/mac/AOM-events-all-expected.txt:
+        * accessibility/mac/AOM-events-all.html:
+
 2018-03-06  Chris Dumez  <cdumez@apple.com>
 

trunk/LayoutTests/accessibility/mac/AOM-events-all-expected.txt

@@ -1 @@
-  button  
+  button
+option 1
+
 This tests all accessibility events.
 

trunk/LayoutTests/accessibility/mac/AOM-events-all.html

@@ -8 +8 @@
 <input type="text" id="input">
 <button id="button">button</button>
+
+<div id="combo" tabindex=0 role="combobox" aria-expanded="false" aria-label="Test">
+<div role="listbox">
+<div role="option">option 1</div>
+</div></div>
 
 <select id="group" multiple="multiple">
@@ -74 +79 @@
         function testShowContextMenu() {
             debug("\nTest accessiblecontextmenu");
-            node = document.getElementById("button");
-            axNode = accessibilityController.accessibleElementById("button");
+            node = document.getElementById("combo");
+            axNode = accessibilityController.accessibleElementById("combo");
 
             node.onaccessiblecontextmenu = function() {

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-03-06  Nan Wang  <n_wang@apple.com>
+
+        AX: Flaky test after r229310
+        https://bugs.webkit.org/show_bug.cgi?id=183376
+        <rdar://problem/38188685>
+
+        Reviewed by Chris Fleizach.
+
+        The test that forces the context menu to show sometimes locks up 
+        the test runner. Also, we missed a case where calling AXShowMenu
+        action on a combobox is not dispatching the accessibility event.
+
+        Using the combobox example to test the event dispatching in order to
+        avoid the test hang.
+
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityPerformShowMenuAction]):
+        (-[WebAccessibilityObjectWrapper accessibilityShowContextMenu]):
+
 2018-03-06  Chris Dumez  <cdumez@apple.com>
 

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

@@ -3522 +3522 @@
 - (void)accessibilityPerformShowMenuAction
 {
+    if (m_object && m_object->dispatchAccessibilityEventWithType(AccessibilityEventType::ContextMenu))
+        return;
+    
     if (m_object->roleValue() == AccessibilityRole::ComboBox)
         m_object->setIsExpanded(true);
@@ -3538 +3541 @@
     Page* page = m_object->page();
     if (!page)
-        return;
-    
-    if (m_object->dispatchAccessibilityEventWithType(AccessibilityEventType::ContextMenu))
         return;