Diff
Modified: branches/safari-607-branch/LayoutTests/ChangeLog (241176 => 241177)
--- branches/safari-607-branch/LayoutTests/ChangeLog 2019-02-08 01:01:38 UTC (rev 241176)
+++ branches/safari-607-branch/LayoutTests/ChangeLog 2019-02-08 01:15:07 UTC (rev 241177)
@@ -1,5 +1,53 @@
2019-02-07 Alan Coon <[email protected]>
+ Cherry-pick r240710. rdar://problem/47776353
+
+ AX: Support color well on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=194010
+
+ Reviewed by Joanmarie Diggs.
+
+ Source/WebCore:
+
+ Test: accessibility/ios-simulator/color-well.html
+
+ Add support for color well on iOS.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+ (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
+ (-[WebAccessibilityObjectWrapper accessibilityRoleDescription]):
+ (-[WebAccessibilityObjectWrapper accessibilityColorStringValue]):
+ * en.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXColorWellText):
+ * platform/LocalizedStrings.h:
+
+ Tools:
+
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::stringAttributeValue):
+
+ LayoutTests:
+
+ * accessibility/ios-simulator/color-well-expected.txt: Added.
+ * accessibility/ios-simulator/color-well.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-30 Chris Fleizach <[email protected]>
+
+ AX: Support color well on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=194010
+
+ Reviewed by Joanmarie Diggs.
+
+ * accessibility/ios-simulator/color-well-expected.txt: Added.
+ * accessibility/ios-simulator/color-well.html: Added.
+
+2019-02-07 Alan Coon <[email protected]>
+
Cherry-pick r241137. rdar://problem/47893603
Unable to sign in leetcode.
Added: branches/safari-607-branch/LayoutTests/accessibility/ios-simulator/color-well-expected.txt (0 => 241177)
--- branches/safari-607-branch/LayoutTests/accessibility/ios-simulator/color-well-expected.txt (rev 0)
+++ branches/safari-607-branch/LayoutTests/accessibility/ios-simulator/color-well-expected.txt 2019-02-08 01:15:07 UTC (rev 241177)
@@ -0,0 +1,13 @@
+
+This test thats color input types are accessible on iOS.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS element.isIgnored is false
+PASS element.stringAttributeValue('AXRoleDescription') is 'color well'
+PASS element.stringAttributeValue('AXColorStringDescription') is 'rgb 0.90196 0.39216 0.39608 1'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: branches/safari-607-branch/LayoutTests/accessibility/ios-simulator/color-well.html (0 => 241177)
--- branches/safari-607-branch/LayoutTests/accessibility/ios-simulator/color-well.html (rev 0)
+++ branches/safari-607-branch/LayoutTests/accessibility/ios-simulator/color-well.html 2019-02-08 01:15:07 UTC (rev 241177)
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script src=""
+<script>
+var successfullyParsed = false;
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+
+<input type="color" value="#e66465" id="color">
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This test thats color input types are accessible on iOS.");
+
+ if (window.accessibilityController) {
+
+ var element = accessibilityController.accessibleElementById("color");
+ shouldBeFalse("element.isIgnored");
+ shouldBe("element.stringAttributeValue('AXRoleDescription')", "'color well'");
+ shouldBe("element.stringAttributeValue('AXColorStringDescription')", "'rgb 0.90196 0.39216 0.39608 1'");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src=""
+
+</body>
+</html>
+
Modified: branches/safari-607-branch/Source/WebCore/ChangeLog (241176 => 241177)
--- branches/safari-607-branch/Source/WebCore/ChangeLog 2019-02-08 01:01:38 UTC (rev 241176)
+++ branches/safari-607-branch/Source/WebCore/ChangeLog 2019-02-08 01:15:07 UTC (rev 241177)
@@ -1,5 +1,64 @@
2019-02-07 Alan Coon <[email protected]>
+ Cherry-pick r240710. rdar://problem/47776353
+
+ AX: Support color well on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=194010
+
+ Reviewed by Joanmarie Diggs.
+
+ Source/WebCore:
+
+ Test: accessibility/ios-simulator/color-well.html
+
+ Add support for color well on iOS.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+ (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
+ (-[WebAccessibilityObjectWrapper accessibilityRoleDescription]):
+ (-[WebAccessibilityObjectWrapper accessibilityColorStringValue]):
+ * en.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXColorWellText):
+ * platform/LocalizedStrings.h:
+
+ Tools:
+
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::stringAttributeValue):
+
+ LayoutTests:
+
+ * accessibility/ios-simulator/color-well-expected.txt: Added.
+ * accessibility/ios-simulator/color-well.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-30 Chris Fleizach <[email protected]>
+
+ AX: Support color well on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=194010
+
+ Reviewed by Joanmarie Diggs.
+
+ Test: accessibility/ios-simulator/color-well.html
+
+ Add support for color well on iOS.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+ (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
+ (-[WebAccessibilityObjectWrapper accessibilityRoleDescription]):
+ (-[WebAccessibilityObjectWrapper accessibilityColorStringValue]):
+ * en.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXColorWellText):
+ * platform/LocalizedStrings.h:
+
+2019-02-07 Alan Coon <[email protected]>
+
Cherry-pick r241137. rdar://problem/47893603
Unable to sign in leetcode.
Modified: branches/safari-607-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm (241176 => 241177)
--- branches/safari-607-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2019-02-08 01:01:38 UTC (rev 241176)
+++ branches/safari-607-branch/Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm 2019-02-08 01:15:07 UTC (rev 241177)
@@ -347,6 +347,7 @@
switch (role) {
case AccessibilityRole::Button:
case AccessibilityRole::CheckBox:
+ case AccessibilityRole::ColorWell:
case AccessibilityRole::ComboBox:
case AccessibilityRole::DisclosureTriangle:
case AccessibilityRole::Heading:
@@ -857,6 +858,7 @@
case AccessibilityRole::ToggleButton:
case AccessibilityRole::PopUpButton:
case AccessibilityRole::CheckBox:
+ case AccessibilityRole::ColorWell:
case AccessibilityRole::RadioButton:
case AccessibilityRole::Slider:
case AccessibilityRole::MenuButton:
@@ -931,7 +933,6 @@
case AccessibilityRole::Canvas:
case AccessibilityRole::Caption:
case AccessibilityRole::Cell:
- case AccessibilityRole::ColorWell:
case AccessibilityRole::Column:
case AccessibilityRole::ColumnHeader:
case AccessibilityRole::Definition:
@@ -1116,6 +1117,12 @@
- (NSString *)accessibilityRoleDescription
{
+ if (![self _prepareAccessibilityCall])
+ return nil;
+
+ if (m_object->isColorWell())
+ return AXColorWellText();
+
return m_object->roleDescription();
}
@@ -1394,6 +1401,20 @@
return m_object->placeholderValue();
}
+- (NSString *)accessibilityColorStringValue
+{
+ if (![self _prepareAccessibilityCall])
+ return nil;
+
+ if (m_object->isColorWell()) {
+ int r, g, b;
+ m_object->colorValue(r, g, b);
+ return [NSString stringWithFormat:@"rgb %7.5f %7.5f %7.5f 1", r / 255., g / 255., b / 255.];
+ }
+
+ return nil;
+}
+
- (NSString *)accessibilityValue
{
if (![self _prepareAccessibilityCall])
Modified: branches/safari-607-branch/Source/WebCore/en.lproj/Localizable.strings (241176 => 241177)
--- branches/safari-607-branch/Source/WebCore/en.lproj/Localizable.strings 2019-02-08 01:01:38 UTC (rev 241176)
+++ branches/safari-607-branch/Source/WebCore/en.lproj/Localizable.strings 2019-02-08 01:15:07 UTC (rev 241177)
@@ -967,6 +967,9 @@
/* HTTP result code string */
"client error" = "client error";
+/* accessibility role description for a color well */
+"color well" = "color well";
+
/* An ARIA accessibility group that acts as a region of complementary information. */
"complementary" = "complementary";
Modified: branches/safari-607-branch/Source/WebCore/platform/LocalizedStrings.cpp (241176 => 241177)
--- branches/safari-607-branch/Source/WebCore/platform/LocalizedStrings.cpp 2019-02-08 01:01:38 UTC (rev 241176)
+++ branches/safari-607-branch/Source/WebCore/platform/LocalizedStrings.cpp 2019-02-08 01:15:07 UTC (rev 241177)
@@ -466,6 +466,11 @@
return WEB_UI_STRING("heading", "accessibility role description for headings");
}
+String AXColorWellText()
+{
+ return WEB_UI_STRING("color well", "accessibility role description for a color well");
+}
+
String AXDefinitionText()
{
return WEB_UI_STRING("definition", "role description of ARIA definition role");
Modified: branches/safari-607-branch/Source/WebCore/platform/LocalizedStrings.h (241176 => 241177)
--- branches/safari-607-branch/Source/WebCore/platform/LocalizedStrings.h 2019-02-08 01:01:38 UTC (rev 241176)
+++ branches/safari-607-branch/Source/WebCore/platform/LocalizedStrings.h 2019-02-08 01:15:07 UTC (rev 241177)
@@ -164,6 +164,7 @@
String AXListMarkerText();
String AXImageMapText();
String AXHeadingText();
+ String AXColorWellText();
String AXDefinitionText();
String AXDescriptionListText();
String AXDescriptionListTermText();
Modified: branches/safari-607-branch/Tools/ChangeLog (241176 => 241177)
--- branches/safari-607-branch/Tools/ChangeLog 2019-02-08 01:01:38 UTC (rev 241176)
+++ branches/safari-607-branch/Tools/ChangeLog 2019-02-08 01:15:07 UTC (rev 241177)
@@ -1,5 +1,53 @@
2019-02-07 Alan Coon <[email protected]>
+ Cherry-pick r240710. rdar://problem/47776353
+
+ AX: Support color well on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=194010
+
+ Reviewed by Joanmarie Diggs.
+
+ Source/WebCore:
+
+ Test: accessibility/ios-simulator/color-well.html
+
+ Add support for color well on iOS.
+
+ * accessibility/ios/WebAccessibilityObjectWrapperIOS.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityCanFuzzyHitTest]):
+ (-[WebAccessibilityObjectWrapper determineIsAccessibilityElement]):
+ (-[WebAccessibilityObjectWrapper accessibilityRoleDescription]):
+ (-[WebAccessibilityObjectWrapper accessibilityColorStringValue]):
+ * en.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXColorWellText):
+ * platform/LocalizedStrings.h:
+
+ Tools:
+
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::stringAttributeValue):
+
+ LayoutTests:
+
+ * accessibility/ios-simulator/color-well-expected.txt: Added.
+ * accessibility/ios-simulator/color-well.html: Added.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240710 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2019-01-30 Chris Fleizach <[email protected]>
+
+ AX: Support color well on iOS
+ https://bugs.webkit.org/show_bug.cgi?id=194010
+
+ Reviewed by Joanmarie Diggs.
+
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::stringAttributeValue):
+
+2019-02-07 Alan Coon <[email protected]>
+
Cherry-pick r240808. rdar://problem/47774548
Revert r238819 which is unneeded and caused a performance regression.
Modified: branches/safari-607-branch/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (241176 => 241177)
--- branches/safari-607-branch/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2019-02-08 01:01:38 UTC (rev 241176)
+++ branches/safari-607-branch/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2019-02-08 01:15:07 UTC (rev 241177)
@@ -82,6 +82,8 @@
- (BOOL)_accessibilityIsStrongPasswordField;
- (CGRect)accessibilityVisibleContentRect;
- (NSString *)accessibilityTextualContext;
+- (NSString *)accessibilityRoleDescription;
+- (NSString *)accessibilityColorStringValue;
// TextMarker related
- (NSArray *)textMarkerRange;
@@ -352,7 +354,13 @@
{
if (JSStringIsEqualToUTF8CString(attribute, "AXPlaceholderValue"))
return [[m_element accessibilityPlaceholderValue] createJSStringRef];
-
+
+ if (JSStringIsEqualToUTF8CString(attribute, "AXRoleDescription"))
+ return [[m_element accessibilityRoleDescription] createJSStringRef];
+
+ if (JSStringIsEqualToUTF8CString(attribute, "AXColorStringDescription"))
+ return [[m_element accessibilityColorStringValue] createJSStringRef];
+
if (JSStringIsEqualToUTF8CString(attribute, "AXARIACurrent"))
return [[m_element accessibilityARIACurrentStatus] createJSStringRef];
