- Revision
- 282958
- Author
- [email protected]
- Date
- 2021-09-23 06:08:26 -0700 (Thu, 23 Sep 2021)
Log Message
Remove AXDRTElementIdAttribute from the AX object platform wrapper interface.
https://bugs.webkit.org/show_bug.cgi?id=230657
<rdar://problem/83424767>
Reviewed by Chris Fleizach.
Source/WebCore:
No change in functionality.
AXDRTElementIdAttribute is a duplicate of AXDOMIdentifier, thus removing
an unnecessary attribute from the platform wrapper's
accessibilityAttributeValue method.
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
* accessibility/win/AccessibilityObjectWrapperWin.cpp:
(WebCore::AccessibilityObjectWrapper::accessibilityAttributeValue):
Tools:
AXDRTElementIdAttribute is a duplicate of AXDOMIdentifier, thus removing
an unnecessary attribute from the platform wrapper's
accessibilityAttributeValue method, and making the corresponding change
to the DRT and WTR accessibilityControllers.
* DumpRenderTree/mac/AccessibilityControllerMac.mm:
(findAccessibleObjectById):
* DumpRenderTree/win/AccessibilityControllerWin.cpp:
(findAccessibleObjectById):
* WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm:
(WTR::findAccessibleObjectById):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (282957 => 282958)
--- trunk/Source/WebCore/ChangeLog 2021-09-23 11:55:27 UTC (rev 282957)
+++ trunk/Source/WebCore/ChangeLog 2021-09-23 13:08:26 UTC (rev 282958)
@@ -1,3 +1,22 @@
+2021-09-23 Andres Gonzalez <[email protected]>
+
+ Remove AXDRTElementIdAttribute from the AX object platform wrapper interface.
+ https://bugs.webkit.org/show_bug.cgi?id=230657
+ <rdar://problem/83424767>
+
+ Reviewed by Chris Fleizach.
+
+ No change in functionality.
+
+ AXDRTElementIdAttribute is a duplicate of AXDOMIdentifier, thus removing
+ an unnecessary attribute from the platform wrapper's
+ accessibilityAttributeValue method.
+
+ * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+ (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+ * accessibility/win/AccessibilityObjectWrapperWin.cpp:
+ (WebCore::AccessibilityObjectWrapper::accessibilityAttributeValue):
+
2021-09-23 Tim Nguyen <[email protected]>
Use visibleToHitTesting() in RenderLayerBacking::updateAfterDescendants() instead of pointer-events check
Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (282957 => 282958)
--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2021-09-23 11:55:27 UTC (rev 282957)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm 2021-09-23 13:08:26 UTC (rev 282958)
@@ -2831,10 +2831,6 @@
if ([attributeName isEqualToString:@"AXDRTSpeechAttribute"])
return [self baseAccessibilitySpeechHint];
- // Used by TestRunner and DRT AccessibilityController to find an accessible node by its element id.
- if ([attributeName isEqualToString:@"AXDRTElementIdAttribute"])
- return backingObject->identifierAttribute();
-
if ([attributeName isEqualToString:@"AXAutocompleteValue"])
return backingObject->autoCompleteValue();
Modified: trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp (282957 => 282958)
--- trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp 2021-09-23 11:55:27 UTC (rev 282957)
+++ trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp 2021-09-23 13:08:26 UTC (rev 282958)
@@ -56,8 +56,8 @@
return;
}
- // Used by DRT to find an accessible node by its element id.
- if (attributeName == "AXDRTElementIdAttribute") {
+ // Used to find an accessible node by its element id.
+ if (attributeName == "AXDOMIdentifier") {
ASSERT(V_VT(result) == VT_EMPTY);
V_VT(result) = VT_BSTR;
Modified: trunk/Tools/ChangeLog (282957 => 282958)
--- trunk/Tools/ChangeLog 2021-09-23 11:55:27 UTC (rev 282957)
+++ trunk/Tools/ChangeLog 2021-09-23 13:08:26 UTC (rev 282958)
@@ -1,3 +1,23 @@
+2021-09-23 Andres Gonzalez <[email protected]>
+
+ Remove AXDRTElementIdAttribute from the AX object platform wrapper interface.
+ https://bugs.webkit.org/show_bug.cgi?id=230657
+ <rdar://problem/83424767>
+
+ Reviewed by Chris Fleizach.
+
+ AXDRTElementIdAttribute is a duplicate of AXDOMIdentifier, thus removing
+ an unnecessary attribute from the platform wrapper's
+ accessibilityAttributeValue method, and making the corresponding change
+ to the DRT and WTR accessibilityControllers.
+
+ * DumpRenderTree/mac/AccessibilityControllerMac.mm:
+ (findAccessibleObjectById):
+ * DumpRenderTree/win/AccessibilityControllerWin.cpp:
+ (findAccessibleObjectById):
+ * WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm:
+ (WTR::findAccessibleObjectById):
+
2021-09-23 Sergio Villar Senin <[email protected]>
[Flatpak] Use NUMBER_OF_PROCESSORS if already defined
Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm (282957 => 282958)
--- trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm 2021-09-23 11:55:27 UTC (rev 282957)
+++ trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm 2021-09-23 13:08:26 UTC (rev 282958)
@@ -75,7 +75,7 @@
static id findAccessibleObjectById(id obj, NSString *idAttribute)
{
BEGIN_AX_OBJC_EXCEPTIONS
- id objIdAttribute = [obj accessibilityAttributeValue:@"AXDRTElementIdAttribute"];
+ id objIdAttribute = [obj accessibilityAttributeValue:@"AXDOMIdentifier"];
if ([objIdAttribute isKindOfClass:[NSString class]] && [objIdAttribute isEqualToString:idAttribute])
return obj;
END_AX_OBJC_EXCEPTIONS
@@ -90,7 +90,7 @@
}
END_AX_OBJC_EXCEPTIONS
- return nullptr;
+ return nil;
}
AccessibilityUIElement AccessibilityController::accessibleElementById(JSStringRef idAttributeRef)
Modified: trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (282957 => 282958)
--- trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2021-09-23 11:55:27 UTC (rev 282957)
+++ trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp 2021-09-23 13:08:26 UTC (rev 282958)
@@ -83,7 +83,7 @@
return 0;
_variant_t value;
- _bstr_t elementIdAttributeKey(L"AXDRTElementIdAttribute");
+ _bstr_t elementIdAttributeKey(L"AXDOMIdentifier");
if (SUCCEEDED(comparable->get_attribute(elementIdAttributeKey, &value.GetVARIANT()))) {
ASSERT(V_VT(&value) == VT_BSTR);
if (VARCMP_EQ == ::VarBstrCmp(value.bstrVal, idAttribute, LOCALE_USER_DEFAULT, 0))
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm (282957 => 282958)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm 2021-09-23 11:55:27 UTC (rev 282957)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm 2021-09-23 13:08:26 UTC (rev 282958)
@@ -82,7 +82,7 @@
static id findAccessibleObjectById(id obj, NSString *idAttribute)
{
BEGIN_AX_OBJC_EXCEPTIONS
- id objIdAttribute = [obj accessibilityAttributeValue:@"AXDRTElementIdAttribute"];
+ id objIdAttribute = [obj accessibilityAttributeValue:@"AXDOMIdentifier"];
if ([objIdAttribute isKindOfClass:[NSString class]] && [objIdAttribute isEqualToString:idAttribute])
return obj;
END_AX_OBJC_EXCEPTIONS
@@ -97,7 +97,7 @@
}
END_AX_OBJC_EXCEPTIONS
- return nullptr;
+ return nil;
}
void AccessibilityController::injectAccessibilityPreference(JSStringRef domain, JSStringRef key, JSStringRef value)
