Title: [229440] tags/Safari-606.1.8
- Revision
- 229440
- Author
- [email protected]
- Date
- 2018-03-08 16:18:34 -0800 (Thu, 08 Mar 2018)
Log Message
Revert r229344. rdar://problem/38188685
Modified Paths
Diff
Modified: tags/Safari-606.1.8/LayoutTests/ChangeLog (229439 => 229440)
--- tags/Safari-606.1.8/LayoutTests/ChangeLog 2018-03-08 23:27:45 UTC (rev 229439)
+++ tags/Safari-606.1.8/LayoutTests/ChangeLog 2018-03-09 00:18:34 UTC (rev 229440)
@@ -1,3 +1,7 @@
+2018-03-08 Jason Marcell <[email protected]>
+
+ Revert r229344. rdar://problem/38188685
+
2018-03-08 Kocsen Chung <[email protected]>
Revert r229310. rdar://problem/37764380
Modified: tags/Safari-606.1.8/LayoutTests/accessibility/mac/AOM-events-all-expected.txt (229439 => 229440)
--- tags/Safari-606.1.8/LayoutTests/accessibility/mac/AOM-events-all-expected.txt 2018-03-08 23:27:45 UTC (rev 229439)
+++ tags/Safari-606.1.8/LayoutTests/accessibility/mac/AOM-events-all-expected.txt 2018-03-09 00:18:34 UTC (rev 229440)
@@ -1,6 +1,4 @@
- button
-option 1
-
+ button
This tests all accessibility events.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
Modified: tags/Safari-606.1.8/LayoutTests/accessibility/mac/AOM-events-all.html (229439 => 229440)
--- tags/Safari-606.1.8/LayoutTests/accessibility/mac/AOM-events-all.html 2018-03-08 23:27:45 UTC (rev 229439)
+++ tags/Safari-606.1.8/LayoutTests/accessibility/mac/AOM-events-all.html 2018-03-09 00:18:34 UTC (rev 229440)
@@ -8,11 +8,6 @@
<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">
<option id="option">Option 1</option>
<option>Option 2</option>
@@ -78,8 +73,8 @@
function testShowContextMenu() {
debug("\nTest accessiblecontextmenu");
- node = document.getElementById("combo");
- axNode = accessibilityController.accessibleElementById("combo");
+ node = document.getElementById("button");
+ axNode = accessibilityController.accessibleElementById("button");
node._onaccessiblecontextmenu_ = function() {
debug("received accessiblecontextmenu event");
Modified: tags/Safari-606.1.8/Source/WebCore/ChangeLog (229439 => 229440)
--- tags/Safari-606.1.8/Source/WebCore/ChangeLog 2018-03-08 23:27:45 UTC (rev 229439)
+++ tags/Safari-606.1.8/Source/WebCore/ChangeLog 2018-03-09 00:18:34 UTC (rev 229440)
@@ -1,3 +1,7 @@
+2018-03-08 Jason Marcell <[email protected]>
+
+ Revert r229344. rdar://problem/38188685
+
2018-03-08 Kocsen Chung <[email protected]>
Revert r229310. rdar://problem/37764380
Modified: tags/Safari-606.1.8/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (229439 => 229440)
--- tags/Safari-606.1.8/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2018-03-08 23:27:45 UTC (rev 229439)
+++ tags/Safari-606.1.8/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2018-03-09 00:18:34 UTC (rev 229440)
@@ -3521,9 +3521,6 @@
- (void)accessibilityPerformShowMenuAction
{
- if (m_object && m_object->dispatchAccessibilityEventWithType(AccessibilityEventType::ContextMenu))
- return;
-
if (m_object->roleValue() == AccessibilityRole::ComboBox)
m_object->setIsExpanded(true);
else {
@@ -3542,6 +3539,9 @@
if (!page)
return;
+ if (m_object->dispatchAccessibilityEventWithType(AccessibilityEventType::ContextMenu))
+ return;
+
IntRect rect = snappedIntRect(m_object->elementRect());
FrameView* frameView = m_object->documentFrameView();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
