<!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>[197317] releases/WebKitGTK/webkit-2.12</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/197317">197317</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-02-29 01:13:03 -0800 (Mon, 29 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/197123">r197123</a> - HashMap::ensure() should return an AddResult like all the other add-like functions.
https://bugs.webkit.org/show_bug.cgi?id=154680
Reviewed by Anders Carlsson.
While adopting HashMap::ensure(), I found it was useful in some circumstances to know
if the value was added or not. While I could discern this information by setting a bool
in the passed in lambda, it seemed clearer and more idiomatic to just have ensure return
an AddResult like all the other add-like functions do.
* wtf/HashMap.h:
Change return type of HashMap::ensure() to be an AddResult.
Tools:
HashMap::ensure() should return an AddResult like all the other add-like functions
https://bugs.webkit.org/show_bug.cgi?id=154680
Reviewed by Anders Carlsson.
* TestWebKitAPI/Tests/WTF/HashMap.cpp:
(TestWebKitAPI::TEST):
Update tests to use/test the new AddResult result.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceWTFChangeLog">releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWTFwtfHashMaph">releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/HashMap.h</a></li>
<li><a href="#releasesWebKitGTKwebkit212ToolsChangeLog">releases/WebKitGTK/webkit-2.12/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212ToolsTestWebKitAPITestsWTFHashMapcpp">releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog (197316 => 197317)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog 2016-02-29 08:36:53 UTC (rev 197316)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/ChangeLog 2016-02-29 09:13:03 UTC (rev 197317)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-02-25 Sam Weinig <sam@webkit.org>
+
+ HashMap::ensure() should return an AddResult like all the other add-like functions.
+ https://bugs.webkit.org/show_bug.cgi?id=154680
+
+ Reviewed by Anders Carlsson.
+
+ While adopting HashMap::ensure(), I found it was useful in some circumstances to know
+ if the value was added or not. While I could discern this information by setting a bool
+ in the passed in lambda, it seemed clearer and more idiomatic to just have ensure return
+ an AddResult like all the other add-like functions do.
+
+ * wtf/HashMap.h:
+ Change return type of HashMap::ensure() to be an AddResult.
+
</ins><span class="cx"> 2016-02-20 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> Use of inlined asm statements causes problems for -std=c99 builds.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWTFwtfHashMaph"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/HashMap.h (197316 => 197317)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/HashMap.h 2016-02-29 08:36:53 UTC (rev 197316)
+++ releases/WebKitGTK/webkit-2.12/Source/WTF/wtf/HashMap.h 2016-02-29 09:13:03 UTC (rev 197317)
</span><span class="lines">@@ -118,8 +118,8 @@
</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> MappedType& ensure(const KeyType&, const Functor&);
- template<typename Functor> MappedType& ensure(KeyType&&, const Functor&);
</del><ins>+ template<typename Functor> AddResult ensure(const KeyType&, const Functor&);
+ template<typename Functor> AddResult ensure(KeyType&&, const Functor&);
</ins><span class="cx">
</span><span class="cx"> bool remove(const KeyType&);
</span><span class="cx"> bool remove(iterator);
</span><span class="lines">@@ -167,7 +167,7 @@
</span><span class="cx"> AddResult inlineAdd(K&&, V&&);
</span><span class="cx">
</span><span class="cx"> template<typename K, typename F>
</span><del>- MappedType& inlineEnsure(K&&, const F&);
</del><ins>+ AddResult inlineEnsure(K&&, const F&);
</ins><span class="cx">
</span><span class="cx"> HashTableType m_impl;
</span><span class="cx"> };
</span><span class="lines">@@ -315,9 +315,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) -> MappedType&
</del><ins>+ALWAYS_INLINE auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::inlineEnsure(K&& key, const F& functor) -> AddResult
</ins><span class="cx"> {
</span><del>- return m_impl.template add<HashMapEnsureTranslator<KeyValuePairTraits, HashFunctions>>(std::forward<K>(key), functor).iterator->value;
</del><ins>+ return m_impl.template add<HashMapEnsureTranslator<KeyValuePairTraits, HashFunctions>>(std::forward<K>(key), 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">@@ -371,14 +371,14 @@
</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) -> MappedType&
</del><ins>+auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::ensure(const KeyType& key, const Functor& functor) -> AddResult
</ins><span class="cx"> {
</span><span class="cx"> return inlineEnsure(key, functor);
</span><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) -> MappedType&
</del><ins>+auto HashMap<KeyArg, MappedArg, HashArg, KeyTraitsArg, MappedTraitsArg>::ensure(KeyType&& key, const Functor& functor) -> AddResult
</ins><span class="cx"> {
</span><span class="cx"> return inlineEnsure(WTFMove(key), functor);
</span><span class="cx"> }
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Tools/ChangeLog (197316 => 197317)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Tools/ChangeLog 2016-02-29 08:36:53 UTC (rev 197316)
+++ releases/WebKitGTK/webkit-2.12/Tools/ChangeLog 2016-02-29 09:13:03 UTC (rev 197317)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-02-25 Sam Weinig <sam@webkit.org>
+
+ HashMap::ensure() should return an AddResult like all the other add-like functions
+ https://bugs.webkit.org/show_bug.cgi?id=154680
+
+ Reviewed by Anders Carlsson.
+
+ * TestWebKitAPI/Tests/WTF/HashMap.cpp:
+ (TestWebKitAPI::TEST):
+ Update tests to use/test the new AddResult result.
+
</ins><span class="cx"> 2016-02-26 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: New database versions are never committed to SQLite.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212ToolsTestWebKitAPITestsWTFHashMapcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp (197316 => 197317)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2016-02-29 08:36:53 UTC (rev 197316)
+++ releases/WebKitGTK/webkit-2.12/Tools/TestWebKitAPI/Tests/WTF/HashMap.cpp 2016-02-29 09:13:03 UTC (rev 197317)
</span><span class="lines">@@ -512,10 +512,14 @@
</span><span class="cx"> {
</span><span class="cx"> HashMap<unsigned, unsigned> map;
</span><span class="cx"> {
</span><del>- auto value = map.ensure(1, [] { return 1; });
- EXPECT_EQ(1u, value);
- value = map.ensure(1, [] { return 2; });
- EXPECT_EQ(1u, value);
</del><ins>+ auto addResult = map.ensure(1, [] { return 1; });
+ EXPECT_EQ(1u, addResult.iterator->value);
+ EXPECT_EQ(1u, addResult.iterator->key);
+ EXPECT_TRUE(addResult.isNewEntry);
+ auto addResult2 = map.ensure(1, [] { return 2; });
+ EXPECT_EQ(1u, addResult2.iterator->value);
+ EXPECT_EQ(1u, addResult2.iterator->key);
+ EXPECT_FALSE(addResult2.isNewEntry);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -523,10 +527,14 @@
</span><span class="cx"> {
</span><span class="cx"> HashMap<unsigned, MoveOnly> moveOnlyValues;
</span><span class="cx"> {
</span><del>- auto& value = moveOnlyValues.ensure(1, [] { return MoveOnly(1); });
- EXPECT_EQ(1u, value.value());
- auto& value2 = moveOnlyValues.ensure(1, [] { return MoveOnly(2); });
- EXPECT_EQ(1u, value2.value());
</del><ins>+ auto addResult = moveOnlyValues.ensure(1, [] { return MoveOnly(1); });
+ EXPECT_EQ(1u, addResult.iterator->value.value());
+ EXPECT_EQ(1u, addResult.iterator->key);
+ EXPECT_TRUE(addResult.isNewEntry);
+ auto addResult2 = moveOnlyValues.ensure(1, [] { return MoveOnly(2); });
+ EXPECT_EQ(1u, addResult2.iterator->value.value());
+ EXPECT_EQ(1u, addResult2.iterator->key);
+ EXPECT_FALSE(addResult2.isNewEntry);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -534,12 +542,16 @@
</span><span class="cx"> {
</span><span class="cx"> HashMap<unsigned, std::unique_ptr<unsigned>> map;
</span><span class="cx"> {
</span><del>- auto& value = map.ensure(1, [] { return std::make_unique<unsigned>(1); });
</del><ins>+ auto addResult = map.ensure(1, [] { return std::make_unique<unsigned>(1); });
</ins><span class="cx"> EXPECT_EQ(1u, *map.get(1));
</span><del>- EXPECT_EQ(1u, *value.get());
- auto& value2 = map.ensure(1, [] { return std::make_unique<unsigned>(2); });
</del><ins>+ EXPECT_EQ(1u, *addResult.iterator->value.get());
+ EXPECT_EQ(1u, addResult.iterator->key);
+ EXPECT_TRUE(addResult.isNewEntry);
+ auto addResult2 = map.ensure(1, [] { return std::make_unique<unsigned>(2); });
</ins><span class="cx"> EXPECT_EQ(1u, *map.get(1));
</span><del>- EXPECT_EQ(1u, *value2.get());
</del><ins>+ EXPECT_EQ(1u, *addResult2.iterator->value.get());
+ EXPECT_EQ(1u, addResult2.iterator->key);
+ EXPECT_FALSE(addResult2.isNewEntry);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>