<!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>[167592] 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/167592">167592</a></dd>
<dt>Author</dt> <dd>darin@apple.com</dd>
<dt>Date</dt> <dd>2014-04-21 08:52:27 -0700 (Mon, 21 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add HashSet::takeAny
https://bugs.webkit.org/show_bug.cgi?id=131928
Reviewed by Benjamin Poulain.
Source/WebCore:
* dom/Document.cpp:
(WebCore::Document::takeAnyMediaCanStartListener): Use HashSet::takeAny.
* dom/ScriptExecutionContext.cpp:
(WebCore::takeAny): Deleted.
(WebCore::ScriptExecutionContext::~ScriptExecutionContext): Use HashSet::takeAny.
Source/WTF:
* wtf/HashSet.h: Added an overload of take that takes an iterator,
and used it to implement both the existing take and new takeAny functions.
Tools:
* TestWebKitAPI/Tests/WTF/HashSet.cpp: Added a test for takeAny.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFwtfHashSeth">trunk/Source/WTF/wtf/HashSet.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContextcpp">trunk/Source/WebCore/dom/ScriptExecutionContext.cpp</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWTFHashSetcpp">trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (167591 => 167592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2014-04-21 15:11:33 UTC (rev 167591)
+++ trunk/Source/WTF/ChangeLog 2014-04-21 15:52:27 UTC (rev 167592)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-04-21 Darin Adler <darin@apple.com>
+
+ Add HashSet::takeAny
+ https://bugs.webkit.org/show_bug.cgi?id=131928
+
+ Reviewed by Benjamin Poulain.
+
+ * wtf/HashSet.h: Added an overload of take that takes an iterator,
+ and used it to implement both the existing take and new takeAny functions.
+
</ins><span class="cx"> 2014-04-20 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Speed up jsStringWithCache() through WeakGCMap inlining.
</span></span></pre></div>
<a id="trunkSourceWTFwtfHashSeth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/HashSet.h (167591 => 167592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/HashSet.h 2014-04-21 15:11:33 UTC (rev 167591)
+++ trunk/Source/WTF/wtf/HashSet.h 2014-04-21 15:52:27 UTC (rev 167592)
</span><span class="lines">@@ -103,6 +103,8 @@
</span><span class="cx"> void clear();
</span><span class="cx">
</span><span class="cx"> ValueType take(const ValueType&);
</span><ins>+ ValueType take(iterator);
+ ValueType takeAny();
</ins><span class="cx">
</span><span class="cx"> static bool isValidValue(const ValueType&);
</span><span class="cx">
</span><span class="lines">@@ -240,9 +242,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V>
</span><del>- auto HashSet<T, U, V>::take(const ValueType& value) -> ValueType
</del><ins>+ inline auto HashSet<T, U, V>::take(iterator it) -> ValueType
</ins><span class="cx"> {
</span><del>- auto it = find(value);
</del><span class="cx"> if (it == end())
</span><span class="cx"> return ValueTraits::emptyValue();
</span><span class="cx">
</span><span class="lines">@@ -252,6 +253,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename U, typename V>
</span><ins>+ inline auto HashSet<T, U, V>::take(const ValueType& value) -> ValueType
+ {
+ return take(find(value));
+ }
+
+ template<typename T, typename U, typename V>
+ inline auto HashSet<T, U, V>::takeAny() -> ValueType
+ {
+ return take(begin());
+ }
+
+ template<typename T, typename U, typename V>
</ins><span class="cx"> inline bool HashSet<T, U, V>::isValidValue(const ValueType& value)
</span><span class="cx"> {
</span><span class="cx"> if (ValueTraits::isDeletedValue(value))
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167591 => 167592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-21 15:11:33 UTC (rev 167591)
+++ trunk/Source/WebCore/ChangeLog 2014-04-21 15:52:27 UTC (rev 167592)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-04-21 Darin Adler <darin@apple.com>
+
+ Add HashSet::takeAny
+ https://bugs.webkit.org/show_bug.cgi?id=131928
+
+ Reviewed by Benjamin Poulain.
+
+ * dom/Document.cpp:
+ (WebCore::Document::takeAnyMediaCanStartListener): Use HashSet::takeAny.
+ * dom/ScriptExecutionContext.cpp:
+ (WebCore::takeAny): Deleted.
+ (WebCore::ScriptExecutionContext::~ScriptExecutionContext): Use HashSet::takeAny.
+
</ins><span class="cx"> 2014-04-21 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> iOS and non-iOS RemoteCommandListener::create() functions should use std::make_unique<>()
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (167591 => 167592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2014-04-21 15:11:33 UTC (rev 167591)
+++ trunk/Source/WebCore/dom/Document.cpp 2014-04-21 15:52:27 UTC (rev 167592)
</span><span class="lines">@@ -5085,12 +5085,7 @@
</span><span class="cx">
</span><span class="cx"> MediaCanStartListener* Document::takeAnyMediaCanStartListener()
</span><span class="cx"> {
</span><del>- HashSet<MediaCanStartListener*>::iterator slot = m_mediaCanStartListeners.begin();
- if (slot == m_mediaCanStartListeners.end())
- return nullptr;
- MediaCanStartListener* listener = *slot;
- m_mediaCanStartListeners.remove(slot);
- return listener;
</del><ins>+ return m_mediaCanStartListeners.takeAny();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(DEVICE_ORIENTATION) && PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.cpp (167591 => 167592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-04-21 15:11:33 UTC (rev 167591)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.cpp 2014-04-21 15:52:27 UTC (rev 167592)
</span><span class="lines">@@ -105,16 +105,6 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-// FIXME: We should make this a member function of HashSet.
-template<typename T> inline T takeAny(HashSet<T>& set)
-{
- ASSERT(!set.isEmpty());
- auto iterator = set.begin();
- T result = std::move(*iterator);
- set.remove(iterator);
- return result;
-}
-
</del><span class="cx"> #if ASSERT_DISABLED
</span><span class="cx">
</span><span class="cx"> inline void ScriptExecutionContext::checkConsistency() const
</span><span class="lines">@@ -147,8 +137,8 @@
</span><span class="cx"> m_inScriptExecutionContextDestructor = true;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- while (!m_destructionObservers.isEmpty())
- takeAny(m_destructionObservers)->contextDestroyed();
</del><ins>+ while (auto* destructionObserver = m_destructionObservers.takeAny())
+ destructionObserver->contextDestroyed();
</ins><span class="cx">
</span><span class="cx"> for (auto* messagePort : m_messagePorts)
</span><span class="cx"> messagePort->contextDestroyed();
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (167591 => 167592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-04-21 15:11:33 UTC (rev 167591)
+++ trunk/Tools/ChangeLog 2014-04-21 15:52:27 UTC (rev 167592)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2014-04-21 Darin Adler <darin@apple.com>
+
+ Add HashSet::takeAny
+ https://bugs.webkit.org/show_bug.cgi?id=131928
+
+ Reviewed by Benjamin Poulain.
+
+ * TestWebKitAPI/Tests/WTF/HashSet.cpp: Added a test for takeAny.
+
</ins><span class="cx"> 2014-04-20 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Fixed a test timing out after r167572.
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWTFHashSetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp (167591 => 167592)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2014-04-21 15:11:33 UTC (rev 167591)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/HashSet.cpp 2014-04-21 15:52:27 UTC (rev 167592)
</span><span class="lines">@@ -101,6 +101,20 @@
</span><span class="cx"> for (size_t i = 0; i < 100; ++i)
</span><span class="cx"> EXPECT_TRUE(hashSet.take(MoveOnly(i + 1)) == MoveOnly(i + 1));
</span><span class="cx">
</span><ins>+ EXPECT_TRUE(hashSet.isEmpty());
+
+ for (size_t i = 0; i < 100; ++i)
+ hashSet.add(std::move(MoveOnly(i + 1)));
+
+ HashSet<MoveOnly> secondSet;
+
+ for (size_t i = 0; i < 100; ++i)
+ secondSet.add(hashSet.takeAny());
+
+ EXPECT_TRUE(hashSet.isEmpty());
+
+ for (size_t i = 0; i < 100; ++i)
+ EXPECT_TRUE(secondSet.contains(MoveOnly(i + 1)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace TestWebKitAPI
</span></span></pre>
</div>
</div>
</body>
</html>