<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[282958] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/282958">282958</a></dd>
<dt>Author</dt> <dd>andresg_22@apple.com</dd>
<dt>Date</dt> <dd>2021-09-23 06:08:26 -0700 (Thu, 23 Sep 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>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):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitywinAccessibilityObjectWrapperWincpp">trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacAccessibilityControllerMacmm">trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm</a></li>
<li><a href="#trunkToolsDumpRenderTreewinAccessibilityControllerWincpp">trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp</a></li>
<li><a href="#trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityControllerMacmm">trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (282957 => 282958)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2021-09-23  Andres Gonzalez  <andresg_22@apple.com>
+
+        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):
+
</ins><span class="cx"> 2021-09-23  Tim Nguyen  <ntim@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Use visibleToHitTesting() in RenderLayerBacking::updateAfterDescendants() instead of pointer-events check
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (282957 => 282958)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2831,10 +2831,6 @@
</span><span class="cx">     if ([attributeName isEqualToString:@"AXDRTSpeechAttribute"])
</span><span class="cx">         return [self baseAccessibilitySpeechHint];
</span><span class="cx"> 
</span><del>-    // Used by TestRunner and DRT AccessibilityController to find an accessible node by its element id.
-    if ([attributeName isEqualToString:@"AXDRTElementIdAttribute"])
-        return backingObject->identifierAttribute();
-
</del><span class="cx">     if ([attributeName isEqualToString:@"AXAutocompleteValue"])
</span><span class="cx">         return backingObject->autoCompleteValue();
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitywinAccessibilityObjectWrapperWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/win/AccessibilityObjectWrapperWin.cpp (282957 => 282958)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -56,8 +56,8 @@
</span><span class="cx">         return;
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    // Used by DRT to find an accessible node by its element id.
-    if (attributeName == "AXDRTElementIdAttribute") {
</del><ins>+    // Used to find an accessible node by its element id.
+    if (attributeName == "AXDOMIdentifier") {
</ins><span class="cx">         ASSERT(V_VT(result) == VT_EMPTY);
</span><span class="cx"> 
</span><span class="cx">         V_VT(result) = VT_BSTR;
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (282957 => 282958)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2021-09-23 11:55:27 UTC (rev 282957)
+++ trunk/Tools/ChangeLog       2021-09-23 13:08:26 UTC (rev 282958)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2021-09-23  Andres Gonzalez  <andresg_22@apple.com>
+
+        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):
+
</ins><span class="cx"> 2021-09-23  Sergio Villar Senin  <svillar@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [Flatpak] Use NUMBER_OF_PROCESSORS if already defined
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacAccessibilityControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/AccessibilityControllerMac.mm (282957 => 282958)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> static id findAccessibleObjectById(id obj, NSString *idAttribute)
</span><span class="cx"> {
</span><span class="cx">     BEGIN_AX_OBJC_EXCEPTIONS
</span><del>-    id objIdAttribute = [obj accessibilityAttributeValue:@"AXDRTElementIdAttribute"];
</del><ins>+    id objIdAttribute = [obj accessibilityAttributeValue:@"AXDOMIdentifier"];
</ins><span class="cx">     if ([objIdAttribute isKindOfClass:[NSString class]] && [objIdAttribute isEqualToString:idAttribute])
</span><span class="cx">         return obj;
</span><span class="cx">     END_AX_OBJC_EXCEPTIONS
</span><span class="lines">@@ -90,7 +90,7 @@
</span><span class="cx">     }
</span><span class="cx">     END_AX_OBJC_EXCEPTIONS
</span><span class="cx"> 
</span><del>-    return nullptr;
</del><ins>+    return nil;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> AccessibilityUIElement AccessibilityController::accessibleElementById(JSStringRef idAttributeRef)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreewinAccessibilityControllerWincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/win/AccessibilityControllerWin.cpp (282957 => 282958)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx">         return 0;
</span><span class="cx"> 
</span><span class="cx">     _variant_t value;
</span><del>-    _bstr_t elementIdAttributeKey(L"AXDRTElementIdAttribute");
</del><ins>+    _bstr_t elementIdAttributeKey(L"AXDOMIdentifier");
</ins><span class="cx">     if (SUCCEEDED(comparable->get_attribute(elementIdAttributeKey, &value.GetVARIANT()))) {
</span><span class="cx">         ASSERT(V_VT(&value) == VT_BSTR);
</span><span class="cx">         if (VARCMP_EQ == ::VarBstrCmp(value.bstrVal, idAttribute, LOCALE_USER_DEFAULT, 0))
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnerInjectedBundlemacAccessibilityControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/AccessibilityControllerMac.mm (282957 => 282958)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> static id findAccessibleObjectById(id obj, NSString *idAttribute)
</span><span class="cx"> {
</span><span class="cx">     BEGIN_AX_OBJC_EXCEPTIONS
</span><del>-    id objIdAttribute = [obj accessibilityAttributeValue:@"AXDRTElementIdAttribute"];
</del><ins>+    id objIdAttribute = [obj accessibilityAttributeValue:@"AXDOMIdentifier"];
</ins><span class="cx">     if ([objIdAttribute isKindOfClass:[NSString class]] && [objIdAttribute isEqualToString:idAttribute])
</span><span class="cx">         return obj;
</span><span class="cx">     END_AX_OBJC_EXCEPTIONS
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx">     }
</span><span class="cx">     END_AX_OBJC_EXCEPTIONS
</span><span class="cx"> 
</span><del>-    return nullptr;
</del><ins>+    return nil;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void AccessibilityController::injectAccessibilityPreference(JSStringRef domain, JSStringRef key, JSStringRef value)
</span></span></pre>
</div>
</div>

</body>
</html>