Attachment 360562 Details for Bug 194010 – patch

[patch] patch

patch (text/plain), 9.06 KB, created by chris fleizach on 2019-01-30 01:11:46 PST

(hide)

Description:

Filename:

MIME Type:

Creator: chris fleizach

Created: 2019-01-30 01:11:46 PST

Size: 9.06 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 240705)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,24 @@
>+2019-01-30  Chris Fleizach  <cfleizach@apple.com>
>+
>+        AX: Support color well on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=194010
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        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-01-29  Eric Carlson  <eric.carlson@apple.com>
> 
>         [MSE] add more source buffer logging
>Index: Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm
>===================================================================
>--- Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm	(revision 240558)
>+++ Source/WebCore/accessibility/ios/WebAccessibilityObjectWrapperIOS.mm	(working copy)
>@@ -346,6 +346,7 @@
>     switch (role) {
>     case AccessibilityRole::Button:
>     case AccessibilityRole::CheckBox:
>+    case AccessibilityRole::ColorWell:
>     case AccessibilityRole::ComboBox:
>     case AccessibilityRole::DisclosureTriangle:
>     case AccessibilityRole::Heading:
>@@ -856,6 +857,7 @@
>     case AccessibilityRole::ToggleButton:
>     case AccessibilityRole::PopUpButton:
>     case AccessibilityRole::CheckBox:
>+    case AccessibilityRole::ColorWell:
>     case AccessibilityRole::RadioButton:
>     case AccessibilityRole::Slider:
>     case AccessibilityRole::MenuButton:
>@@ -930,7 +932,6 @@
>     case AccessibilityRole::Canvas:
>     case AccessibilityRole::Caption:
>     case AccessibilityRole::Cell:
>-    case AccessibilityRole::ColorWell:
>     case AccessibilityRole::Column:
>     case AccessibilityRole::ColumnHeader:
>     case AccessibilityRole::Definition:
>@@ -1115,6 +1116,12 @@
> 
> - (NSString *)accessibilityRoleDescription
> {
>+    if (![self _prepareAccessibilityCall])
>+        return nil;
>+
>+    if (m_object->isColorWell())
>+        return AXColorWellText();
>+
>     return m_object->roleDescription();
> }
> 
>@@ -1393,6 +1400,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])
>Index: Source/WebCore/en.lproj/Localizable.strings
>===================================================================
>--- Source/WebCore/en.lproj/Localizable.strings	(revision 240558)
>+++ Source/WebCore/en.lproj/Localizable.strings	(working copy)
>@@ -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";
> 
>Index: Source/WebCore/platform/LocalizedStrings.cpp
>===================================================================
>--- Source/WebCore/platform/LocalizedStrings.cpp	(revision 240558)
>+++ Source/WebCore/platform/LocalizedStrings.cpp	(working copy)
>@@ -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");
>Index: Source/WebCore/platform/LocalizedStrings.h
>===================================================================
>--- Source/WebCore/platform/LocalizedStrings.h	(revision 240558)
>+++ Source/WebCore/platform/LocalizedStrings.h	(working copy)
>@@ -164,6 +164,7 @@
>     String AXListMarkerText();
>     String AXImageMapText();
>     String AXHeadingText();
>+    String AXColorWellText();
>     String AXDefinitionText();
>     String AXDescriptionListText();
>     String AXDescriptionListTermText();
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 240558)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-01-30  Chris Fleizach  <cfleizach@apple.com>
>+
>+        AX: Support color well on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=194010
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * accessibility/ios-simulator/color-well-expected.txt: Added.
>+        * accessibility/ios-simulator/color-well.html: Added.
>+
> 2019-01-26  Simon Fraser  <simon.fraser@apple.com>
> 
>         Have composited RenderIFrame layers make FrameHosting scrolling tree nodes to parent the iframe's scrolling node
>Index: LayoutTests/accessibility/ios-simulator/color-well-expected.txt
>===================================================================
>--- LayoutTests/accessibility/ios-simulator/color-well-expected.txt	(nonexistent)
>+++ LayoutTests/accessibility/ios-simulator/color-well-expected.txt	(working copy)
>@@ -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
>+
>Index: LayoutTests/accessibility/ios-simulator/color-well.html
>===================================================================
>--- LayoutTests/accessibility/ios-simulator/color-well.html	(nonexistent)
>+++ LayoutTests/accessibility/ios-simulator/color-well.html	(working copy)
>@@ -0,0 +1,37 @@
>+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
>+<html>
>+<head>
>+<script src="../../resources/js-test-pre.js"></script>
>+<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="../../resources/js-test-post.js"></script>
>+
>+</body>
>+</html>
>+
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 240707)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,13 @@
>+2019-01-30  Chris Fleizach  <cfleizach@apple.com>
>+
>+        AX: Support color well on iOS
>+        https://bugs.webkit.org/show_bug.cgi?id=194010
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
>+        (WTR::AccessibilityUIElement::stringAttributeValue):
>+
> 2019-01-29  Alexey Proskuryakov  <ap@apple.com>
> 
>         [Mac] Update window scale API usage
>Index: Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm
>===================================================================
>--- Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm	(revision 240558)
>+++ Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm	(working copy)
>@@ -82,6 +82,8 @@
> - (BOOL)_accessibilityIsStrongPasswordField;
> - (CGRect)accessibilityVisibleContentRect;
> - (NSString *)accessibilityTextualContext;
>+- (NSString *)accessibilityRoleDescription;
>+- (NSString *)accessibilityColorStringValue;
> 
> // TextMarker related
> - (NSArray *)textMarkerRange;
>@@ -357,7 +359,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];
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194010: 360562