- Revision
- 285371
- Author
- [email protected]
- Date
- 2021-11-06 08:51:47 -0700 (Sat, 06 Nov 2021)
Log Message
AX: Rename usages DefinitionList to DescriptionList and DescriptionListDefinition to DescriptionListDetail
https://bugs.webkit.org/show_bug.cgi?id=232775
Patch by Tyler Wilcock <[email protected]> on 2021-11-06
Reviewed by Chris Fleizach.
Rename usages of "definition list" to "description list" and
DescriptionListDefinition to DescriptionListDetail, as the latter
versions of each pair are what the corresponding HTML elements are
actually called.
Tools:
https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
https://html.spec.whatwg.org/multipage/grouping-content.html#the-dd-element
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
(WTR::AccessibilityUIElement::isInDescriptionListDetail const): Added.
(WTR::AccessibilityUIElement::isInDescriptionListTerm const): Added.
(WTR::AccessibilityUIElement::isInDefinitionListDefinition const): Deleted.
(WTR::AccessibilityUIElement::isInDefinitionListTerm const): Deleted.
* WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
* WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
Rename isInDefinitionListDefinition to isInDescriptionListDetail and
isInDefinitionListTerm to isInDescriptionListTerm.
* WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
(WTR::AccessibilityUIElement::isInDescriptionListDetail const): Added.
(WTR::AccessibilityUIElement::isInDescriptionListTerm const): Added.
(WTR::AccessibilityUIElement::isInDefinitionListDefinition const): Deleted.
(WTR::AccessibilityUIElement::isInDefinitionListTerm const): Deleted.
LayoutTests:
Note this patch does this renaming everywhere except the interface
layers, e.g. WebAccessibilityObjectWrapperIOS.
https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
https://html.spec.whatwg.org/multipage/grouping-content.html#the-dd-element
* accessibility/ios-simulator/description-list-expected.txt: Renamed from LayoutTests/accessibility/ios-simulator/definition-list-expected.txt.
* accessibility/ios-simulator/description-list.html: Renamed from LayoutTests/accessibility/ios-simulator/definition-list.html.
Modified Paths
Added Paths
Removed Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (285370 => 285371)
--- trunk/LayoutTests/ChangeLog 2021-11-06 13:24:49 UTC (rev 285370)
+++ trunk/LayoutTests/ChangeLog 2021-11-06 15:51:47 UTC (rev 285371)
@@ -1,3 +1,24 @@
+2021-11-06 Tyler Wilcock <[email protected]>
+
+ AX: Rename usages DefinitionList to DescriptionList and DescriptionListDefinition to DescriptionListDetail
+ https://bugs.webkit.org/show_bug.cgi?id=232775
+
+ Reviewed by Chris Fleizach.
+
+ Rename usages of "definition list" to "description list" and
+ DescriptionListDefinition to DescriptionListDetail, as the latter
+ versions of each pair are what the corresponding HTML elements are
+ actually called.
+
+ Note this patch does this renaming everywhere except the interface
+ layers, e.g. WebAccessibilityObjectWrapperIOS.
+
+ https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
+ https://html.spec.whatwg.org/multipage/grouping-content.html#the-dd-element
+
+ * accessibility/ios-simulator/description-list-expected.txt: Renamed from LayoutTests/accessibility/ios-simulator/definition-list-expected.txt.
+ * accessibility/ios-simulator/description-list.html: Renamed from LayoutTests/accessibility/ios-simulator/definition-list.html.
+
2021-11-06 Tim Nguyen <[email protected]>
Re-import html/semantics/interactive-elements/the-dialog-element WPT
Deleted: trunk/LayoutTests/accessibility/ios-simulator/definition-list-expected.txt (285370 => 285371)
--- trunk/LayoutTests/accessibility/ios-simulator/definition-list-expected.txt 2021-11-06 13:24:49 UTC (rev 285370)
+++ trunk/LayoutTests/accessibility/ios-simulator/definition-list-expected.txt 2021-11-06 15:51:47 UTC (rev 285371)
@@ -1,13 +0,0 @@
-term 1
-def 1
-This tests that the definition lists are exposed on ios.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS term.isInDefinitionListTerm is true
-PASS def.isInDefinitionListDefinition is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
Deleted: trunk/LayoutTests/accessibility/ios-simulator/definition-list.html (285370 => 285371)
--- trunk/LayoutTests/accessibility/ios-simulator/definition-list.html 2021-11-06 13:24:49 UTC (rev 285370)
+++ trunk/LayoutTests/accessibility/ios-simulator/definition-list.html 2021-11-06 15:51:47 UTC (rev 285371)
@@ -1,37 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
-<head>
-<script>
-var successfullyParsed = false;
-</script>
-<script src=""
-</head>
-<body id="body">
-
-<dl>
-<dt id="term"><b>term 1</b></dt>
-<dd id="def">def 1</dd>
-</dl>
-
-<p id="description"></p>
-<div id="console"></div>
-
-<script>
-
- description("This tests that the definition lists are exposed on ios.");
-
- if (window.accessibilityController) {
-
- var term = accessibilityController.accessibleElementById("term").childAtIndex(0);
- var def = accessibilityController.accessibleElementById("def").childAtIndex(0);
- shouldBeTrue("term.isInDefinitionListTerm");
- shouldBeTrue("def.isInDefinitionListDefinition");
- }
-
- successfullyParsed = true;
-</script>
-
-<script src=""
-</body>
-</html>
-
Copied: trunk/LayoutTests/accessibility/ios-simulator/description-list-expected.txt (from rev 285370, trunk/LayoutTests/accessibility/ios-simulator/definition-list-expected.txt) (0 => 285371)
--- trunk/LayoutTests/accessibility/ios-simulator/description-list-expected.txt (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/description-list-expected.txt 2021-11-06 15:51:47 UTC (rev 285371)
@@ -0,0 +1,13 @@
+term 1
+def 1
+This tests that description lists are exposed on iOS.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS term.isInDescriptionListTerm is true
+PASS def.isInDescriptionListDetail is true
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
Copied: trunk/LayoutTests/accessibility/ios-simulator/description-list.html (from rev 285370, trunk/LayoutTests/accessibility/ios-simulator/definition-list.html) (0 => 285371)
--- trunk/LayoutTests/accessibility/ios-simulator/description-list.html (rev 0)
+++ trunk/LayoutTests/accessibility/ios-simulator/description-list.html 2021-11-06 15:51:47 UTC (rev 285371)
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
+<html>
+<head>
+<script>
+var successfullyParsed = false;
+</script>
+<script src=""
+</head>
+<body id="body">
+
+<dl>
+<dt id="term"><b>term 1</b></dt>
+<dd id="def">def 1</dd>
+</dl>
+
+<p id="description"></p>
+<div id="console"></div>
+
+<script>
+
+ description("This tests that description lists are exposed on iOS.");
+
+ if (window.accessibilityController) {
+
+ var term = accessibilityController.accessibleElementById("term").childAtIndex(0);
+ var def = accessibilityController.accessibleElementById("def").childAtIndex(0);
+ shouldBeTrue("term.isInDescriptionListTerm");
+ shouldBeTrue("def.isInDescriptionListDetail");
+ }
+
+ successfullyParsed = true;
+</script>
+
+<script src=""
+</body>
+</html>
+
Modified: trunk/Tools/ChangeLog (285370 => 285371)
--- trunk/Tools/ChangeLog 2021-11-06 13:24:49 UTC (rev 285370)
+++ trunk/Tools/ChangeLog 2021-11-06 15:51:47 UTC (rev 285371)
@@ -1,3 +1,33 @@
+2021-11-06 Tyler Wilcock <[email protected]>
+
+ AX: Rename usages DefinitionList to DescriptionList and DescriptionListDefinition to DescriptionListDetail
+ https://bugs.webkit.org/show_bug.cgi?id=232775
+
+ Reviewed by Chris Fleizach.
+
+ Rename usages of "definition list" to "description list" and
+ DescriptionListDefinition to DescriptionListDetail, as the latter
+ versions of each pair are what the corresponding HTML elements are
+ actually called.
+
+ https://html.spec.whatwg.org/multipage/grouping-content.html#the-dl-element
+ https://html.spec.whatwg.org/multipage/grouping-content.html#the-dd-element
+
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp:
+ (WTR::AccessibilityUIElement::isInDescriptionListDetail const): Added.
+ (WTR::AccessibilityUIElement::isInDescriptionListTerm const): Added.
+ (WTR::AccessibilityUIElement::isInDefinitionListDefinition const): Deleted.
+ (WTR::AccessibilityUIElement::isInDefinitionListTerm const): Deleted.
+ * WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h:
+ * WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl:
+ Rename isInDefinitionListDefinition to isInDescriptionListDetail and
+ isInDefinitionListTerm to isInDescriptionListTerm.
+ * WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm:
+ (WTR::AccessibilityUIElement::isInDescriptionListDetail const): Added.
+ (WTR::AccessibilityUIElement::isInDescriptionListTerm const): Added.
+ (WTR::AccessibilityUIElement::isInDefinitionListDefinition const): Deleted.
+ (WTR::AccessibilityUIElement::isInDefinitionListTerm const): Deleted.
+
2021-11-05 Wenson Hsieh <[email protected]>
[iOS] Mail compose becomes unresponsive after pasting in text and attempting to type
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp (285370 => 285371)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2021-11-06 13:24:49 UTC (rev 285370)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.cpp 2021-11-06 15:51:47 UTC (rev 285371)
@@ -82,8 +82,8 @@
bool AccessibilityUIElement::hasContainedByFieldsetTrait() { return false; }
RefPtr<AccessibilityUIElement> AccessibilityUIElement::fieldsetAncestorElement() { return nullptr; }
bool AccessibilityUIElement::isSearchField() const { return false; }
-bool AccessibilityUIElement::isInDefinitionListDefinition() const { return false; }
-bool AccessibilityUIElement::isInDefinitionListTerm() const { return false; }
+bool AccessibilityUIElement::isInDescriptionListDetail() const { return false; }
+bool AccessibilityUIElement::isInDescriptionListTerm() const { return false; }
bool AccessibilityUIElement::isTextArea() const { return false; }
RefPtr<AccessibilityTextMarkerRange> AccessibilityUIElement::textMarkerRangeMatchesTextNearMarkers(JSStringRef, AccessibilityTextMarker*, AccessibilityTextMarker*) { return nullptr; }
JSRetainPtr<JSStringRef> AccessibilityUIElement::attributedStringForElement() { return nullptr; }
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h (285370 => 285371)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2021-11-06 13:24:49 UTC (rev 285370)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/AccessibilityUIElement.h 2021-11-06 15:51:47 UTC (rev 285371)
@@ -380,8 +380,8 @@
void assistiveTechnologySimulatedFocus();
bool isSearchField() const;
bool isTextArea() const;
- bool isInDefinitionListDefinition() const;
- bool isInDefinitionListTerm() const;
+ bool isInDescriptionListDetail() const;
+ bool isInDescriptionListTerm() const;
bool scrollPageUp();
bool scrollPageDown();
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl (285370 => 285371)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2021-11-06 13:24:49 UTC (rev 285370)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/Bindings/AccessibilityUIElement.idl 2021-11-06 15:51:47 UTC (rev 285371)
@@ -285,8 +285,8 @@
undefined assistiveTechnologySimulatedFocus();
readonly attribute boolean isSearchField;
readonly attribute boolean isTextArea;
- readonly attribute boolean isInDefinitionListDefinition;
- readonly attribute boolean isInDefinitionListTerm;
+ readonly attribute boolean isInDescriptionListDetail;
+ readonly attribute boolean isInDescriptionListTerm;
// Fieldset
readonly attribute boolean hasContainedByFieldsetTrait;
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm (285370 => 285371)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2021-11-06 13:24:49 UTC (rev 285370)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/AccessibilityUIElementIOS.mm 2021-11-06 15:51:47 UTC (rev 285371)
@@ -837,12 +837,14 @@
return ([m_element accessibilityTraits] & [m_element _axSearchFieldTrait]) == [m_element _axSearchFieldTrait];
}
-bool AccessibilityUIElement::isInDefinitionListDefinition() const
+bool AccessibilityUIElement::isInDescriptionListDetail() const
{
+ // The names are inconsistent here (isInDescriptionListDetail vs. isInDescriptionListDefinition)
+ // because the iOS interface requires the latter form.
return [m_element accessibilityIsInDescriptionListDefinition];
}
-bool AccessibilityUIElement::isInDefinitionListTerm() const
+bool AccessibilityUIElement::isInDescriptionListTerm() const
{
return [m_element accessibilityIsInDescriptionListTerm];
}
