<!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>[283680] trunk/Source/WebCore</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/283680">283680</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-10-06 16:56:16 -0700 (Wed, 06 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: Make AccessibilityObjectInterface::contents return-by-value instead of return-by-out-parameter
https://bugs.webkit.org/show_bug.cgi?id=231289

Patch by Tyler Wilcock <tyler_w@apple.com> on 2021-10-06
Reviewed by Darin Adler.

Make AccessibilityObjectInterface::contents return-by-value instead of
return-by-out-parameter as this is more ergonomic.

* accessibility/AccessibilityObject.cpp:
(WebCore::AccessibilityObject::contents):
* accessibility/AccessibilityObject.h:
* accessibility/AccessibilityObjectInterface.h:
* accessibility/isolatedtree/AXIsolatedObject.cpp:
(WebCore::AXIsolatedObject::initializeAttributeData):
(WebCore::AXIsolatedObject::contents):
* accessibility/isolatedtree/AXIsolatedObject.h:
* accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
(-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjectInterfaceh">trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityisolatedtreeAXIsolatedObjectcpp">trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityisolatedtreeAXIsolatedObjecth">trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm">trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (283679 => 283680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-06 23:49:33 UTC (rev 283679)
+++ trunk/Source/WebCore/ChangeLog      2021-10-06 23:56:16 UTC (rev 283680)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-10-06  Tyler Wilcock  <tyler_w@apple.com>
+
+        AX: Make AccessibilityObjectInterface::contents return-by-value instead of return-by-out-parameter
+        https://bugs.webkit.org/show_bug.cgi?id=231289
+
+        Reviewed by Darin Adler.
+
+        Make AccessibilityObjectInterface::contents return-by-value instead of
+        return-by-out-parameter as this is more ergonomic.
+
+        * accessibility/AccessibilityObject.cpp:
+        (WebCore::AccessibilityObject::contents):
+        * accessibility/AccessibilityObject.h:
+        * accessibility/AccessibilityObjectInterface.h:
+        * accessibility/isolatedtree/AXIsolatedObject.cpp:
+        (WebCore::AXIsolatedObject::initializeAttributeData):
+        (WebCore::AXIsolatedObject::contents):
+        * accessibility/isolatedtree/AXIsolatedObject.h:
+        * accessibility/mac/WebAccessibilityObjectWrapperMac.mm:
+        (-[WebAccessibilityObjectWrapper accessibilityAttributeValue:]):
+
</ins><span class="cx"> 2021-10-06  Sihui Liu  <sihui_liu@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Add support for FileSystemSyncAccessHandle
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.cpp (283679 => 283680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.cpp       2021-10-06 23:49:33 UTC (rev 283679)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.cpp  2021-10-06 23:56:16 UTC (rev 283680)
</span><span class="lines">@@ -3150,18 +3150,24 @@
</span><span class="cx">     return IntRect();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void AccessibilityObject::contents(AccessibilityChildrenVector& result)
</del><ins>+AXCoreObject::AccessibilityChildrenVector AccessibilityObject::contents()
</ins><span class="cx"> {
</span><del>-    if (isTabList())
-        tabChildren(result);
-    else if (isScrollView()) {
</del><ins>+    if (isTabList()) {
+        AccessibilityChildrenVector tabs;
+        tabChildren(tabs);
+        return tabs;
+    }
+    
+    if (isScrollView()) {
</ins><span class="cx">         // A scroll view's contents are everything except the scroll bars.
</span><span class="cx">         AccessibilityChildrenVector nonScrollbarChildren;
</span><del>-        for (RefPtr<AccessibilityObject> child = firstChild(); child; child = child->nextSibling()) {
</del><ins>+        for (auto* child = firstChild(); child; child = child->nextSibling()) {
</ins><span class="cx">             if (child && !child->isScrollbar())
</span><del>-                result.append(child);
</del><ins>+                nonScrollbarChildren.append(child);
</ins><span class="cx">         }
</span><ins>+        return nonScrollbarChildren;
</ins><span class="cx">     }
</span><ins>+    return { };
</ins><span class="cx"> }
</span><span class="cx">     
</span><span class="cx"> IntSize AccessibilityObject::scrollContentsSize() const
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (283679 => 283680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2021-10-06 23:49:33 UTC (rev 283679)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h    2021-10-06 23:56:16 UTC (rev 283680)
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> 
</span><span class="cx">     bool scrollByPage(ScrollByPageDirection) const override;
</span><span class="cx">     IntPoint scrollPosition() const override;
</span><del>-    void contents(AccessibilityChildrenVector&) override;
</del><ins>+    AccessibilityChildrenVector contents() override;
</ins><span class="cx">     IntSize scrollContentsSize() const override;
</span><span class="cx">     IntRect scrollVisibleContentRect() const override;
</span><span class="cx">     void scrollToMakeVisible(const ScrollRectToVisibleOptions&) const override;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjectInterfaceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h (283679 => 283680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h        2021-10-06 23:49:33 UTC (rev 283679)
+++ trunk/Source/WebCore/accessibility/AccessibilityObjectInterface.h   2021-10-06 23:56:16 UTC (rev 283680)
</span><span class="lines">@@ -1374,7 +1374,7 @@
</span><span class="cx">     enum class ScrollByPageDirection { Up, Down, Left, Right };
</span><span class="cx">     virtual bool scrollByPage(ScrollByPageDirection) const = 0;
</span><span class="cx">     virtual IntPoint scrollPosition() const = 0;
</span><del>-    virtual void contents(AccessibilityChildrenVector&) = 0;
</del><ins>+    virtual AccessibilityChildrenVector contents() = 0;
</ins><span class="cx">     virtual IntSize scrollContentsSize() const = 0;
</span><span class="cx">     virtual IntRect scrollVisibleContentRect() const = 0;
</span><span class="cx">     virtual void scrollToMakeVisible(const ScrollRectToVisibleOptions&) const = 0;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityisolatedtreeAXIsolatedObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp (283679 => 283680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp     2021-10-06 23:49:33 UTC (rev 283679)
+++ trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.cpp        2021-10-06 23:56:16 UTC (rev 283680)
</span><span class="lines">@@ -298,9 +298,7 @@
</span><span class="cx">     if (object.isImage())
</span><span class="cx">         setProperty(AXPropertyName::EmbeddedImageDescription, object.embeddedImageDescription().isolatedCopy());
</span><span class="cx"> 
</span><del>-    AccessibilityChildrenVector contents;
-    object.contents(contents);
-    setObjectVectorProperty(AXPropertyName::Contents, contents);
</del><ins>+    setObjectVectorProperty(AXPropertyName::Contents, object.contents());
</ins><span class="cx"> 
</span><span class="cx">     AccessibilityChildrenVector visibleChildren;
</span><span class="cx">     object.visibleChildren(visibleChildren);
</span><span class="lines">@@ -560,6 +558,13 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+AXCoreObject::AccessibilityChildrenVector AXIsolatedObject::contents()
+{
+    AccessibilityChildrenVector result;
+    fillChildrenVectorForProperty(AXPropertyName::Contents, result);
+    return result;
+}
+
</ins><span class="cx"> bool AXIsolatedObject::isDetachedFromParent()
</span><span class="cx"> {
</span><span class="cx">     if (parent() != InvalidAXID)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityisolatedtreeAXIsolatedObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h (283679 => 283680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h       2021-10-06 23:49:33 UTC (rev 283679)
+++ trunk/Source/WebCore/accessibility/isolatedtree/AXIsolatedObject.h  2021-10-06 23:56:16 UTC (rev 283680)
</span><span class="lines">@@ -348,7 +348,7 @@
</span><span class="cx">     void setSelectedChildren(const AccessibilityChildrenVector&) override;
</span><span class="cx">     void visibleChildren(AccessibilityChildrenVector& children) override { fillChildrenVectorForProperty(AXPropertyName::VisibleChildren, children); }
</span><span class="cx">     void tabChildren(AccessibilityChildrenVector& children) override { fillChildrenVectorForProperty(AXPropertyName::TabChildren, children); }
</span><del>-    void contents(AccessibilityChildrenVector& children) override { fillChildrenVectorForProperty(AXPropertyName::Contents, children); }
</del><ins>+    AccessibilityChildrenVector contents() override;
</ins><span class="cx">     bool hasARIAValueNow() const override { return boolAttributeValue(AXPropertyName::HasARIAValueNow); }
</span><span class="cx">     String tagName() const override { return stringAttributeValue(AXPropertyName::TagName); }
</span><span class="cx">     const AccessibilityChildrenVector& children(bool updateChildrenIfNeeded = true) override;
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilitymacWebAccessibilityObjectWrapperMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm (283679 => 283680)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm       2021-10-06 23:49:33 UTC (rev 283679)
+++ trunk/Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperMac.mm  2021-10-06 23:56:16 UTC (rev 283680)
</span><span class="lines">@@ -2380,11 +2380,8 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if ([attributeName isEqualToString:NSAccessibilityContentsAttribute]) {
-        AccessibilityObject::AccessibilityChildrenVector contents;
-        backingObject->contents(contents);
-        return convertToNSArray(contents);
-    }
</del><ins>+    if ([attributeName isEqualToString:NSAccessibilityContentsAttribute])
+        return convertToNSArray(backingObject->contents());
</ins><span class="cx"> 
</span><span class="cx">     if (backingObject->isTable() && backingObject->isExposable()) {
</span><span class="cx">         if ([attributeName isEqualToString:NSAccessibilityRowsAttribute])
</span></span></pre>
</div>
</div>

</body>
</html>