<!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>[201518] trunk/Source</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/201518">201518</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-05-31 12:33:22 -0700 (Tue, 31 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make createCrossThreadTask() functions return on the stack instead of the heap.
https://bugs.webkit.org/show_bug.cgi?id=158215
Reviewed by Darin Adler.
Source/WebCore:
No new tests (Refactor, no change in behavior).
* Modules/indexeddb/client/IDBConnectionProxy.h:
* Modules/indexeddb/server/IDBServer.cpp:
(WebCore::IDBServer::IDBServer::postDatabaseTask):
(WebCore::IDBServer::IDBServer::postDatabaseTaskReply):
(WebCore::IDBServer::IDBServer::databaseRunLoop):
* Modules/indexeddb/server/IDBServer.h:
* Modules/indexeddb/server/UniqueIDBDatabase.cpp:
(WebCore::IDBServer::UniqueIDBDatabase::postDatabaseTask):
(WebCore::IDBServer::UniqueIDBDatabase::postDatabaseTaskReply):
* Modules/indexeddb/server/UniqueIDBDatabase.h:
* dom/ScriptExecutionContext.h:
(WebCore::ScriptExecutionContext::postCrossThreadTask):
* fileapi/ThreadableBlobRegistry.cpp:
(WebCore::threadableQueue):
Source/WebKit2:
* DatabaseProcess/DatabaseProcess.cpp:
(WebKit::DatabaseProcess::postDatabaseTask):
(WebKit::DatabaseProcess::performNextDatabaseTask):
(WebKit::DatabaseProcess::fetchWebsiteData):
* DatabaseProcess/DatabaseProcess.h:
Source/WTF:
* WTF.xcodeproj/project.pbxproj:
* wtf/CrossThreadCopier.cpp:
* wtf/CrossThreadQueue.h: Added. A lightweight of MessageQueue that deals directly
in objects instead of in std::unique_ptrs.
(WTF::CrossThreadQueue::isKilled):
(WTF::CrossThreadQueue<DataType>::append):
(WTF::CrossThreadQueue<DataType>::waitForMessage):
(WTF::CrossThreadQueue<DataType>::tryGetMessage):
* wtf/CrossThreadTask.h:
(WTF::createCrossThreadTask):
(WTF::CrossThreadTask::CrossThreadTask): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWTFChangeLog">trunk/Source/WTF/ChangeLog</a></li>
<li><a href="#trunkSourceWTFWTFxcodeprojprojectpbxproj">trunk/Source/WTF/WTF.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWTFwtfCrossThreadCopiercpp">trunk/Source/WTF/wtf/CrossThreadCopier.cpp</a></li>
<li><a href="#trunkSourceWTFwtfCrossThreadTaskh">trunk/Source/WTF/wtf/CrossThreadTask.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServercpp">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverIDBServerh">trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh">trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h</a></li>
<li><a href="#trunkSourceWebCoredomScriptExecutionContexth">trunk/Source/WebCore/dom/ScriptExecutionContext.h</a></li>
<li><a href="#trunkSourceWebCorefileapiThreadableBlobRegistrycpp">trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2DatabaseProcessDatabaseProcessh">trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWTFwtfCrossThreadQueueh">trunk/Source/WTF/wtf/CrossThreadQueue.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/ChangeLog (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/ChangeLog 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WTF/ChangeLog 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-05-31 Brady Eidson <beidson@apple.com>
+
+ Make createCrossThreadTask() functions return on the stack instead of the heap.
+ https://bugs.webkit.org/show_bug.cgi?id=158215
+
+ Reviewed by Darin Adler.
+
+ * WTF.xcodeproj/project.pbxproj:
+
+ * wtf/CrossThreadCopier.cpp:
+
+ * wtf/CrossThreadQueue.h: Added. A lightweight of MessageQueue that deals directly
+ in objects instead of in std::unique_ptrs.
+ (WTF::CrossThreadQueue::isKilled):
+ (WTF::CrossThreadQueue<DataType>::append):
+ (WTF::CrossThreadQueue<DataType>::waitForMessage):
+ (WTF::CrossThreadQueue<DataType>::tryGetMessage):
+
+ * wtf/CrossThreadTask.h:
+ (WTF::createCrossThreadTask):
+ (WTF::CrossThreadTask::CrossThreadTask): Deleted.
+
</ins><span class="cx"> 2016-05-30 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Move CrossThreadCopier/CrossThreadTask to WTF.
</span></span></pre></div>
<a id="trunkSourceWTFWTFxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/WTF.xcodeproj/project.pbxproj (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WTF/WTF.xcodeproj/project.pbxproj 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -104,6 +104,7 @@
</span><span class="cx"> 515F794E1CFC9F4A00CCED93 /* CrossThreadCopier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 515F794B1CFC9F4A00CCED93 /* CrossThreadCopier.cpp */; };
</span><span class="cx"> 515F794F1CFC9F4A00CCED93 /* CrossThreadCopier.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F794C1CFC9F4A00CCED93 /* CrossThreadCopier.h */; };
</span><span class="cx"> 515F79501CFC9F4A00CCED93 /* CrossThreadTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F794D1CFC9F4A00CCED93 /* CrossThreadTask.h */; };
</span><ins>+ 515F79561CFD3A6900CCED93 /* CrossThreadQueue.h in Headers */ = {isa = PBXBuildFile; fileRef = 515F79551CFD3A6900CCED93 /* CrossThreadQueue.h */; };
</ins><span class="cx"> 553071CA1C40427200384898 /* TinyLRUCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 553071C91C40427200384898 /* TinyLRUCache.h */; };
</span><span class="cx"> 70A993FE1AD7151300FA615B /* SymbolRegistry.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 70A993FC1AD7151300FA615B /* SymbolRegistry.cpp */; };
</span><span class="cx"> 70A993FF1AD7151300FA615B /* SymbolRegistry.h in Headers */ = {isa = PBXBuildFile; fileRef = 70A993FD1AD7151300FA615B /* SymbolRegistry.h */; };
</span><span class="lines">@@ -426,6 +427,7 @@
</span><span class="cx"> 515F794B1CFC9F4A00CCED93 /* CrossThreadCopier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CrossThreadCopier.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 515F794C1CFC9F4A00CCED93 /* CrossThreadCopier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadCopier.h; sourceTree = "<group>"; };
</span><span class="cx"> 515F794D1CFC9F4A00CCED93 /* CrossThreadTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadTask.h; sourceTree = "<group>"; };
</span><ins>+ 515F79551CFD3A6900CCED93 /* CrossThreadQueue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CrossThreadQueue.h; sourceTree = "<group>"; };
</ins><span class="cx"> 553071C91C40427200384898 /* TinyLRUCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TinyLRUCache.h; sourceTree = "<group>"; };
</span><span class="cx"> 5D247B6214689B8600E78B76 /* libWTF.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libWTF.a; sourceTree = BUILT_PRODUCTS_DIR; };
</span><span class="cx"> 5D247B6E14689C4700E78B76 /* Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Base.xcconfig; sourceTree = "<group>"; };
</span><span class="lines">@@ -805,6 +807,7 @@
</span><span class="cx"> 0FDB698D1B7C643A000C1078 /* Condition.h */,
</span><span class="cx"> 515F794B1CFC9F4A00CCED93 /* CrossThreadCopier.cpp */,
</span><span class="cx"> 515F794C1CFC9F4A00CCED93 /* CrossThreadCopier.h */,
</span><ins>+ 515F79551CFD3A6900CCED93 /* CrossThreadQueue.h */,
</ins><span class="cx"> 515F794D1CFC9F4A00CCED93 /* CrossThreadTask.h */,
</span><span class="cx"> A8A47273151A825A004123FF /* CryptographicallyRandomNumber.cpp */,
</span><span class="cx"> A8A47274151A825A004123FF /* CryptographicallyRandomNumber.h */,
</span><span class="lines">@@ -1182,6 +1185,7 @@
</span><span class="cx"> A8A47452151A825B004123FF /* BinarySemaphore.h in Headers */,
</span><span class="cx"> A8A4738A151A825B004123FF /* Bitmap.h in Headers */,
</span><span class="cx"> A8A4738C151A825B004123FF /* BitVector.h in Headers */,
</span><ins>+ 515F79561CFD3A6900CCED93 /* CrossThreadQueue.h in Headers */,
</ins><span class="cx"> 1A944F471C3D8814005BD28C /* BlockPtr.h in Headers */,
</span><span class="cx"> 93DDE9321CDC052D00FD3491 /* dyldSPI.h in Headers */,
</span><span class="cx"> A8A4738E151A825B004123FF /* BlockStack.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWTFwtfCrossThreadCopiercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CrossThreadCopier.cpp (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CrossThreadCopier.cpp 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WTF/wtf/CrossThreadCopier.cpp 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -30,8 +30,10 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #include "config.h"
</span><del>-#include "CrossThreadCopier.h"
</del><ins>+#include <wtf/CrossThreadCopier.h>
</ins><span class="cx">
</span><ins>+#include <wtf/CrossThreadTask.h>
+
</ins><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> // Test CrossThreadCopier using COMPILE_ASSERT.
</span><span class="lines">@@ -78,3 +80,4 @@
</span><span class="cx"> static_assert((std::is_same<int, CrossThreadCopier<CopierRefCountedTest*>::Type>::value), "CrossThreadCopier specialization improperly applied to raw pointer of a RefCounted (but not ThreadSafeRefCounted) type");
</span><span class="cx">
</span><span class="cx"> } // namespace WTF
</span><ins>+
</ins></span></pre></div>
<a id="trunkSourceWTFwtfCrossThreadQueueh"></a>
<div class="addfile"><h4>Added: trunk/Source/WTF/wtf/CrossThreadQueue.h (0 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CrossThreadQueue.h (rev 0)
+++ trunk/Source/WTF/wtf/CrossThreadQueue.h 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -0,0 +1,97 @@
</span><ins>+/*
+ * Copyright (C) 2016 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#pragma once
+
+#include <limits>
+#include <wtf/Assertions.h>
+#include <wtf/Condition.h>
+#include <wtf/Deque.h>
+#include <wtf/Lock.h>
+#include <wtf/Noncopyable.h>
+#include <wtf/Optional.h>
+#include <wtf/Threading.h>
+
+namespace WTF {
+
+template<typename DataType>
+class CrossThreadQueue {
+ WTF_MAKE_NONCOPYABLE(CrossThreadQueue);
+public:
+ CrossThreadQueue() = default;
+
+ void append(DataType&&);
+
+ DataType waitForMessage();
+ Optional<DataType> tryGetMessage();
+
+ bool isKilled() const { return false; }
+
+private:
+ mutable Lock m_lock;
+ Condition m_condition;
+ Deque<DataType> m_queue;
+};
+
+template<typename DataType>
+void CrossThreadQueue<DataType>::append(DataType&& message)
+{
+ LockHolder lock(m_lock);
+ m_queue.append(WTFMove(message));
+ m_condition.notifyOne();
+}
+
+template<typename DataType>
+DataType CrossThreadQueue<DataType>::waitForMessage()
+{
+ LockHolder lock(m_lock);
+
+ auto found = m_queue.end();
+ while (found == m_queue.end()) {
+ found = m_queue.begin();
+ if (found != m_queue.end())
+ break;
+
+ static const double infiniteTime = std::numeric_limits<double>::max();
+ m_condition.waitUntilWallClockSeconds(m_lock, infiniteTime);
+ }
+
+ return m_queue.takeFirst();
+}
+
+template<typename DataType>
+Optional<DataType> CrossThreadQueue<DataType>::tryGetMessage()
+{
+ LockHolder lock(m_lock);
+
+ if (m_queue.isEmpty())
+ return { };
+
+ return m_queue.takeFirst();
+}
+
+} // namespace WTF
+
+using WTF::CrossThreadQueue;
</ins></span></pre></div>
<a id="trunkSourceWTFwtfCrossThreadTaskh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WTF/wtf/CrossThreadTask.h (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WTF/wtf/CrossThreadTask.h 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WTF/wtf/CrossThreadTask.h 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -27,12 +27,14 @@
</span><span class="cx">
</span><span class="cx"> #include <wtf/CrossThreadCopier.h>
</span><span class="cx"> #include <wtf/NoncopyableFunction.h>
</span><ins>+#include <wtf/StdLibExtras.h>
</ins><span class="cx">
</span><span class="cx"> namespace WTF {
</span><span class="cx">
</span><span class="cx"> class CrossThreadTask {
</span><del>- WTF_MAKE_NONCOPYABLE(CrossThreadTask);
</del><span class="cx"> public:
</span><ins>+ CrossThreadTask() = default;
+
</ins><span class="cx"> CrossThreadTask(NoncopyableFunction<void ()>&& taskFunction)
</span><span class="cx"> : m_taskFunction(WTFMove(taskFunction))
</span><span class="cx"> {
</span><span class="lines">@@ -45,8 +47,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- CrossThreadTask() { }
-
</del><span class="cx"> NoncopyableFunction<void ()> m_taskFunction;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -73,33 +73,33 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> template<typename T>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)())
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T>>(&callee, method);
</del><ins>+ return CrossThreadTaskImpl<T>(&callee, method);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename P1, typename MP1>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)(MP1),
</span><span class="cx"> const P1& parameter1)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T, MP1>>(
</del><ins>+ return CrossThreadTaskImpl<T, MP1>(
</ins><span class="cx"> &callee,
</span><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename P1, typename MP1, typename P2, typename MP2>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)(MP1, MP2),
</span><span class="cx"> const P1& parameter1,
</span><span class="cx"> const P2& parameter2)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T, MP1, MP2>>(
</del><ins>+ return CrossThreadTaskImpl<T, MP1, MP2>(
</ins><span class="cx"> &callee,
</span><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1),
</span><span class="lines">@@ -108,14 +108,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)(MP1, MP2, MP3),
</span><span class="cx"> const P1& parameter1,
</span><span class="cx"> const P2& parameter2,
</span><span class="cx"> const P3& parameter3)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T, MP1, MP2, MP3>>(
</del><ins>+ return CrossThreadTaskImpl<T, MP1, MP2, MP3>(
</ins><span class="cx"> &callee,
</span><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1),
</span><span class="lines">@@ -124,13 +124,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> void (*method)(MP1, MP2, MP3),
</span><span class="cx"> const P1& parameter1,
</span><span class="cx"> const P2& parameter2,
</span><span class="cx"> const P3& parameter3)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskStaticImpl<MP1, MP2, MP3>>(
</del><ins>+ return CrossThreadTaskStaticImpl<MP1, MP2, MP3>(
</ins><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1),
</span><span class="cx"> WTF::CrossThreadCopier<P2>::copy(parameter2),
</span><span class="lines">@@ -138,7 +138,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)(MP1, MP2, MP3, MP4),
</span><span class="cx"> const P1& parameter1,
</span><span class="lines">@@ -146,7 +146,7 @@
</span><span class="cx"> const P3& parameter3,
</span><span class="cx"> const P4& parameter4)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4>>(
</del><ins>+ return CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4>(
</ins><span class="cx"> &callee,
</span><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1),
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)(MP1, MP2, MP3, MP4, MP5),
</span><span class="cx"> const P1& parameter1,
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> const P4& parameter4,
</span><span class="cx"> const P5& parameter5)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4, MP5>>(
</del><ins>+ return CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4, MP5>(
</ins><span class="cx"> &callee,
</span><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1),
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)(MP1, MP2, MP3, MP4, MP5, MP6),
</span><span class="cx"> const P1& parameter1,
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> const P5& parameter5,
</span><span class="cx"> const P6& parameter6)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4, MP5, MP6>>(
</del><ins>+ return CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4, MP5, MP6>(
</ins><span class="cx"> &callee,
</span><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1),
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7),
</span><span class="cx"> const P1& parameter1,
</span><span class="lines">@@ -209,7 +209,7 @@
</span><span class="cx"> const P6& parameter6,
</span><span class="cx"> const P7& parameter7)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4, MP5, MP6, MP7>>(
</del><ins>+ return CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4, MP5, MP6, MP7>(
</ins><span class="cx"> &callee,
</span><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1),
</span><span class="lines">@@ -222,7 +222,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template<typename T, typename P1, typename MP1, typename P2, typename MP2, typename P3, typename MP3, typename P4, typename MP4, typename P5, typename MP5, typename P6, typename MP6, typename P7, typename MP7, typename P8, typename MP8>
</span><del>-std::unique_ptr<CrossThreadTask> createCrossThreadTask(
</del><ins>+CrossThreadTask createCrossThreadTask(
</ins><span class="cx"> T& callee,
</span><span class="cx"> void (T::*method)(MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8),
</span><span class="cx"> const P1& parameter1,
</span><span class="lines">@@ -234,7 +234,7 @@
</span><span class="cx"> const P7& parameter7,
</span><span class="cx"> const P8& parameter8)
</span><span class="cx"> {
</span><del>- return std::make_unique<CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8>>(
</del><ins>+ return CrossThreadTaskImpl<T, MP1, MP2, MP3, MP4, MP5, MP6, MP7, MP8>(
</ins><span class="cx"> &callee,
</span><span class="cx"> method,
</span><span class="cx"> WTF::CrossThreadCopier<P1>::copy(parameter1),
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebCore/ChangeLog 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -1,3 +1,31 @@
</span><ins>+2016-05-31 Brady Eidson <beidson@apple.com>
+
+ Make createCrossThreadTask() functions return on the stack instead of the heap.
+ https://bugs.webkit.org/show_bug.cgi?id=158215
+
+ Reviewed by Darin Adler.
+
+ No new tests (Refactor, no change in behavior).
+
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+
+ * Modules/indexeddb/server/IDBServer.cpp:
+ (WebCore::IDBServer::IDBServer::postDatabaseTask):
+ (WebCore::IDBServer::IDBServer::postDatabaseTaskReply):
+ (WebCore::IDBServer::IDBServer::databaseRunLoop):
+ * Modules/indexeddb/server/IDBServer.h:
+
+ * Modules/indexeddb/server/UniqueIDBDatabase.cpp:
+ (WebCore::IDBServer::UniqueIDBDatabase::postDatabaseTask):
+ (WebCore::IDBServer::UniqueIDBDatabase::postDatabaseTaskReply):
+ * Modules/indexeddb/server/UniqueIDBDatabase.h:
+
+ * dom/ScriptExecutionContext.h:
+ (WebCore::ScriptExecutionContext::postCrossThreadTask):
+
+ * fileapi/ThreadableBlobRegistry.cpp:
+ (WebCore::threadableQueue):
+
</ins><span class="cx"> 2016-05-31 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r189567): Elements with aspect ratios not handled correctly inside flexbox.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "IDBResourceIdentifier.h"
</span><span class="cx"> #include "TransactionOperation.h"
</span><span class="cx"> #include <functional>
</span><ins>+#include <wtf/CrossThreadQueue.h>
</ins><span class="cx"> #include <wtf/CrossThreadTask.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -157,7 +158,7 @@
</span><span class="cx"> HashMap<IDBResourceIdentifier, RefPtr<TransactionOperation>> m_activeOperations;
</span><span class="cx"> Lock m_transactionOperationLock;
</span><span class="cx">
</span><del>- MessageQueue<CrossThreadTask> m_mainThreadQueue;
</del><ins>+ CrossThreadQueue<CrossThreadTask> m_mainThreadQueue;
</ins><span class="cx"> Lock m_mainThreadTaskLock;
</span><span class="cx"> RefPtr<IDBConnectionToServer> m_mainThreadProtector;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.cpp 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -431,13 +431,13 @@
</span><span class="cx"> connection->didGetAllDatabaseNames(callbackID, databaseNames);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBServer::postDatabaseTask(std::unique_ptr<CrossThreadTask>&& task)
</del><ins>+void IDBServer::postDatabaseTask(CrossThreadTask&& task)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> m_databaseQueue.append(WTFMove(task));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBServer::postDatabaseTaskReply(std::unique_ptr<CrossThreadTask>&& task)
</del><ins>+void IDBServer::postDatabaseTaskReply(CrossThreadTask&& task)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="cx"> m_databaseReplyQueue.append(WTFMove(task));
</span><span class="lines">@@ -467,8 +467,8 @@
</span><span class="cx"> Locker<Lock> locker(m_databaseThreadCreationLock);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- while (auto task = m_databaseQueue.waitForMessage())
- task->performTask();
</del><ins>+ while (!m_databaseQueue.isKilled())
+ m_databaseQueue.waitForMessage().performTask();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBServer::handleTaskRepliesOnMainThread()
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverIDBServerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebCore/Modules/indexeddb/server/IDBServer.h 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "IDBDatabaseIdentifier.h"
</span><span class="cx"> #include "UniqueIDBDatabase.h"
</span><span class="cx"> #include "UniqueIDBDatabaseConnection.h"
</span><ins>+#include <wtf/CrossThreadQueue.h>
</ins><span class="cx"> #include <wtf/CrossThreadTask.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/Lock.h>
</span><span class="lines">@@ -84,8 +85,8 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT void getAllDatabaseNames(uint64_t serverConnectionIdentifier, const SecurityOriginData& mainFrameOrigin, const SecurityOriginData& openingOrigin, uint64_t callbackID);
</span><span class="cx">
</span><del>- void postDatabaseTask(std::unique_ptr<CrossThreadTask>&&);
- void postDatabaseTaskReply(std::unique_ptr<CrossThreadTask>&&);
</del><ins>+ void postDatabaseTask(CrossThreadTask&&);
+ void postDatabaseTaskReply(CrossThreadTask&&);
</ins><span class="cx">
</span><span class="cx"> void registerDatabaseConnection(UniqueIDBDatabaseConnection&);
</span><span class="cx"> void unregisterDatabaseConnection(UniqueIDBDatabaseConnection&);
</span><span class="lines">@@ -124,8 +125,8 @@
</span><span class="cx"> Lock m_mainThreadReplyLock;
</span><span class="cx"> bool m_mainThreadReplyScheduled { false };
</span><span class="cx">
</span><del>- MessageQueue<CrossThreadTask> m_databaseQueue;
- MessageQueue<CrossThreadTask> m_databaseReplyQueue;
</del><ins>+ CrossThreadQueue<CrossThreadTask> m_databaseQueue;
+ CrossThreadQueue<CrossThreadTask> m_databaseReplyQueue;
</ins><span class="cx">
</span><span class="cx"> HashMap<uint64_t, UniqueIDBDatabaseConnection*> m_databaseConnections;
</span><span class="cx"> HashMap<IDBResourceIdentifier, UniqueIDBDatabaseTransaction*> m_transactions;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.cpp 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -1505,7 +1505,7 @@
</span><span class="cx"> invokeOperationAndTransactionTimer();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::postDatabaseTask(std::unique_ptr<CrossThreadTask>&& task)
</del><ins>+void UniqueIDBDatabase::postDatabaseTask(CrossThreadTask&& task)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> m_databaseQueue.append(WTFMove(task));
</span><span class="lines">@@ -1514,7 +1514,7 @@
</span><span class="cx"> m_server.postDatabaseTask(createCrossThreadTask(*this, &UniqueIDBDatabase::executeNextDatabaseTask));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void UniqueIDBDatabase::postDatabaseTaskReply(std::unique_ptr<CrossThreadTask>&& task)
</del><ins>+void UniqueIDBDatabase::postDatabaseTaskReply(CrossThreadTask&& task)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!isMainThread());
</span><span class="cx"> m_databaseReplyQueue.append(WTFMove(task));
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbserverUniqueIDBDatabaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebCore/Modules/indexeddb/server/UniqueIDBDatabase.h 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "Timer.h"
</span><span class="cx"> #include "UniqueIDBDatabaseConnection.h"
</span><span class="cx"> #include "UniqueIDBDatabaseTransaction.h"
</span><ins>+#include <wtf/CrossThreadQueue.h>
</ins><span class="cx"> #include <wtf/CrossThreadTask.h>
</span><span class="cx"> #include <wtf/Deque.h>
</span><span class="cx"> #include <wtf/HashCountedSet.h>
</span><span class="lines">@@ -195,8 +196,8 @@
</span><span class="cx">
</span><span class="cx"> bool prepareToFinishTransaction(UniqueIDBDatabaseTransaction&);
</span><span class="cx">
</span><del>- void postDatabaseTask(std::unique_ptr<CrossThreadTask>&&);
- void postDatabaseTaskReply(std::unique_ptr<CrossThreadTask>&&);
</del><ins>+ void postDatabaseTask(CrossThreadTask&&);
+ void postDatabaseTaskReply(CrossThreadTask&&);
</ins><span class="cx"> void executeNextDatabaseTask();
</span><span class="cx"> void executeNextDatabaseTaskReply();
</span><span class="cx">
</span><span class="lines">@@ -242,8 +243,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_deleteBackingStoreInProgress { false };
</span><span class="cx">
</span><del>- MessageQueue<CrossThreadTask> m_databaseQueue;
- MessageQueue<CrossThreadTask> m_databaseReplyQueue;
</del><ins>+ CrossThreadQueue<CrossThreadTask> m_databaseQueue;
+ CrossThreadQueue<CrossThreadTask> m_databaseReplyQueue;
</ins><span class="cx"> std::atomic<uint64_t> m_queuedTaskCount { 0 };
</span><span class="cx">
</span><span class="cx"> bool m_hardClosedForUserDelete { false };
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptExecutionContexth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptExecutionContext.h (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebCore/dom/ScriptExecutionContext.h 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -172,11 +172,8 @@
</span><span class="cx"> template<typename... Arguments>
</span><span class="cx"> void postCrossThreadTask(Arguments&&... arguments)
</span><span class="cx"> {
</span><del>- auto crossThreadTask = createCrossThreadTask(arguments...);
- auto* rawTask = crossThreadTask.release();
- postTask([=](ScriptExecutionContext&) {
- std::unique_ptr<CrossThreadTask> task(rawTask);
- task->performTask();
</del><ins>+ postTask([crossThreadTask = createCrossThreadTask(arguments...)](ScriptExecutionContext&) mutable {
+ crossThreadTask.performTask();
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiThreadableBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebCore/fileapi/ThreadableBlobRegistry.cpp 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include "BlobURL.h"
</span><span class="cx"> #include "SecurityOrigin.h"
</span><span class="cx"> #include <mutex>
</span><ins>+#include <wtf/CrossThreadQueue.h>
</ins><span class="cx"> #include <wtf/CrossThreadTask.h>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/MainThread.h>
</span><span class="lines">@@ -100,12 +101,12 @@
</span><span class="cx"> return *map;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static MessageQueue<CrossThreadTask>& threadableQueue()
</del><ins>+static CrossThreadQueue<CrossThreadTask>& threadableQueue()
</ins><span class="cx"> {
</span><span class="cx"> static std::once_flag onceFlag;
</span><del>- static MessageQueue<CrossThreadTask>* queue;
</del><ins>+ static CrossThreadQueue<CrossThreadTask>* queue;
</ins><span class="cx"> std::call_once(onceFlag, [] {
</span><del>- queue = new MessageQueue<CrossThreadTask>;
</del><ins>+ queue = new CrossThreadQueue<CrossThreadTask>;
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> return *queue;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebKit2/ChangeLog 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-05-31 Brady Eidson <beidson@apple.com>
+
+ Make createCrossThreadTask() functions return on the stack instead of the heap.
+ https://bugs.webkit.org/show_bug.cgi?id=158215
+
+ Reviewed by Darin Adler.
+
+ * DatabaseProcess/DatabaseProcess.cpp:
+ (WebKit::DatabaseProcess::postDatabaseTask):
+ (WebKit::DatabaseProcess::performNextDatabaseTask):
+ (WebKit::DatabaseProcess::fetchWebsiteData):
+ * DatabaseProcess/DatabaseProcess.h:
+
</ins><span class="cx"> 2016-05-31 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed. Update OptionsGTK.cmake and NEWS for 2.13.1 release.
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.cpp 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void DatabaseProcess::postDatabaseTask(std::unique_ptr<CrossThreadTask> task)
</del><ins>+void DatabaseProcess::postDatabaseTask(CrossThreadTask&& task)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(RunLoop::isMain());
</span><span class="cx">
</span><span class="lines">@@ -160,14 +160,14 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!RunLoop::isMain());
</span><span class="cx">
</span><del>- std::unique_ptr<CrossThreadTask> task;
</del><ins>+ CrossThreadTask task;
</ins><span class="cx"> {
</span><span class="cx"> LockHolder locker(m_databaseTaskMutex);
</span><span class="cx"> ASSERT(!m_databaseTasks.isEmpty());
</span><span class="cx"> task = m_databaseTasks.takeFirst();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- task->performTask();
</del><ins>+ task.performTask();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseProcess::createDatabaseToWebProcessConnection()
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> if (websiteDataTypes.contains(WebsiteDataType::IndexedDBDatabases)) {
</span><span class="cx"> // FIXME: Pick the right database store based on the session ID.
</span><del>- postDatabaseTask(std::make_unique<CrossThreadTask>([callbackAggregator, websiteDataTypes, this] {
</del><ins>+ postDatabaseTask(CrossThreadTask([callbackAggregator, websiteDataTypes, this] {
</ins><span class="cx">
</span><span class="cx"> Vector<RefPtr<SecurityOrigin>> securityOrigins = indexedDatabaseOrigins();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2DatabaseProcessDatabaseProcessh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h (201517 => 201518)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-05-31 18:49:52 UTC (rev 201517)
+++ trunk/Source/WebKit2/DatabaseProcess/DatabaseProcess.h 2016-05-31 19:33:22 UTC (rev 201518)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> WorkQueue& queue() { return m_queue.get(); }
</span><span class="cx">
</span><del>- void postDatabaseTask(std::unique_ptr<CrossThreadTask>);
</del><ins>+ void postDatabaseTask(CrossThreadTask&&);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> // WebCore::IDBServer::IDBBackingStoreFileHandler
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> HashMap<String, RefPtr<SandboxExtension>> m_blobTemporaryFileSandboxExtensions;
</span><span class="cx"> HashMap<uint64_t, std::function<void (const SandboxExtension::HandleArray&)>> m_sandboxExtensionForBlobsCompletionHandlers;
</span><span class="cx">
</span><del>- Deque<std::unique_ptr<CrossThreadTask>> m_databaseTasks;
</del><ins>+ Deque<CrossThreadTask> m_databaseTasks;
</ins><span class="cx"> Lock m_databaseTaskMutex;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>