<!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>[170634] 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/170634">170634</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-07-01 04:29:24 -0700 (Tue, 01 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove remaining Vector<> copies in WebCore accessibility code
https://bugs.webkit.org/show_bug.cgi?id=133263
Reviewed by Darin Adler.
* accessibility/AXObjectCache.cpp:
(WebCore::AXObjectCache::notificationPostTimerFired): Don't copy the Vector member and
then clear it -- move it into the local variable instead.
* accessibility/AccessibilityNodeObject.cpp:
(WebCore::AccessibilityNodeObject::ariaLabeledByText): Move the axElements Vector into
the AccessibilityText constructor.
(WebCore::AccessibilityNodeObject::stringValue): Create a const reference to the Vector of
HTMLSelectElement's list items instead of copying it.
* accessibility/AccessibilityObject.h:
(WebCore::AccessibilityText::AccessibilityText): Take the Vector parameter by non-const
value and move it into the member variable.
* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::stringValue): Create a const reference to the Vector
of HTMLSelectElement's list items instead of copying it.
(WebCore::AccessibilityRenderObject::ariaSelectedRows): Wrap the AccessibilityChildrenVector
iteration in a lambda. Use it to iterate over either the newly-constructed Vector (in case
the object has the tree role) or the reference to the vector returned by
AccessibilityTable::rows() (in case the object is an AccessibilityTable instance).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAXObjectCachecpp">trunk/Source/WebCore/accessibility/AXObjectCache.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityObjecth">trunk/Source/WebCore/accessibility/AccessibilityObject.h</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170633 => 170634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-07-01 09:10:56 UTC (rev 170633)
+++ trunk/Source/WebCore/ChangeLog 2014-07-01 11:29:24 UTC (rev 170634)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2014-07-01 Zan Dobersek <zdobersek@igalia.com>
+
+ Remove remaining Vector<> copies in WebCore accessibility code
+ https://bugs.webkit.org/show_bug.cgi?id=133263
+
+ Reviewed by Darin Adler.
+
+ * accessibility/AXObjectCache.cpp:
+ (WebCore::AXObjectCache::notificationPostTimerFired): Don't copy the Vector member and
+ then clear it -- move it into the local variable instead.
+ * accessibility/AccessibilityNodeObject.cpp:
+ (WebCore::AccessibilityNodeObject::ariaLabeledByText): Move the axElements Vector into
+ the AccessibilityText constructor.
+ (WebCore::AccessibilityNodeObject::stringValue): Create a const reference to the Vector of
+ HTMLSelectElement's list items instead of copying it.
+ * accessibility/AccessibilityObject.h:
+ (WebCore::AccessibilityText::AccessibilityText): Take the Vector parameter by non-const
+ value and move it into the member variable.
+ * accessibility/AccessibilityRenderObject.cpp:
+ (WebCore::AccessibilityRenderObject::stringValue): Create a const reference to the Vector
+ of HTMLSelectElement's list items instead of copying it.
+ (WebCore::AccessibilityRenderObject::ariaSelectedRows): Wrap the AccessibilityChildrenVector
+ iteration in a lambda. Use it to iterate over either the newly-constructed Vector (in case
+ the object has the tree role) or the reference to the vector returned by
+ AccessibilityTable::rows() (in case the object is an AccessibilityTable instance).
+
</ins><span class="cx"> 2014-06-30 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r170605.
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAXObjectCachecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AXObjectCache.cpp (170633 => 170634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-07-01 09:10:56 UTC (rev 170633)
+++ trunk/Source/WebCore/accessibility/AXObjectCache.cpp 2014-07-01 11:29:24 UTC (rev 170634)
</span><span class="lines">@@ -704,8 +704,7 @@
</span><span class="cx">
</span><span class="cx"> // In DRT, posting notifications has a tendency to immediately queue up other notifications, which can lead to unexpected behavior
</span><span class="cx"> // when the notification list is cleared at the end. Instead copy this list at the start.
</span><del>- auto notifications = m_notificationsToPost;
- m_notificationsToPost.clear();
</del><ins>+ auto notifications = std::move(m_notificationsToPost);
</ins><span class="cx">
</span><span class="cx"> for (const auto& note : notifications) {
</span><span class="cx"> AccessibilityObject* obj = note.first.get();
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityNodeObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp (170633 => 170634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-07-01 09:10:56 UTC (rev 170633)
+++ trunk/Source/WebCore/accessibility/AccessibilityNodeObject.cpp 2014-07-01 11:29:24 UTC (rev 170634)
</span><span class="lines">@@ -1438,7 +1438,7 @@
</span><span class="cx"> axElements.append(axElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- textOrder.append(AccessibilityText(ariaLabeledBy, AlternativeText, axElements));
</del><ins>+ textOrder.append(AccessibilityText(ariaLabeledBy, AlternativeText, std::move(axElements)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1787,7 +1787,7 @@
</span><span class="cx"> if (node->hasTagName(selectTag)) {
</span><span class="cx"> HTMLSelectElement* selectElement = toHTMLSelectElement(node);
</span><span class="cx"> int selectedIndex = selectElement->selectedIndex();
</span><del>- const Vector<HTMLElement*> listItems = selectElement->listItems();
</del><ins>+ const Vector<HTMLElement*>& listItems = selectElement->listItems();
</ins><span class="cx"> if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems.size()) {
</span><span class="cx"> const AtomicString& overriddenDescription = listItems[selectedIndex]->fastGetAttribute(aria_labelAttr);
</span><span class="cx"> if (!overriddenDescription.isNull())
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityObject.h (170633 => 170634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-07-01 09:10:56 UTC (rev 170633)
+++ trunk/Source/WebCore/accessibility/AccessibilityObject.h 2014-07-01 11:29:24 UTC (rev 170634)
</span><span class="lines">@@ -230,10 +230,10 @@
</span><span class="cx"> , textSource(s)
</span><span class="cx"> { }
</span><span class="cx">
</span><del>- AccessibilityText(const String& t, const AccessibilityTextSource& s, const Vector<RefPtr<AccessibilityObject>> elements)
</del><ins>+ AccessibilityText(const String& t, const AccessibilityTextSource& s, Vector<RefPtr<AccessibilityObject>> elements)
</ins><span class="cx"> : text(t)
</span><span class="cx"> , textSource(s)
</span><del>- , textElements(elements)
</del><ins>+ , textElements(std::move(elements))
</ins><span class="cx"> { }
</span><span class="cx">
</span><span class="cx"> AccessibilityText(const String& t, const AccessibilityTextSource& s, const RefPtr<AccessibilityObject> element)
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (170633 => 170634)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-07-01 09:10:56 UTC (rev 170633)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2014-07-01 11:29:24 UTC (rev 170634)
</span><span class="lines">@@ -743,7 +743,7 @@
</span><span class="cx"> // This has to be overridden in the case where the selected item has an ARIA label.
</span><span class="cx"> HTMLSelectElement* selectElement = toHTMLSelectElement(m_renderer->node());
</span><span class="cx"> int selectedIndex = selectElement->selectedIndex();
</span><del>- const Vector<HTMLElement*> listItems = selectElement->listItems();
</del><ins>+ const Vector<HTMLElement*>& listItems = selectElement->listItems();
</ins><span class="cx"> if (selectedIndex >= 0 && static_cast<size_t>(selectedIndex) < listItems.size()) {
</span><span class="cx"> const AtomicString& overriddenDescription = listItems[selectedIndex]->fastGetAttribute(aria_labelAttr);
</span><span class="cx"> if (!overriddenDescription.isNull())
</span><span class="lines">@@ -3108,13 +3108,6 @@
</span><span class="cx">
</span><span class="cx"> void AccessibilityRenderObject::ariaSelectedRows(AccessibilityChildrenVector& result)
</span><span class="cx"> {
</span><del>- // Get all the rows.
- AccessibilityChildrenVector allRows;
- if (isTree())
- ariaTreeRows(allRows);
- else if (isAccessibilityTable() && toAccessibilityTable(this)->supportsSelectedRows())
- allRows = toAccessibilityTable(this)->rows();
-
</del><span class="cx"> // Determine which rows are selected.
</span><span class="cx"> bool isMulti = isMultiSelectable();
</span><span class="cx">
</span><span class="lines">@@ -3126,13 +3119,22 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- for (const auto& row : allRows) {
- if (row->isSelected()) {
- result.append(row);
- if (!isMulti)
- break;
</del><ins>+ // Get all the rows.
+ auto rowsIteration = [&](const AccessibilityChildrenVector& rows) {
+ for (auto& row : rows) {
+ if (row->isSelected()) {
+ result.append(row);
+ if (!isMulti)
+ break;
+ }
</ins><span class="cx"> }
</span><del>- }
</del><ins>+ };
+ if (isTree()) {
+ AccessibilityChildrenVector allRows;
+ ariaTreeRows(allRows);
+ rowsIteration(allRows);
+ } else if (isAccessibilityTable() && toAccessibilityTable(this)->supportsSelectedRows())
+ rowsIteration(toAccessibilityTable(this)->rows());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AccessibilityRenderObject::ariaListboxSelectedChildren(AccessibilityChildrenVector& result)
</span></span></pre>
</div>
</div>
</body>
</html>