Attachment 343670 Details for Bug 187076 – patch

[patch] patch

patch.txt (text/plain), 6.57 KB, created by Nan Wang on 2018-06-26 18:38:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Nan Wang

Created: 2018-06-26 18:38:01 PDT

Size: 6.57 KB

patch

obsolete

>Index: Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
>===================================================================
>--- Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm	(revision 233190)
>+++ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm	(working copy)
>@@ -2058,33 +2058,6 @@ - (NSArray<WebAccessibilityObjectWrapper
>     return convertToNSArray(results);
> }
> 
>-- (void)accessibilityElementDidBecomeFocused
>-{
>-    if (![self _prepareAccessibilityCall])
>-        return;
>-    
>-    // The focused VoiceOver element might be the text inside a link.
>-    // In those cases we should focus on the link itself.
>-    for (AccessibilityObject* object = m_object; object != nil; object = object->parentObject()) {
>-        if (object->roleValue() == AccessibilityRole::WebArea)
>-            break;
>-
>-        if (object->canSetFocusAttribute()) {
>-            // webkit.org/b/162041 Taking focus onto elements inside a details node will cause VO focusing onto random items.
>-            if ([self detailParentForObject:object])
>-                break;
>-            
>-            // webkit.org/b/162322 When a dialog is focusable, allowing focusing onto the dialog node will cause VO cursor jumping
>-            // back and forward while navigating its children.
>-            if ([object->wrapper() accessibilityIsDialog])
>-                break;
>-            
>-            object->setFocused(true);
>-            break;
>-        }
>-    }
>-}
>-
> - (void)accessibilityModifySelection:(TextGranularity)granularity increase:(BOOL)increase
> {
>     if (![self _prepareAccessibilityCall])
>Index: LayoutTests/accessibility/ios-simulator/accessibility-focus-do-not-set-focus-expected.txt
>===================================================================
>--- LayoutTests/accessibility/ios-simulator/accessibility-focus-do-not-set-focus-expected.txt	(nonexistent)
>+++ LayoutTests/accessibility/ios-simulator/accessibility-focus-do-not-set-focus-expected.txt	(working copy)
>@@ -0,0 +1,11 @@
>+focusable
>+This tests that accessibilityElementDidBecomeFocused on elements won't set focus.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS link === document.activeElement is false
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>Index: LayoutTests/accessibility/ios-simulator/accessibility-focus-do-not-set-focus.html
>===================================================================
>--- LayoutTests/accessibility/ios-simulator/accessibility-focus-do-not-set-focus.html	(nonexistent)
>+++ LayoutTests/accessibility/ios-simulator/accessibility-focus-do-not-set-focus.html	(working copy)
>@@ -0,0 +1,31 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body id="body">
>+
>+<a id="link" href="#" tabIndex="0">focusable</a>
>+
>+<p id="description"></p>
>+<div id="console"></div>
>+
>+<script>
>+
>+    description("This tests that accessibilityElementDidBecomeFocused on elements won't set focus.");
>+
>+    if (window.accessibilityController) {
>+    
>+        var link = document.getElementById("link");
>+        var linkAX = accessibilityController.accessibleElementById("link");
>+        
>+        // Test that VO focus onto the dialog's children won't set focus to the dialog itself.
>+        linkAX.assistiveTechnologySimulatedFocus();
>+        shouldBeFalse("link === document.activeElement");
>+    }
>+    
>+</script>
>+
>+<script src="../../resources/js-test-post.js"></script>
>+</body>
>+</html>
>Index: LayoutTests/accessibility/ios-simulator/dom-focus-fires-on-correct-element-expected.txt
>===================================================================
>--- LayoutTests/accessibility/ios-simulator/dom-focus-fires-on-correct-element-expected.txt	(revision 233190)
>+++ LayoutTests/accessibility/ios-simulator/dom-focus-fires-on-correct-element-expected.txt	(nonexistent)
>@@ -1,16 +0,0 @@
>-link1
>-heading1
>-
>-This tests that accessibilityElementDidBecomeFocused will be propagated to the correct parent and cause DOM focus to fire on the correct elements.
>-
>-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>-
>-
>-PASS textInsideLink.description is 'AXLabel: link1'
>-PASS accessibilityController.focusedElement.childAtIndex(0).isEqual(textInsideLink) is true
>-PASS textInsideHeading.description is 'AXLabel: heading1'
>-PASS accessibilityController.focusedElement.childAtIndex(0).isEqual(textInsideHeading) is true
>-PASS successfullyParsed is true
>-
>-TEST COMPLETE
>-
>Index: LayoutTests/accessibility/ios-simulator/dom-focus-fires-on-correct-element.html
>===================================================================
>--- LayoutTests/accessibility/ios-simulator/dom-focus-fires-on-correct-element.html	(revision 233190)
>+++ LayoutTests/accessibility/ios-simulator/dom-focus-fires-on-correct-element.html	(nonexistent)
>@@ -1,52 +0,0 @@
>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>-<html>
>-<head>
>-<script src="../../resources/js-test-pre.js"></script>
>-</head>
>-<body id="body">
>-
>-
>-<a id="link1" href="#">link1</a>
>-
>-<h1 id="heading1" tabindex=0>heading1</h1>
>-
>-<p id="description"></p>
>-<div id="console"></div>
>-
>-<script>
>-
>-    description("This tests that accessibilityElementDidBecomeFocused will be propagated to the correct parent and cause DOM focus to fire on the correct elements.");
>-
>-
>-    if (window.accessibilityController) {
>-
>-        var body = accessibilityController.rootElement;
>-
>-        // Get access to the text inside the link.
>-        var textInsideLink = accessibilityController.accessibleElementById("link1").childAtIndex(0);
>-        shouldBe("textInsideLink.description", "'AXLabel: link1'");
>-
>-        // Simulate VoiceOver focus onto the element.
>-        textInsideLink.assistiveTechnologySimulatedFocus();
>-
>-        // The new focused element should now be the link itself.
>-        shouldBeTrue("accessibilityController.focusedElement.childAtIndex(0).isEqual(textInsideLink)");
>-
>-        // Repeat for text inside link inside heading.
>-
>-        // Get access to the text inside the link.
>-        var textInsideHeading = accessibilityController.accessibleElementById("heading1").childAtIndex(0);
>-        shouldBe("textInsideHeading.description", "'AXLabel: heading1'");
>-
>-        // Simulate VoiceOver focus onto the element.
>-        textInsideHeading.assistiveTechnologySimulatedFocus();
>-
>-        // The new focused element should now be the link itself.
>-        shouldBeTrue("accessibilityController.focusedElement.childAtIndex(0).isEqual(textInsideHeading)");
>-    }
>-
>-</script>
>-
>-<script src="../../resources/js-test-post.js"></script>
>-</body>
>-</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 187076: 343670 | 343671 | 343673 | 343692