Diff
Modified: trunk/LayoutTests/ChangeLog (201912 => 201913)
--- trunk/LayoutTests/ChangeLog 2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/ChangeLog 2016-06-10 06:06:08 UTC (rev 201913)
@@ -1,3 +1,16 @@
+2016-06-09 Chris Fleizach <[email protected]>
+
+ AX: VoiceOver Unable to View Download Progress or Completion Status for Mail Attachments
+ https://bugs.webkit.org/show_bug.cgi?id=158581
+
+ Reviewed by Darin Adler.
+
+ * accessibility/attachment-element-expected.txt:
+ * accessibility/attachment-element.html:
+ * accessibility/ios-simulator/attributed-string-for-range-expected.txt:
+ * platform/ios-simulator/TestExpectations:
+ * platform/ios-simulator/accessibility/attachment-element-expected.txt: Added.
+
2016-06-09 Zalan Bujtas <[email protected]>
Hairline borders do not show up on 3x displays.
Modified: trunk/LayoutTests/accessibility/attachment-element-expected.txt (201912 => 201913)
--- trunk/LayoutTests/accessibility/attachment-element-expected.txt 2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/accessibility/attachment-element-expected.txt 2016-06-10 06:06:08 UTC (rev 201913)
@@ -4,7 +4,7 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-Attachment description: AXDescription: title, subtitle, action
+Attachment description: AXDescription: action, title, subtitle
Attachment value: AXValue: 0.5
Attachment role: AXRoleDescription: attachment
PASS successfullyParsed is true
Modified: trunk/LayoutTests/accessibility/attachment-element.html (201912 => 201913)
--- trunk/LayoutTests/accessibility/attachment-element.html 2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/accessibility/attachment-element.html 2016-06-10 06:06:08 UTC (rev 201913)
@@ -22,8 +22,12 @@
if (window.accessibilityController) {
var content = accessibilityController.accessibleElementById("attachment");
debug("Attachment description: " + content.description);
+
debug("Attachment value: " + content.stringValue);
- debug("Attachment role: " + content.roleDescription);
+
+ if (accessibilityController.platformName == "mac") {
+ debug("Attachment role: " + content.roleDescription);
+ }
}
</script>
Modified: trunk/LayoutTests/accessibility/ios-simulator/attributed-string-for-range-expected.txt (201912 => 201913)
--- trunk/LayoutTests/accessibility/ios-simulator/attributed-string-for-range-expected.txt 2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/accessibility/ios-simulator/attributed-string-for-range-expected.txt 2016-06-10 06:06:08 UTC (rev 201913)
@@ -15,7 +15,7 @@
UIAccessibilityTokenFontName = "Times New Roman";
UIAccessibilityTokenFontSize = 16;
}{
- UIAccessibilityTokenAttachment = "WebAccessibilityObjectWrapper: title, subtitle, action";
+ UIAccessibilityTokenAttachment = "WebAccessibilityObjectWrapper: action, title, subtitle";
} {
UIAccessibilityTokenFontFamily = "Times New Roman";
UIAccessibilityTokenFontName = "Times New Roman";
Modified: trunk/LayoutTests/platform/ios-simulator/TestExpectations (201912 => 201913)
--- trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/LayoutTests/platform/ios-simulator/TestExpectations 2016-06-10 06:06:08 UTC (rev 201913)
@@ -2768,6 +2768,9 @@
# Enable "aria-table-attributes" test for iOS
webkit.org/b/150366 accessibility/aria-table-attributes.html [ Pass ]
+# Enable "attachment element" test for iOS
+accessibility/attachment-element.html [ Pass ]
+
# Enable Text marker tests for iOS
webkit.org/b/153292 accessibility/text-marker [ Pass ]
Added: trunk/LayoutTests/platform/ios-simulator/accessibility/attachment-element-expected.txt (0 => 201913)
--- trunk/LayoutTests/platform/ios-simulator/accessibility/attachment-element-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/ios-simulator/accessibility/attachment-element-expected.txt 2016-06-10 06:06:08 UTC (rev 201913)
@@ -0,0 +1,12 @@
+
+This tests that attachment elements are accessible.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+Attachment description: AXLabel: action, title, subtitle
+Attachment value: AXValue: 0.50
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Modified: trunk/Source/WebCore/ChangeLog (201912 => 201913)
--- trunk/Source/WebCore/ChangeLog 2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/Source/WebCore/ChangeLog 2016-06-10 06:06:08 UTC (rev 201913)
@@ -1,3 +1,27 @@
+2016-06-09 Chris Fleizach <[email protected]>
+
+ AX: VoiceOver Unable to View Download Progress or Completion Status for Mail Attachments
+ https://bugs.webkit.org/show_bug.cgi?id=158581
+
+ Reviewed by Darin Adler.
+
+ Update attachment element accessibility so that:
+ 1) the action name comes first to match UI
+ 2) on iOS, it has the updates frequently trait
+
+ Make sure this test now runs on iOS as well.
+
+ Modified tests: accessibility/attachment-element.html
+
+ * accessibility/AccessibilityAttachment.cpp:
+ (WebCore::AccessibilityAttachment::accessibilityText):
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+ (-[WebAccessibilityObjectWrapper accessibilityTraits]):
+ (-[WebAccessibilityObjectWrapper accessibilityValue]):
+ (-[WebAccessibilityObjectWrapper accessibilityIsAttachmentElement]):
+ (-[WebAccessibilityObjectWrapper accessibilityIsComboBox]):
+
2016-06-09 Alex Christensen <[email protected]>
Clean up WebCore.vcxproj after switching to CMake.
Modified: trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp (201912 => 201913)
--- trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp 2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/Source/WebCore/accessibility/AccessibilityAttachment.cpp 2016-06-10 06:06:08 UTC (rev 201913)
@@ -94,14 +94,14 @@
auto& subtitle = getAttribute(subtitleAttr);
auto& action = ""
+ if (action.length())
+ textOrder.append(AccessibilityText(action, ActionText));
+
if (title.length())
textOrder.append(AccessibilityText(title, TitleText));
if (subtitle.length())
textOrder.append(AccessibilityText(subtitle, SubtitleText));
-
- if (action.length())
- textOrder.append(AccessibilityText(action, ActionText));
}
} // namespace WebCore
Modified: trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (201912 => 201913)
--- trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-06-10 05:53:57 UTC (rev 201912)
+++ trunk/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2016-06-10 06:06:08 UTC (rev 201913)
@@ -326,6 +326,7 @@
- (uint64_t)_axContainedByFieldsetTrait { return (1 << 22); }
- (uint64_t)_axSearchFieldTrait { return (1 << 23); }
- (uint64_t)_axTextAreaTrait { return (1 << 24); }
+- (uint64_t)_axUpdatesFrequentlyTrait { return (1 << 25); }
- (BOOL)accessibilityCanFuzzyHitTest
{
@@ -698,6 +699,9 @@
break;
}
+ if (m_object->isAttachmentElement())
+ traits |= [self _axUpdatesFrequentlyTrait];
+
if (m_object->isSelected())
traits |= [self _axSelectedTrait];
@@ -1275,6 +1279,14 @@
return nil;
}
+- (BOOL)accessibilityIsAttachmentElement
+{
+ if (![self _prepareAccessibilityCall])
+ return NO;
+
+ return is<AccessibilityAttachment>(m_object);
+}
+
- (BOOL)accessibilityIsComboBox
{
if (![self _prepareAccessibilityCall])
