Diff
Modified: trunk/LayoutTests/ChangeLog (244060 => 244061)
--- trunk/LayoutTests/ChangeLog 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/LayoutTests/ChangeLog 2019-04-09 00:58:19 UTC (rev 244061)
@@ -1,3 +1,15 @@
+2019-04-08 Chris Fleizach <cfleiz...@apple.com>
+
+ AX: Automatically compute accessibility labels for Apple Pay buttons
+ https://bugs.webkit.org/show_bug.cgi?id=196661
+
+ Reviewed by Joanmarie Diggs.
+
+ * accessibility/mac/apple-pay-labels-expected.txt: Added.
+ * accessibility/mac/apple-pay-labels.html: Added.
+ * accessibility/mac/apple-pay-session-v4-expected.txt: Added.
+ * accessibility/mac/apple-pay-session-v4.html: Added.
+
2019-04-08 Youenn Fablet <you...@apple.com>
Add a test to check for the service worker process name
Added: trunk/LayoutTests/accessibility/mac/apple-pay-labels-expected.txt (0 => 244061)
--- trunk/LayoutTests/accessibility/mac/apple-pay-labels-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/apple-pay-labels-expected.txt 2019-04-09 00:58:19 UTC (rev 244061)
@@ -0,0 +1,9 @@
+PASS plain.role is 'AXRole: AXButton'
+PASS plain.description is 'AXDescription: Apple Pay'
+PASS buy.description is 'AXDescription: Buy with Apple Pay'
+PASS donate.description is 'AXDescription: Donate with Apple Pay'
+PASS setup.description is 'AXDescription: Set up with Apple Pay'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/accessibility/mac/apple-pay-labels.html (0 => 244061)
--- trunk/LayoutTests/accessibility/mac/apple-pay-labels.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/apple-pay-labels.html 2019-04-09 00:58:19 UTC (rev 244061)
@@ -0,0 +1,30 @@
+<html>
+<html>
+<head>
+<script src=''></script>
+</head>
+<body id='body'>
+
+ <div id="plain" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: plain;"></div>
+ <div id="buy" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: buy;"></div>
+ <div id="donate" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: donate;"></div>
+ <div id="setup" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: set-up;"></div>
+
+
+ <script>
+ if (window.accessibilityController) {
+ var plain = accessibilityController.accessibleElementById("plain");
+ var buy = accessibilityController.accessibleElementById("buy");
+ var donate = accessibilityController.accessibleElementById("donate");
+ var setup = accessibilityController.accessibleElementById("setup");
+
+ shouldBe("plain.role", "'AXRole: AXButton'");
+ shouldBe("plain.description", "'AXDescription: Apple Pay'");
+ shouldBe("buy.description", "'AXDescription: Buy with Apple Pay'");
+ shouldBe("donate.description", "'AXDescription: Donate with Apple Pay'");
+ shouldBe("setup.description", "'AXDescription: Set up with Apple Pay'");
+ }
+ </script>
+<script src=''></script>
+</body>
+</html>
Added: trunk/LayoutTests/accessibility/mac/apple-pay-session-v4-expected.txt (0 => 244061)
--- trunk/LayoutTests/accessibility/mac/apple-pay-session-v4-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/mac/apple-pay-session-v4-expected.txt 2019-04-09 00:58:19 UTC (rev 244061)
@@ -0,0 +1,7 @@
+PASS book.description is 'AXDescription: Book with Apple Pay'
+PASS checkout.description is 'AXDescription: Check out with Apple Pay'
+PASS subscribe.description is 'AXDescription: Subscribe with Apple Pay'
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Added: trunk/LayoutTests/accessibility/mac/apple-pay-session-v4.html (0 => 244061)
--- trunk/LayoutTests/accessibility/mac/apple-pay-session-v4.html (rev 0)
+++ trunk/LayoutTests/accessibility/mac/apple-pay-session-v4.html 2019-04-09 00:58:19 UTC (rev 244061)
@@ -0,0 +1,26 @@
+<html>
+<html>
+<head>
+<script src=''></script>
+</head>
+<body id='body'>
+
+ <div id="book" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: book;"></div>
+ <div id="checkout" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: check-out;"></div>
+ <div id="subscribe" style="-webkit-appearance: -apple-pay-button; -apple-pay-button-type: subscribe;"></div>
+
+
+ <script>
+ if (window.accessibilityController) {
+ var book = accessibilityController.accessibleElementById("book");
+ var checkout = accessibilityController.accessibleElementById("checkout");
+ var subscribe = accessibilityController.accessibleElementById("subscribe");
+
+ shouldBe("book.description", "'AXDescription: Book with Apple Pay'");
+ shouldBe("checkout.description", "'AXDescription: Check out with Apple Pay'");
+ shouldBe("subscribe.description", "'AXDescription: Subscribe with Apple Pay'");
+ }
+ </script>
+<script src=''></script>
+</body>
+</html>
Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (244060 => 244061)
--- trunk/LayoutTests/platform/mac-wk1/TestExpectations 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2019-04-09 00:58:19 UTC (rev 244061)
@@ -62,6 +62,9 @@
# ShouldOpenExternalURLs not yet supported in WK1
loader/navigation-policy [ Skip ]
+[ Sierra ] accessibility/mac/apple-pay-labels.html [ Skip ]
+[ HighSierra ] accessibility/mac/apple-pay-session-v4.html [ Skip ]
+
# <a download> is not supported in WK1 yet.
webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-nodownload-set.html [ Failure ]
webkit.org/b/156069 fast/dom/HTMLAnchorElement/anchor-download.html [ Failure ]
@@ -703,4 +706,4 @@
webkit.org/b/196448 [ Debug ] inspector/audit/basic.html [ Pass Timeout ]
-webkit.org/b/196502 media/video-background-tab-playback.html [ Pass Failure ]
\ No newline at end of file
+webkit.org/b/196502 media/video-background-tab-playback.html [ Pass Failure ]
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (244060 => 244061)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2019-04-09 00:58:19 UTC (rev 244061)
@@ -33,9 +33,11 @@
[ Sierra ] http/tests/ssl/applepay/ApplePaySessionV5.html [ Skip ]
[ Sierra ] http/tests/ssl/applepay/ApplePayRequestShippingContactV3.https.html [ Skip ]
[ Sierra ] http/tests/ssl/applepay/ApplePayShippingAddressChangeEventErrorsV3.https.html [ Skip ]
+[ Sierra ] accessibility/mac/apple-pay-labels.html [ Skip ]
[ HighSierra ] http/tests/ssl/applepay/ApplePayButtonV4.html [ Skip ]
[ HighSierra ] http/tests/ssl/applepay/ApplePaySessionV4.html [ Skip ]
[ HighSierra ] http/tests/ssl/applepay/ApplePaySessionV5.html [ Skip ]
+[ HighSierra ] accessibility/mac/apple-pay-session-v4.html [ Skip ]
fast/visual-viewport/rubberbanding-viewport-rects.html [ Pass ]
fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html [ Pass ]
@@ -775,6 +777,8 @@
[ Mojave+ ] http/tests/ssl/applepay/ApplePaySessionV5.html [ Pass ]
[ HighSierra+ ] http/tests/ssl/applepay/ApplePayRequestShippingContactV3.https.html [ Pass ]
[ HighSierra+ ] http/tests/ssl/applepay/ApplePayShippingAddressChangeEventErrorsV3.https.html [ Pass ]
+[ HighSierra+ ] accessibility/mac/apple-pay-labels.html [ Pass ]
+[ Mojave+ ] accessibility/mac/apple-pay-session-v4.html [ Pass ]
# <rdar://problem/31634451>
[ HighSierra+ ] http/tests/resourceLoadStatistics/cookies-with-and-without-user-interaction.html [ Pass ]
[ HighSierra+ ] http/tests/resourceLoadStatistics/cookie-deletion.html [ Pass ]
Modified: trunk/Source/WebCore/ChangeLog (244060 => 244061)
--- trunk/Source/WebCore/ChangeLog 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/Source/WebCore/ChangeLog 2019-04-09 00:58:19 UTC (rev 244061)
@@ -1,5 +1,38 @@
2019-04-08 Chris Fleizach <cfleiz...@apple.com>
+ AX: Automatically compute accessibility labels for Apple Pay buttons
+ https://bugs.webkit.org/show_bug.cgi?id=196661
+
+ Reviewed by Joanmarie Diggs.
+
+ Detect Apple Pay buttons and return a standard role and label for them based on their type.
+
+ Test: accessibility/mac/apple-pay-labels.html
+ accessibility/mac/apple-pay-session-v4.html
+
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::isControl const):
+ * accessibility/AccessibilityNodeObject.h:
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::applePayButtonDescription const):
+ (WebCore::AccessibilityRenderObject::titleElementText const):
+ (WebCore::AccessibilityRenderObject::determineAccessibilityRole):
+ (WebCore::AccessibilityRenderObject::isApplePayButton const):
+ (WebCore::AccessibilityRenderObject::applePayButtonType const):
+ * accessibility/AccessibilityRenderObject.h:
+ * en.lproj/Localizable.strings:
+ * platform/LocalizedStrings.cpp:
+ (WebCore::AXApplePayPlainLabel):
+ (WebCore::AXApplePayBuyLabel):
+ (WebCore::AXApplePaySetupLabel):
+ (WebCore::AXApplePayDonateLabel):
+ (WebCore::AXApplePayCheckOutLabel):
+ (WebCore::AXApplePayBookLabel):
+ (WebCore::AXApplePaySubscribeLabel):
+ * platform/LocalizedStrings.h:
+
+2019-04-08 Chris Fleizach <cfleiz...@apple.com>
+
AX: Support API: accessibilityReplaceRange:withText
https://bugs.webkit.org/show_bug.cgi?id=196636
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (244060 => 244061)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2019-04-09 00:58:19 UTC (rev 244061)
@@ -886,7 +886,7 @@
if (!node)
return false;
- return is<HTMLFormControlElement>(*node) || AccessibilityObject::isARIAControl(ariaRoleAttribute());
+ return is<HTMLFormControlElement>(*node) || AccessibilityObject::isARIAControl(ariaRoleAttribute()) || roleValue() == AccessibilityRole::Button;
}
bool AccessibilityNodeObject::isFieldset() const
Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h (244060 => 244061)
--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.h 2019-04-09 00:58:19 UTC (rev 244061)
@@ -177,11 +177,11 @@
Element* menuItemElementForMenu() const;
AccessibilityObject* menuButtonForMenu() const;
AccessibilityObject* captionForFigure() const;
+ virtual void titleElementText(Vector<AccessibilityText>&) const;
private:
bool isAccessibilityNodeObject() const final { return true; }
void accessibilityText(Vector<AccessibilityText>&) const override;
- virtual void titleElementText(Vector<AccessibilityText>&) const;
void alternativeText(Vector<AccessibilityText>&) const;
void visibleText(Vector<AccessibilityText>&) const;
void helpText(Vector<AccessibilityText>&) const;
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (244060 => 244061)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2019-04-09 00:58:19 UTC (rev 244061)
@@ -1075,6 +1075,42 @@
return true;
}
+
+#if ENABLE(APPLE_PAY)
+String AccessibilityRenderObject::applePayButtonDescription() const
+{
+ switch (applePayButtonType()) {
+ case ApplePayButtonType::Plain:
+ return AXApplePayPlainLabel();
+ case ApplePayButtonType::Buy:
+ return AXApplePayBuyLabel();
+ case ApplePayButtonType::SetUp:
+ return AXApplePaySetupLabel();
+ case ApplePayButtonType::Donate:
+ return AXApplePayDonateLabel();
+#if ENABLE(APPLE_PAY_SESSION_V4)
+ case ApplePayButtonType::CheckOut:
+ return AXApplePayCheckOutLabel();
+ case ApplePayButtonType::Book:
+ return AXApplePayBookLabel();
+ case ApplePayButtonType::Subscribe:
+ return AXApplePaySubscribeLabel();
+#endif
+ }
+}
+#endif
+
+void AccessibilityRenderObject::titleElementText(Vector<AccessibilityText>& textOrder) const
+{
+#if ENABLE(APPLE_PAY)
+ if (isApplePayButton()) {
+ textOrder.append(AccessibilityText(applePayButtonDescription(), AccessibilityTextSource::Alternative));
+ return;
+ }
+#endif
+
+ AccessibilityNodeObject::titleElementText(textOrder);
+}
AccessibilityObject* AccessibilityRenderObject::titleUIElement() const
{
@@ -2672,6 +2708,11 @@
if (!m_renderer)
return AccessibilityRole::Unknown;
+#if ENABLE(APPLE_PAY)
+ if (isApplePayButton())
+ return AccessibilityRole::Button;
+#endif
+
// Sometimes we need to ignore the attribute role. Like if a tree is malformed,
// we want to ignore the treeitem's attribute role.
if ((m_ariaRole = determineAriaRoleAttribute()) != AccessibilityRole::Unknown && !shouldIgnoreAttributeRole())
@@ -3629,6 +3670,22 @@
return m_renderer->style().fontDescription().families() == renderer->style().fontDescription().families();
}
+#if ENABLE(APPLE_PAY)
+bool AccessibilityRenderObject::isApplePayButton() const
+{
+ if (!m_renderer)
+ return false;
+ return m_renderer->style().appearance() == ApplePayButtonPart;
+}
+
+ApplePayButtonType AccessibilityRenderObject::applePayButtonType() const
+{
+ if (!m_renderer)
+ return ApplePayButtonType::Plain;
+ return m_renderer->style().applePayButtonType();
+}
+#endif
+
bool AccessibilityRenderObject::hasSameFontColor(RenderObject* renderer) const
{
if (!m_renderer || !renderer)
Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h (244060 => 244061)
--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.h 2019-04-09 00:58:19 UTC (rev 244061)
@@ -200,6 +200,7 @@
AccessibilityRole roleValueForMSAA() const override;
String passwordFieldValue() const override;
+ void titleElementText(Vector<AccessibilityText>&) const override;
protected:
explicit AccessibilityRenderObject(RenderObject*);
@@ -283,6 +284,12 @@
bool shouldGetTextFromNode(AccessibilityTextUnderElementMode) const;
+#if ENABLE(APPLE_PAY)
+ bool isApplePayButton() const;
+ ApplePayButtonType applePayButtonType() const;
+ String applePayButtonDescription() const;
+#endif
+
RenderObject* targetElementForActiveDescendant(const QualifiedName&, AccessibilityObject*) const;
bool canHavePlainText() const;
};
Modified: trunk/Source/WebCore/en.lproj/Localizable.strings (244060 => 244061)
--- trunk/Source/WebCore/en.lproj/Localizable.strings 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/Source/WebCore/en.lproj/Localizable.strings 2019-04-09 00:58:19 UTC (rev 244061)
@@ -103,18 +103,18 @@
/* Undo action name */
"Align Right (Undo action name)" = "Align Right";
-/* Allow Storage Access API */
-"Allow" = "Allow";
-
-/* Title for Allow button label in the Storage Access API request dialog */
+/* Button title in Storage Access API prompt */
"Allow (cross-site cookie and website data access)" = "Allow";
-/* Storage Access API request validation (iOS phrasing) */
+/* Message for requesting cross-site cookie and website data access. */
"Allow \"%@\" to use cookies and website data while browsing \"%@\"?" = "Allow \"%@\" to use cookies and website data while browsing \"%@\"?";
/* WKErrorUnknown description */
"An unknown error occurred" = "An unknown error occurred";
+/* Label for the plain Apple Pay button. */
+"Apple Pay" = "Apple Pay";
+
/* Malware confirmation dialog title */
"Are you sure you wish to go to this site?" = "Are you sure you wish to go to this site?";
@@ -139,9 +139,15 @@
/* Undo action name */
"Bold (Undo action name)" = "Bold";
+/* Label for the book with Apple Pay button. */
+"Book with Apple Pay" = "Book with Apple Pay";
+
/* Option in segmented control for inserting a bulleted list in text editing */
"Bulleted list" = "Bulleted list";
+/* Label for the buy with Apple Pay button. */
+"Buy with Apple Pay" = "Buy with Apple Pay";
+
/* Cancel */
"Cancel" = "Cancel";
@@ -166,6 +172,9 @@
/* Check spelling while typing context menu item */
"Check Spelling While Typing" = "Check Spelling While Typing";
+/* Label for the check out with Apple Pay button. */
+"Check out with Apple Pay" = "Check out with Apple Pay";
+
/* title for a single file chooser button used in HTML forms */
"Choose File" = "Choose File";
@@ -256,15 +265,15 @@
/* Undo action name */
"Dictation (Undo action name)" = "Dictation";
-/* Storage Access API request validation (macOS phrasing) */
+/* Message for requesting cross-site cookie and website data access. */
"Do you want to allow \"%@\" to use cookies and website data while browsing \"%@\"?" = "Do you want to allow \"%@\" to use cookies and website data while browsing \"%@\"?";
-/* Storage Access API deny access */
-"Don't Allow" = "Don't Allow";
-
-/* Title for Don't Allow button label in the Storage Access API request dialog */
+/* Button title in Storage Access API prompt */
"Don't Allow (cross-site cookie and website data access)" = "Don't Allow";
+/* Label for the donate with Apple Pay button. */
+"Donate with Apple Pay" = "Donate with Apple Pay";
+
/* Title of the Done button for zoomed form controls. */
"Done" = "Done";
@@ -664,6 +673,9 @@
/* Undo action name */
"Set Writing Direction (Undo action name)" = "Set Writing Direction";
+/* Label for the set up with Apple Pay button. */
+"Set up with Apple Pay" = "Set up with Apple Pay";
+
/* Title for Share action button */
"Share…" = "Share…";
@@ -745,6 +757,9 @@
/* alt text for <input> elements with no alt, title, or value */
"Submit (input element)" = "Submit";
+/* Label for the subcribe with Apple Pay button. */
+"Subscribe with Apple Pay" = "Subscribe with Apple Pay";
+
/* Undo action name */
"Subscript (Undo action name)" = "Subscript";
@@ -820,7 +835,7 @@
/* Unwanted software warning */
"This website may try to trick you into installing software that harms your browsing experience, like changing your settings without your permission or showing you unwanted ads. Once installed, it may be difficult to remove." = "This website may try to trick you into installing software that harms your browsing experience, like changing your settings without your permission or showing you unwanted ads. Once installed, it may be difficult to remove.";
-/* Storage Access API tracking warning */
+/* Informative text for requesting cross-site cookie and website data access. */
"This will allow \"%@\" to track your activity." = "This will allow \"%@\" to track your activity.";
/* Undo action name */
Modified: trunk/Source/WebCore/platform/LocalizedStrings.cpp (244060 => 244061)
--- trunk/Source/WebCore/platform/LocalizedStrings.cpp 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/Source/WebCore/platform/LocalizedStrings.cpp 2019-04-09 00:58:19 UTC (rev 244061)
@@ -628,6 +628,43 @@
return "select";
}
+#if ENABLE(APPLE_PAY)
+String AXApplePayPlainLabel()
+{
+ return WEB_UI_STRING("Apple Pay", "Label for the plain Apple Pay button.");
+}
+
+String AXApplePayBuyLabel()
+{
+ return WEB_UI_STRING("Buy with Apple Pay", "Label for the buy with Apple Pay button.");
+}
+
+String AXApplePaySetupLabel()
+{
+ return WEB_UI_STRING("Set up with Apple Pay", "Label for the set up with Apple Pay button.");
+}
+
+String AXApplePayDonateLabel()
+{
+ return WEB_UI_STRING("Donate with Apple Pay", "Label for the donate with Apple Pay button.");
+}
+
+String AXApplePayCheckOutLabel()
+{
+ return WEB_UI_STRING("Check out with Apple Pay", "Label for the check out with Apple Pay button.");
+}
+
+String AXApplePayBookLabel()
+{
+ return WEB_UI_STRING("Book with Apple Pay", "Label for the book with Apple Pay button.");
+}
+
+String AXApplePaySubscribeLabel()
+{
+ return WEB_UI_STRING("Subscribe with Apple Pay", "Label for the subcribe with Apple Pay button.");
+}
+#endif
+
String AXAutoFillCredentialsLabel()
{
return WEB_UI_STRING("password AutoFill", "Label for the AutoFill credentials button inside a text field.");
Modified: trunk/Source/WebCore/platform/LocalizedStrings.h (244060 => 244061)
--- trunk/Source/WebCore/platform/LocalizedStrings.h 2019-04-09 00:42:28 UTC (rev 244060)
+++ trunk/Source/WebCore/platform/LocalizedStrings.h 2019-04-09 00:58:19 UTC (rev 244061)
@@ -213,7 +213,16 @@
String AXMeterGaugeRegionLessGoodText();
#endif
#endif
-
+#if ENABLE(APPLE_PAY)
+ String AXApplePayPlainLabel();
+ String AXApplePayBuyLabel();
+ String AXApplePaySetupLabel();
+ String AXApplePayDonateLabel();
+ String AXApplePayCheckOutLabel();
+ String AXApplePayBookLabel();
+ String AXApplePaySubscribeLabel();
+#endif
+
String AXAutoFillCredentialsLabel();
String AXAutoFillContactsLabel();
String AXAutoFillStrongPasswordLabel();
