<!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>[208600] 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/208600">208600</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2016-11-11 11:11:28 -0800 (Fri, 11 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow mutable lambdas in HashMap::ensure
https://bugs.webkit.org/show_bug.cgi?id=164642
Reviewed by Sam Weinig.
Source/WTF:
* wtf/HashMap.h:
(WTF::HashMapEnsureTranslator::translate):
(WTF::X>::removeIf):
Tools:
* TestWebKitAPI/Tests/WTF/HashMap.cpp:
(TestWebKitAPI::TEST):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHashMaph">trunk/Source/WTF/wtf/HashMap.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashMapcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (208599 => 208600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-11-11 19:09:01 UTC (rev 208599)
+++ trunk/Source/WTF/ChangeLog 2016-11-11 19:11:28 UTC (rev 208600)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-11-11 Alex Christensen <achristensen@webkit.org>
+
+ Allow mutable lambdas in HashMap::ensure
+ https://bugs.webkit.org/show_bug.cgi?id=164642
+
+ Reviewed by Sam Weinig.
+
+ * wtf/HashMap.h:
+ (WTF::HashMapEnsureTranslator::translate):
+ (WTF::X>::removeIf):
+
</ins><span class="cx"> 2016-11-11 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Get touch bar code building for open source builds
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashMaph"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashMap.h (208599 => 208600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashMap.h 2016-11-11 19:09:01 UTC (rev 208599)
+++ trunk/Source/WTF/wtf/HashMap.h 2016-11-11 19:11:28 UTC (rev 208600)
</span><span class="lines">@@ -122,13 +122,13 @@
</span><span class="cx"> template<typename V> AddResult fastAdd(const KeyType&, V&&);
</span><span class="cx"> template<typename V> AddResult fastAdd(KeyType&&, V&&);
</span><span class="cx">
</span><del>- template<typename Functor> AddResult ensure(const KeyType&, const Functor&);
- template<typename Functor> AddResult ensure(KeyType&&, const Functor&);
</del><ins>+ template<typename Functor> AddResult ensure(const KeyType&, Functor&&);
+ template<typename Functor> AddResult ensure(KeyType&&, Functor&&);
</ins><span class="cx">
</span><span class="cx"> bool remove(const KeyType&);
</span><span class="cx"> bool remove(iterator);
</span><span class="cx"> template<typename Functor>
</span><del>- void removeIf(const Functor& functor);
</del><ins>+ void removeIf(Functor&&);
</ins><span class="cx"> void clear();
</span><span class="cx">
</span><span class="cx"> MappedTakeType take(const KeyType&); // efficient combination of get with remove
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> AddResult inlineAdd(K&&, V&&);
</span><span class="cx">
</span><span class="cx"> template<typename K, typename F>
</span><del>- AddResult inlineEnsure(K&&, const F&);
</del><ins>+ AddResult inlineEnsure(K&&, F&&);
</ins><span class="cx">
</span><span class="cx"> HashTableType m_impl;
</span><span class="cx"> };
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> struct HashMapEnsureTranslator {
</span><span class="cx"> template<typename T> static unsigned hash(const T& key) { return HashFunctions::hash(key); }
</span><span class="cx"> template<typename T, typename U> static bool equal(const T& a, const U& b) { return HashFunctions::equal(a, b); }
</span><del>- template<typename T, typename U, typename Functor> static void translate(T& location, U&& key, const Functor& functor)
</del><ins>+ template<typename T, typename U, typename Functor> static void translate(T& location, U&& key, Functor&& functor)
</ins><span class="cx"> {
</span><span class="cx"> ValueTraits::KeyTraits::assignToEmpty(location.key, std::forward<U>(key));
</span><span class="cx"> ValueTraits::ValueTraits::assignToEmpty(location.value, functor());
</span><span class="lines">@@ -319,9 +319,9 @@
</span><span class="cx">
</span><span class="cx"> template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
</span><span class="cx"> template<typename K, typename F>
</span><del>-ALWAYS_INLINE auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::inlineEnsure(K&& key, const F& functor) -> AddResult
</del><ins>+ALWAYS_INLINE auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::inlineEnsure(K&& key, F&& functor) -> AddResult
</ins><span class="cx"> {
</span><del>- return m_impl.template add<HashMapEnsureTranslator<KeyValuePairTraits, HashFunctions>>(std::forward<K>(key), functor);
</del><ins>+ return m_impl.template add<HashMapEnsureTranslator<KeyValuePairTraits, HashFunctions>>(std::forward<K>(key), std::forward<F>(functor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
</span><span class="lines">@@ -375,16 +375,16 @@
</span><span class="cx">
</span><span class="cx"> template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
</span><span class="cx"> template<typename Functor>
</span><del>-auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::ensure(const KeyType& key, const Functor& functor) -> AddResult
</del><ins>+auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::ensure(const KeyType& key, Functor&& functor) -> AddResult
</ins><span class="cx"> {
</span><del>- return inlineEnsure(key, functor);
</del><ins>+ return inlineEnsure(key, std::forward<Functor>(functor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename KeyArg, typename MappedArg, typename HashArg, typename KeyTraitsArg, typename MappedTraitsArg>
</span><span class="cx"> template<typename Functor>
</span><del>-auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::ensure(KeyType&& key, const Functor& functor) -> AddResult
</del><ins>+auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::ensure(KeyType&& key, Functor&& functor) -> AddResult
</ins><span class="cx"> {
</span><del>- return inlineEnsure(WTFMove(key), functor);
</del><ins>+ return inlineEnsure(std::forward<KeyType>(key), std::forward<Functor>(functor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V, typename W, typename MappedTraits>
</span><span class="lines">@@ -417,9 +417,9 @@
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V, typename W, typename X>
</span><span class="cx"> template<typename Functor>
</span><del>-inline void HashMap<T, U, V, W, X>::removeIf(const Functor& functor)
</del><ins>+inline void HashMap<T, U, V, W, X>::removeIf(Functor&& functor)
</ins><span class="cx"> {
</span><del>- m_impl.removeIf(functor);
</del><ins>+ m_impl.removeIf(std::forward<Functor>(functor));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V, typename W, typename X>
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (208599 => 208600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-11-11 19:09:01 UTC (rev 208599)
+++ trunk/Tools/ChangeLog 2016-11-11 19:11:28 UTC (rev 208600)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-11-11 Alex Christensen <achristensen@webkit.org>
+
+ Allow mutable lambdas in HashMap::ensure
+ https://bugs.webkit.org/show_bug.cgi?id=164642
+
+ Reviewed by Sam Weinig.
+
+ * TestWebKitAPI/Tests/WTF/HashMap.cpp:
+ (TestWebKitAPI::TEST):
+
</ins><span class="cx"> 2016-11-11 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Composition state should be cleared when changing focus to a non-editable element
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp (208599 => 208600)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2016-11-11 19:09:01 UTC (rev 208599)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2016-11-11 19:11:28 UTC (rev 208600)
</span><span class="lines">@@ -895,7 +895,7 @@
</span><span class="cx"> HashMap<int, Ref<RefLogger>> map;
</span><span class="cx">
</span><span class="cx"> RefLogger a("a");
</span><del>- map.ensure(1, [&]() {
</del><ins>+ map.ensure(1, [&]() mutable {
</ins><span class="cx"> Ref<RefLogger> ref(a);
</span><span class="cx"> return ref;
</span><span class="cx"> });
</span></span></pre>
</div>
</div>
</body>
</html>