Attachment 341558 Details for Bug 186084 – patch

[patch] patch

patch (text/plain), 8.78 KB, created by chris fleizach on 2018-05-29 22:52:37 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2018-05-29 22:52:37 PDT

Size: 8.78 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 232286)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,24 @@
>+2018-05-29  Chris Fleizach  <cfleizach@apple.com>
>+
>+        AX: Expose link rel type to voiceover
>+        https://bugs.webkit.org/show_bug.cgi?id=186084
>+        <rdar://problem/40640871>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Make the link rel attribute available to accessibility clients.
>+
>+        Test: accessibility/mac/linkrel.html
>+
>+        * accessibility/AccessibilityObject.cpp:
>+        (WebCore::AccessibilityObject::linkRelValue const):
>+        * accessibility/AccessibilityObject.h:
>+        * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
>+        (-[WebAccessibilityObjectWrapper accessibilityLinkRelationshipType]):
>+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
>+        (-[WebAccessibilityObjectWrapper accessibilityAttributeNames]):
>+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
>+
> 2018-05-29  Nan Wang  <n_wang@apple.com>
> 
>         AX: macOS VoiceOver doesn't announce when details element is expanded when using role group
>Index: Source/WebCore/accessibility/AccessibilityObject.cpp
>===================================================================
>--- Source/WebCore/accessibility/AccessibilityObject.cpp	(revision 232197)
>+++ Source/WebCore/accessibility/AccessibilityObject.cpp	(working copy)
>@@ -2527,6 +2527,11 @@
>     return getAttribute(datetimeAttr);
> }
>     
>+const AtomicString& AccessibilityObject::linkRelValue() const
>+{
>+    return getAttribute(relAttr);
>+}
>+    
> const String AccessibilityObject::keyShortcutsValue() const
> {
>     return getAttribute(aria_keyshortcutsAttr);
>Index: Source/WebCore/accessibility/AccessibilityObject.h
>===================================================================
>--- Source/WebCore/accessibility/AccessibilityObject.h	(revision 232197)
>+++ Source/WebCore/accessibility/AccessibilityObject.h	(working copy)
>@@ -708,6 +708,7 @@
>     virtual bool canvasHasFallbackContent() const { return false; }
>     bool supportsRangeValue() const;
>     const AtomicString& identifierAttribute() const;
>+    const AtomicString& linkRelValue() const;
>     void classList(Vector<String>&) const;
>     virtual String roleDescription() const;
>     AccessibilityCurrentState currentState() const;
>Index: Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
>===================================================================
>--- Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm	(revision 232197)
>+++ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm	(working copy)
>@@ -1823,6 +1823,14 @@
>     return m_object->canSetValueAttribute();
> }
> 
>+- (NSString *)accessibilityLinkRelationshipType
>+{
>+    if (![self _prepareAccessibilityCall])
>+        return NO;
>+    
>+    return m_object->linkRelValue();
>+}
>+
> - (BOOL)accessibilityRequired
> {
>     if (![self _prepareAccessibilityCall])
>Index: Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm
>===================================================================
>--- Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm	(revision 232197)
>+++ Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm	(working copy)
>@@ -408,6 +408,10 @@
> #define NSAccessibilityHighestEditableAncestorAttribute @"AXHighestEditableAncestor"
> #endif
> 
>+#ifndef NSAccessibilityLinkRelationshipTypeAttribute
>+#define NSAccessibilityLinkRelationshipTypeAttribute @"AXLinkRelationshipType"
>+#endif
>+
> extern "C" AXUIElementRef NSAccessibilityCreateAXUIElementRef(id element);
> 
> @implementation WebAccessibilityObjectWrapper
>@@ -1329,6 +1333,7 @@
>         tempArray = [[NSMutableArray alloc] initWithArray:attributes];
>         [tempArray addObject:NSAccessibilityURLAttribute];
>         [tempArray addObject:NSAccessibilityAccessKeyAttribute];
>+        [tempArray addObject:NSAccessibilityLinkRelationshipTypeAttribute];
>         anchorAttrs = [[NSArray alloc] initWithArray:tempArray];
>         [tempArray release];
>     }
>@@ -2736,6 +2741,9 @@
>         return accessKey;
>     }
>     
>+    if ([attributeName isEqualToString:NSAccessibilityLinkRelationshipTypeAttribute])
>+        return m_object->linkRelValue();
>+    
>     if ([attributeName isEqualToString:NSAccessibilityTabsAttribute]) {
>         if (m_object->isTabList()) {
>             AccessibilityObject::AccessibilityChildrenVector tabsChildren;
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 232197)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,17 @@
>+2018-05-29  Chris Fleizach  <cfleizach@apple.com>
>+
>+        AX: Expose link rel type to voiceover
>+        https://bugs.webkit.org/show_bug.cgi?id=186084
>+        <rdar://problem/40640871>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * accessibility/image-link-expected.txt:
>+        * accessibility/image-map2-expected.txt:
>+        * accessibility/mac/document-links-expected.txt:
>+        * accessibility/mac/linkrel-expected.txt: Added.
>+        * accessibility/mac/linkrel.html: Added.
>+
> 2018-05-25  Antoine Quint  <graouts@apple.com>
> 
>         [Web Animations] WebAnimation objects never get destroyed
>Index: LayoutTests/accessibility/image-link-expected.txt
>===================================================================
>--- LayoutTests/accessibility/image-link-expected.txt	(revision 232197)
>+++ LayoutTests/accessibility/image-link-expected.txt	(working copy)
>@@ -32,6 +32,7 @@
> AXHighestEditableAncestor: (null)
> AXURL: http://www.wowhead.com/?item=33924
> AXAccessKey: (null)
>+AXLinkRelationshipType: 
> AXElementBusy: 0
> 
> 
>@@ -65,6 +66,7 @@
> AXHighestEditableAncestor: (null)
> AXURL: LayoutTests/accessibility/resources/cake.png
> AXAccessKey: (null)
>+AXLinkRelationshipType: 
> AXElementBusy: 0
> 
> 
>Index: LayoutTests/accessibility/image-map2-expected.txt
>===================================================================
>--- LayoutTests/accessibility/image-map2-expected.txt	(revision 232197)
>+++ LayoutTests/accessibility/image-map2-expected.txt	(working copy)
>@@ -59,6 +59,7 @@
> AXHighestEditableAncestor: (null)
> AXURL: http://www.apple.com/
> AXAccessKey: (null)
>+AXLinkRelationshipType: 
> AXElementBusy: 0
> AXPath: <AXLink>
> 
>@@ -92,6 +93,7 @@
> AXHighestEditableAncestor: (null)
> AXURL: http://www.apple.com/
> AXAccessKey: (null)
>+AXLinkRelationshipType: 
> AXElementBusy: 0
> AXPath: <AXLink>
> 
>Index: LayoutTests/accessibility/mac/document-links-expected.txt
>===================================================================
>--- LayoutTests/accessibility/mac/document-links-expected.txt	(revision 232197)
>+++ LayoutTests/accessibility/mac/document-links-expected.txt	(working copy)
>@@ -29,6 +29,7 @@
> AXHighestEditableAncestor: (null)
> AXURL: http://www.apple.com/
> AXAccessKey: (null)
>+AXLinkRelationshipType: 
> AXElementBusy: 0
> AXPath: <AXLink>
> 
>@@ -62,6 +63,7 @@
> AXHighestEditableAncestor: (null)
> AXURL: http://www.apple.com/
> AXAccessKey: (null)
>+AXLinkRelationshipType: 
> AXElementBusy: 0
> AXPath: <AXLink>
> 
>@@ -95,6 +97,7 @@
> AXHighestEditableAncestor: (null)
> AXURL: http://webkit.org/
> AXAccessKey: (null)
>+AXLinkRelationshipType: 
> AXElementBusy: 0
> 
> ------------
>@@ -127,6 +130,7 @@
> AXHighestEditableAncestor: (null)
> AXURL: LayoutTests/accessibility/mac/document-links.html#asdf
> AXAccessKey: (null)
>+AXLinkRelationshipType: 
> AXElementBusy: 0
> 
> ------------
>Index: LayoutTests/accessibility/mac/linkrel-expected.txt
>===================================================================
>--- LayoutTests/accessibility/mac/linkrel-expected.txt	(nonexistent)
>+++ LayoutTests/accessibility/mac/linkrel-expected.txt	(working copy)
>@@ -0,0 +1,10 @@
>+This tests that the relationship type of a link can be determined.
>+
>+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
>+
>+
>+PASS relType is 'copyright'
>+PASS successfullyParsed is true
>+
>+TEST COMPLETE
>+
>Index: LayoutTests/accessibility/mac/linkrel.html
>===================================================================
>--- LayoutTests/accessibility/mac/linkrel.html	(nonexistent)
>+++ LayoutTests/accessibility/mac/linkrel.html	(working copy)
>@@ -0,0 +1,25 @@
>+<!DOCTYPE HTML>
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+</head>
>+<body>
>+
>+<a href="#" rel="copyright" id="link1">
>+
>+<p id="description"></p>
>+<div id="console"></div>
>+
>+<script>
>+    description("This tests that the relationship type of a link can be determined.");
>+    if (window.accessibilityController) {
>+    	var link = accessibilityController.accessibleElementById("link1");
>+
>+        var relType = link.stringAttributeValue('AXLinkRelationshipType');
>+        shouldBe("relType", "'copyright'");
>+    }
>+
>+</script>
>+<script src="../../resources/js-test-post.js"></script>
>+</body>
>+</html>

Actions: View | Formatted Diff | Diff

Attachments on bug 186084: 341558 | 341576