<!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>[201717] 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/201717">201717</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2016-06-06 11:38:34 -0700 (Mon, 06 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Modern IDB: Crash seen in IDBConnectionProxy::putOrAdd on GuardMalloc bot
https://bugs.webkit.org/show_bug.cgi?id=158124
Reviewed by Darin Adler.
Source/WebCore:
No new tests (Covered by existing test configurations).
* Modules/indexeddb/IDBTransaction.cpp:
(WebCore::IDBTransaction::putOrAddOnServer):
* Modules/indexeddb/client/IDBConnectionProxy.cpp:
(WebCore::IDBClient::IDBConnectionProxy::putOrAdd):
* Modules/indexeddb/client/IDBConnectionProxy.h:
(WebCore::IDBClient::IDBConnectionProxy::callConnectionOnMainThread):
* bindings/js/SerializedScriptValue.cpp:
(WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):
* bindings/js/SerializedScriptValue.h:
* platform/network/BlobRegistry.h:
* platform/network/BlobRegistryImpl.cpp:
(WebCore::BlobRegistryImpl::writeBlobsToTemporaryFiles):
* platform/network/BlobRegistryImpl.h:
Source/WebKit2:
* NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
(WebKit::NetworkBlobRegistry::writeBlobsToTemporaryFiles):
* NetworkProcess/FileAPI/NetworkBlobRegistry.h:
* WebProcess/FileAPI/BlobRegistryProxy.cpp:
(WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):
* WebProcess/FileAPI/BlobRegistryProxy.h:
* WebProcess/Network/NetworkProcessConnection.cpp:
(WebKit::NetworkProcessConnection::didClose):
(WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
* WebProcess/Network/NetworkProcessConnection.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbIDBTransactioncpp">trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh">trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValuecpp">trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp</a></li>
<li><a href="#trunkSourceWebCorebindingsjsSerializedScriptValueh">trunk/Source/WebCore/bindings/js/SerializedScriptValue.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryh">trunk/Source/WebCore/platform/network/BlobRegistry.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp">trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkBlobRegistryImplh">trunk/Source/WebCore/platform/network/BlobRegistryImpl.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh">trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp">trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh">trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh">trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/ChangeLog 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2016-06-06 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Crash seen in IDBConnectionProxy::putOrAdd on GuardMalloc bot
+ https://bugs.webkit.org/show_bug.cgi?id=158124
+
+ Reviewed by Darin Adler.
+
+ No new tests (Covered by existing test configurations).
+
+ * Modules/indexeddb/IDBTransaction.cpp:
+ (WebCore::IDBTransaction::putOrAddOnServer):
+
+ * Modules/indexeddb/client/IDBConnectionProxy.cpp:
+ (WebCore::IDBClient::IDBConnectionProxy::putOrAdd):
+
+ * Modules/indexeddb/client/IDBConnectionProxy.h:
+ (WebCore::IDBClient::IDBConnectionProxy::callConnectionOnMainThread):
+
+ * bindings/js/SerializedScriptValue.cpp:
+ (WebCore::SerializedScriptValue::writeBlobsToDiskForIndexedDB):
+ * bindings/js/SerializedScriptValue.h:
+
+ * platform/network/BlobRegistry.h:
+ * platform/network/BlobRegistryImpl.cpp:
+ (WebCore::BlobRegistryImpl::writeBlobsToTemporaryFiles):
+ * platform/network/BlobRegistryImpl.h:
+
</ins><span class="cx"> 2016-06-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201706.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbIDBTransactioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -966,20 +966,18 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<IDBTransaction> protectedThis(this);
- RefPtr<IDBClient::TransactionOperation> protectedOperation(&operation);
- value->writeBlobsToDiskForIndexedDB([protectedThis = WTFMove(protectedThis), this, protectedOperation = WTFMove(protectedOperation), key = WTFMove(key), overwriteMode](const IDBValue& idbValue) mutable {
</del><ins>+ value->writeBlobsToDiskForIndexedDB([protectedThis = Ref<IDBTransaction>(*this), this, protectedOperation = Ref<IDBClient::TransactionOperation>(operation), keyData = IDBKeyData(key.get()).isolatedCopy(), overwriteMode](const IDBValue& idbValue) mutable {
</ins><span class="cx"> ASSERT(currentThread() == originThreadID());
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (idbValue.data().data()) {
</span><del>- m_database->connectionProxy().putOrAdd(*protectedOperation, key.get(), idbValue, overwriteMode);
</del><ins>+ m_database->connectionProxy().putOrAdd(protectedOperation.get(), WTFMove(keyData), idbValue, overwriteMode);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // If the IDBValue doesn't have any data, then something went wrong writing the blobs to disk.
</span><span class="cx"> // In that case, we cannot successfully store this record, so we callback with an error.
</span><span class="cx"> auto result = IDBResultData::error(protectedOperation->identifier(), { IDBDatabaseException::UnknownError, ASCIILiteral("Error preparing Blob/File data to be stored in object store") });
</span><del>- callOnMainThread([protectedThis = WTFMove(protectedThis), protectedOperation = WTFMove(protectedOperation), result = WTFMove(result)]() {
</del><ins>+ callOnMainThread([protectedThis = WTFMove(protectedThis), protectedOperation = WTFMove(protectedOperation), result = WTFMove(result)]() mutable {
</ins><span class="cx"> protectedOperation->completed(result);
</span><span class="cx"> });
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -156,12 +156,12 @@
</span><span class="cx"> callConnectionOnMainThread(&IDBConnectionToServer::deleteIndex, requestData, WTFMove(objectStoreIdentifier), indexName);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void IDBConnectionProxy::putOrAdd(TransactionOperation& operation, IDBKey* key, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode mode)
</del><ins>+void IDBConnectionProxy::putOrAdd(TransactionOperation& operation, IDBKeyData&& keyData, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode mode)
</ins><span class="cx"> {
</span><span class="cx"> const IDBRequestData requestData(operation);
</span><span class="cx"> saveOperation(operation);
</span><span class="cx">
</span><del>- callConnectionOnMainThread(&IDBConnectionToServer::putOrAdd, requestData, IDBKeyData(key), value, mode);
</del><ins>+ callConnectionOnMainThread(&IDBConnectionToServer::putOrAdd, requestData, keyData, value, mode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void IDBConnectionProxy::getRecord(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesindexeddbclientIDBConnectionProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> void clearObjectStore(TransactionOperation&, uint64_t objectStoreIdentifier);
</span><span class="cx"> void createIndex(TransactionOperation&, const IDBIndexInfo&);
</span><span class="cx"> void deleteIndex(TransactionOperation&, uint64_t objectStoreIdentifier, const String& indexName);
</span><del>- void putOrAdd(TransactionOperation&, IDBKey*, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
</del><ins>+ void putOrAdd(TransactionOperation&, IDBKeyData&&, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
</ins><span class="cx"> void getRecord(TransactionOperation&, const IDBKeyRangeData&);
</span><span class="cx"> void getCount(TransactionOperation&, const IDBKeyRangeData&);
</span><span class="cx"> void deleteRecord(TransactionOperation&, const IDBKeyRangeData&);
</span><span class="lines">@@ -124,7 +124,7 @@
</span><span class="cx"> void callConnectionOnMainThread(void (IDBConnectionToServer::*method)(Parameters...), Arguments&&... arguments)
</span><span class="cx"> {
</span><span class="cx"> if (isMainThread())
</span><del>- (m_connectionToServer.*method)(arguments...);
</del><ins>+ (m_connectionToServer.*method)(std::forward<Arguments>(arguments)...);
</ins><span class="cx"> else
</span><span class="cx"> postMainThreadTask(m_connectionToServer, method, arguments...);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -2796,7 +2796,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void SerializedScriptValue::writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler)
</del><ins>+void SerializedScriptValue::writeBlobsToDiskForIndexedDB(NoncopyableFunction<void (const IDBValue&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> ASSERT(hasBlobURLs());
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsSerializedScriptValueh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include <runtime/ArrayBuffer.h>
</span><span class="cx"> #include <runtime/JSCJSValue.h>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/NoncopyableFunction.h>
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="lines">@@ -86,7 +87,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> Vector<String> blobURLsIsolatedCopy() const;
</span><del>- void writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler);
</del><ins>+ void writeBlobsToDiskForIndexedDB(NoncopyableFunction<void (const IDBValue&)>&& completionHandler);
</ins><span class="cx"> IDBValue writeBlobsToDiskForIndexedDBSynchronously();
</span><span class="cx"> #endif // ENABLE(INDEXED_DATABASE)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistry.h (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistry.h 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/platform/network/BlobRegistry.h 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -33,6 +33,7 @@
</span><span class="cx">
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/Forward.h>
</span><ins>+#include <wtf/NoncopyableFunction.h>
</ins><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -67,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> virtual unsigned long long blobSize(const URL&) = 0;
</span><span class="cx">
</span><del>- virtual void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) = 0;
</del><ins>+ virtual void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) = 0;
</ins><span class="cx">
</span><span class="cx"> virtual bool isBlobRegistryImpl() const { return false; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> Vector<std::pair<String, ThreadSafeDataBuffer>> filePathsOrDataBuffers;
</span><span class="cx"> };
</span><span class="cx">
</span><del>-void BlobRegistryImpl::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
</del><ins>+void BlobRegistryImpl::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> Vector<BlobForFileWriting> blobsForWriting;
</span><span class="cx"> for (auto& url : blobURLs) {
</span><span class="lines">@@ -287,47 +287,45 @@
</span><span class="cx"> blobUtilityQueue().dispatch([blobsForWriting = WTFMove(blobsForWriting), completionHandler = WTFMove(completionHandler)]() mutable {
</span><span class="cx"> Vector<String> filePaths;
</span><span class="cx">
</span><del>- ScopeGuard completionCaller([completionHandler]() mutable {
- callOnMainThread([completionHandler = WTFMove(completionHandler)]() {
- Vector<String> filePaths;
- completionHandler(filePaths);
- });
- });
</del><ins>+ auto performWriting = [blobsForWriting = WTFMove(blobsForWriting), &filePaths]() {
+ for (auto& blob : blobsForWriting) {
+ PlatformFileHandle file;
+ String tempFilePath = openTemporaryFile(ASCIILiteral("Blob"), file);
</ins><span class="cx">
</span><del>- for (auto& blob : blobsForWriting) {
- PlatformFileHandle file;
- String tempFilePath = openTemporaryFile(ASCIILiteral("Blob"), file);
</del><ins>+ ScopeGuard fileCloser([file]() mutable {
+ closeFile(file);
+ });
+
+ if (tempFilePath.isEmpty() || !isHandleValid(file)) {
+ LOG_ERROR("Failed to open temporary file for writing a Blob to IndexedDB");
+ return false;
+ }
</ins><span class="cx">
</span><del>- ScopeGuard fileCloser([file]() {
- PlatformFileHandle handle = file;
- closeFile(handle);
- });
-
- if (tempFilePath.isEmpty() || !isHandleValid(file)) {
- LOG_ERROR("Failed to open temporary file for writing a Blob to IndexedDB");
- return;
- }
-
- for (auto& part : blob.filePathsOrDataBuffers) {
- if (part.second.data()) {
- int length = part.second.data()->size();
- if (writeToFile(file, reinterpret_cast<const char*>(part.second.data()->data()), length) != length) {
- LOG_ERROR("Failed writing a Blob to temporary file for storage in IndexedDB");
- return;
</del><ins>+ for (auto& part : blob.filePathsOrDataBuffers) {
+ if (part.second.data()) {
+ int length = part.second.data()->size();
+ if (writeToFile(file, reinterpret_cast<const char*>(part.second.data()->data()), length) != length) {
+ LOG_ERROR("Failed writing a Blob to temporary file for storage in IndexedDB");
+ return false;
+ }
+ } else {
+ ASSERT(!part.first.isEmpty());
+ if (!appendFileContentsToFileHandle(part.first, file)) {
+ LOG_ERROR("Failed copying File contents to a Blob temporary file for storage in IndexedDB (%s to %s)", part.first.utf8().data(), tempFilePath.utf8().data());
+ return false;
+ }
</ins><span class="cx"> }
</span><del>- } else {
- ASSERT(!part.first.isEmpty());
- if (!appendFileContentsToFileHandle(part.first, file)) {
- LOG_ERROR("Failed copying File contents to a Blob temporary file for storage in IndexedDB (%s to %s)", part.first.utf8().data(), tempFilePath.utf8().data());
- return;
- }
</del><span class="cx"> }
</span><ins>+
+ filePaths.append(tempFilePath.isolatedCopy());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- filePaths.append(tempFilePath.isolatedCopy());
- }
</del><ins>+ return true;
+ };
</ins><span class="cx">
</span><del>- completionCaller.disable();
</del><ins>+ if (!performWriting())
+ filePaths.clear();
+
</ins><span class="cx"> callOnMainThread([completionHandler = WTFMove(completionHandler), filePaths = WTFMove(filePaths)]() {
</span><span class="cx"> completionHandler(filePaths);
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkBlobRegistryImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.h (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx">
</span><span class="cx"> unsigned long long blobSize(const URL&) override;
</span><span class="cx">
</span><del>- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) override;
</del><ins>+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) override;
</ins><span class="cx">
</span><span class="cx"> HashMap<String, RefPtr<BlobData>> m_blobs;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-06-06 Brady Eidson <beidson@apple.com>
+
+ Modern IDB: Crash seen in IDBConnectionProxy::putOrAdd on GuardMalloc bot
+ https://bugs.webkit.org/show_bug.cgi?id=158124
+
+ Reviewed by Darin Adler.
+
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.cpp:
+ (WebKit::NetworkBlobRegistry::writeBlobsToTemporaryFiles):
+ * NetworkProcess/FileAPI/NetworkBlobRegistry.h:
+
+ * WebProcess/FileAPI/BlobRegistryProxy.cpp:
+ (WebKit::BlobRegistryProxy::writeBlobsToTemporaryFiles):
+ * WebProcess/FileAPI/BlobRegistryProxy.h:
+
+ * WebProcess/Network/NetworkProcessConnection.cpp:
+ (WebKit::NetworkProcessConnection::didClose):
+ (WebKit::NetworkProcessConnection::writeBlobsToTemporaryFiles):
+ * WebProcess/Network/NetworkProcessConnection.h:
+
</ins><span class="cx"> 2016-06-06 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r201706.
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.cpp 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -132,9 +132,9 @@
</span><span class="cx"> return blobRegistry().blobSize(url);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler)
</del><ins>+void NetworkBlobRegistry::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler)
</ins><span class="cx"> {
</span><del>- blobRegistry().writeBlobsToTemporaryFiles(blobURLs, completionHandler);
</del><ins>+ blobRegistry().writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkBlobRegistry::connectionToWebProcessDidClose(NetworkConnectionToWebProcess* connection)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessFileAPINetworkBlobRegistryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebKit2/NetworkProcess/FileAPI/NetworkBlobRegistry.h 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx"> #include <wtf/HashSet.h>
</span><ins>+#include <wtf/NoncopyableFunction.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class BlobDataFileReference;
</span><span class="lines">@@ -54,7 +55,7 @@
</span><span class="cx"> void registerBlobURLForSlice(NetworkConnectionToWebProcess*, const WebCore::URL&, const WebCore::URL& srcURL, int64_t start, int64_t end);
</span><span class="cx"> void unregisterBlobURL(NetworkConnectionToWebProcess*, const WebCore::URL&);
</span><span class="cx"> uint64_t blobSize(NetworkConnectionToWebProcess*, const WebCore::URL&);
</span><del>- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void(const Vector<String>&)> completionHandler);
</del><ins>+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void(const Vector<String>&)>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> void connectionToWebProcessDidClose(NetworkConnectionToWebProcess*);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcessNetworkConnectionToWebProcesscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -308,20 +308,18 @@
</span><span class="cx">
</span><span class="cx"> void NetworkConnectionToWebProcess::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, uint64_t requestIdentifier)
</span><span class="cx"> {
</span><del>- RefPtr<NetworkConnectionToWebProcess> protector(this);
-
- Vector<RefPtr<WebCore::BlobDataFileReference>> fileReferences;
</del><ins>+ Vector<RefPtr<BlobDataFileReference>> fileReferences;
</ins><span class="cx"> for (auto& url : blobURLs)
</span><span class="cx"> fileReferences.appendVector(NetworkBlobRegistry::singleton().filesInBlob(*this, { ParsedURLString, url }));
</span><span class="cx">
</span><span class="cx"> for (auto& file : fileReferences)
</span><span class="cx"> file->prepareForFileAccess();
</span><span class="cx">
</span><del>- NetworkBlobRegistry::singleton().writeBlobsToTemporaryFiles(blobURLs, [this, protector, requestIdentifier, fileReferences](auto& fileNames) {
</del><ins>+ NetworkBlobRegistry::singleton().writeBlobsToTemporaryFiles(blobURLs, [this, protectedThis = Ref<NetworkConnectionToWebProcess>(*this), requestIdentifier, fileReferences = WTFMove(fileReferences)](auto& fileNames) mutable {
</ins><span class="cx"> for (auto& file : fileReferences)
</span><span class="cx"> file->revokeFileAccess();
</span><span class="cx">
</span><del>- NetworkProcess::singleton().grantSandboxExtensionsToDatabaseProcessForBlobs(fileNames, [this, protector, requestIdentifier, fileNames]() {
</del><ins>+ NetworkProcess::singleton().grantSandboxExtensionsToDatabaseProcessForBlobs(fileNames, [this, protectedThis = WTFMove(protectedThis), requestIdentifier, fileNames = WTFMove(fileNames)]() {
</ins><span class="cx"> if (!m_connection || !m_connection->isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.cpp 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -81,9 +81,9 @@
</span><span class="cx"> return resultSize;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
</del><ins>+void BlobRegistryProxy::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
</ins><span class="cx"> {
</span><del>- WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, completionHandler);
</del><ins>+ WebProcess::singleton().networkConnection()->writeBlobsToTemporaryFiles(blobURLs, WTFMove(completionHandler));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessFileAPIBlobRegistryProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebKit2/WebProcess/FileAPI/BlobRegistryProxy.h 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -39,7 +39,7 @@
</span><span class="cx"> void unregisterBlobURL(const WebCore::URL&) override;
</span><span class="cx"> void registerBlobURLForSlice(const WebCore::URL&, const WebCore::URL& srcURL, long long start, long long end) override;
</span><span class="cx"> unsigned long long blobSize(const WebCore::URL&) override;
</span><del>- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) override;
</del><ins>+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) override;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.cpp 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -75,7 +75,7 @@
</span><span class="cx"> WebProcess::singleton().networkProcessConnectionClosed(this);
</span><span class="cx">
</span><span class="cx"> Vector<String> dummyFilenames;
</span><del>- for (auto handler : m_writeBlobToFileCompletionHandlers.values())
</del><ins>+ for (auto& handler : m_writeBlobToFileCompletionHandlers.values())
</ins><span class="cx"> handler(dummyFilenames);
</span><span class="cx">
</span><span class="cx"> m_writeBlobToFileCompletionHandlers.clear();
</span><span class="lines">@@ -85,12 +85,12 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
</del><ins>+void NetworkProcessConnection::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx"> static uint64_t writeBlobToFileIdentifier;
</span><span class="cx"> uint64_t requestIdentifier = ++writeBlobToFileIdentifier;
</span><span class="cx">
</span><del>- m_writeBlobToFileCompletionHandlers.set(requestIdentifier, completionHandler);
</del><ins>+ m_writeBlobToFileCompletionHandlers.set(requestIdentifier, WTFMove(completionHandler));
</ins><span class="cx">
</span><span class="cx"> WebProcess::singleton().networkConnection()->connection()->send(Messages::NetworkConnectionToWebProcess::WriteBlobsToTemporaryFiles(blobURLs, requestIdentifier), 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessNetworkNetworkProcessConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h (201716 => 201717)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2016-06-06 18:09:20 UTC (rev 201716)
+++ trunk/Source/WebKit2/WebProcess/Network/NetworkProcessConnection.h 2016-06-06 18:38:34 UTC (rev 201717)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx">
</span><span class="cx"> void didReceiveNetworkProcessConnectionMessage(IPC::Connection&, IPC::MessageDecoder&);
</span><span class="cx">
</span><del>- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler);
</del><ins>+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> NetworkProcessConnection(IPC::Connection::Identifier);
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> // The connection from the web process to the network process.
</span><span class="cx"> RefPtr<IPC::Connection> m_connection;
</span><span class="cx">
</span><del>- HashMap<uint64_t, std::function<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
</del><ins>+ HashMap<uint64_t, NoncopyableFunction<void (const Vector<String>&)>> m_writeBlobToFileCompletionHandlers;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>