Diff
Modified: trunk/Source/WebCore/ChangeLog (201695 => 201696)
--- trunk/Source/WebCore/ChangeLog 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/ChangeLog 2016-06-05 14:54:36 UTC (rev 201696)
@@ -1,3 +1,16 @@
+2016-06-05 Brady Eidson <[email protected]>
+
+ Unreviewed, rolling out r201693.
+
+ Can't fix right now
+
+ Reverted changeset:
+
+ "Modern IDB: Crash seen in IDBConnectionProxy::putOrAdd on
+ GuardMalloc bot"
+ https://bugs.webkit.org/show_bug.cgi?id=158124
+ http://trac.webkit.org/changeset/201693
+
2016-06-04 Brady Eidson <[email protected]>
Modern IDB: Crash seen in IDBConnectionProxy::putOrAdd on GuardMalloc bot
Modified: trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp (201695 => 201696)
--- trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/Modules/indexeddb/IDBTransaction.cpp 2016-06-05 14:54:36 UTC (rev 201696)
@@ -966,18 +966,20 @@
return;
}
- value->writeBlobsToDiskForIndexedDB([protectedThis = Ref<IDBTransaction>(*this), this, protectedOperation = Ref<IDBClient::TransactionOperation>(operation), keyData = IDBKeyData(key.get()).isolatedCopy(), overwriteMode](const IDBValue& idbValue) mutable {
+ 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 {
ASSERT(currentThread() == originThreadID());
ASSERT(isMainThread());
if (idbValue.data().data()) {
- m_database->connectionProxy().putOrAdd(protectedOperation.get(), WTFMove(keyData), idbValue, overwriteMode);
+ m_database->connectionProxy().putOrAdd(*protectedOperation, key.get(), idbValue, overwriteMode);
return;
}
// If the IDBValue doesn't have any data, then something went wrong writing the blobs to disk.
// In that case, we cannot successfully store this record, so we callback with an error.
auto result = IDBResultData::error(protectedOperation->identifier(), { IDBDatabaseException::UnknownError, ASCIILiteral("Error preparing Blob/File data to be stored in object store") });
- callOnMainThread([protectedThis = WTFMove(protectedThis), protectedOperation = WTFMove(protectedOperation), result = WTFMove(result)]() mutable {
+ callOnMainThread([protectedThis = WTFMove(protectedThis), protectedOperation = WTFMove(protectedOperation), result = WTFMove(result)]() {
protectedOperation->completed(result);
});
});
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp (201695 => 201696)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.cpp 2016-06-05 14:54:36 UTC (rev 201696)
@@ -156,12 +156,12 @@
callConnectionOnMainThread(&IDBConnectionToServer::deleteIndex, requestData, WTFMove(objectStoreIdentifier), indexName);
}
-void IDBConnectionProxy::putOrAdd(TransactionOperation& operation, IDBKeyData&& keyData, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode mode)
+void IDBConnectionProxy::putOrAdd(TransactionOperation& operation, IDBKey* key, const IDBValue& value, const IndexedDB::ObjectStoreOverwriteMode mode)
{
const IDBRequestData requestData(operation);
saveOperation(operation);
- callConnectionOnMainThread(&IDBConnectionToServer::putOrAdd, requestData, keyData, value, mode);
+ callConnectionOnMainThread(&IDBConnectionToServer::putOrAdd, requestData, IDBKeyData(key), value, mode);
}
void IDBConnectionProxy::getRecord(TransactionOperation& operation, const IDBKeyRangeData& keyRange)
Modified: trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h (201695 => 201696)
--- trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/Modules/indexeddb/client/IDBConnectionProxy.h 2016-06-05 14:54:36 UTC (rev 201696)
@@ -70,7 +70,7 @@
void clearObjectStore(TransactionOperation&, uint64_t objectStoreIdentifier);
void createIndex(TransactionOperation&, const IDBIndexInfo&);
void deleteIndex(TransactionOperation&, uint64_t objectStoreIdentifier, const String& indexName);
- void putOrAdd(TransactionOperation&, IDBKeyData&&, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
+ void putOrAdd(TransactionOperation&, IDBKey*, const IDBValue&, const IndexedDB::ObjectStoreOverwriteMode);
void getRecord(TransactionOperation&, const IDBKeyRangeData&);
void getCount(TransactionOperation&, const IDBKeyRangeData&);
void deleteRecord(TransactionOperation&, const IDBKeyRangeData&);
@@ -124,7 +124,7 @@
void callConnectionOnMainThread(void (IDBConnectionToServer::*method)(Parameters...), Arguments&&... arguments)
{
if (isMainThread())
- (m_connectionToServer.*method)(std::forward<Arguments>(arguments)...);
+ (m_connectionToServer.*method)(arguments...);
else
postMainThreadTask(m_connectionToServer, method, arguments...);
}
Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp (201695 => 201696)
--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.cpp 2016-06-05 14:54:36 UTC (rev 201696)
@@ -2796,7 +2796,7 @@
return result;
}
-void SerializedScriptValue::writeBlobsToDiskForIndexedDB(NoncopyableFunction<void (const IDBValue&)>&& completionHandler)
+void SerializedScriptValue::writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler)
{
ASSERT(isMainThread());
ASSERT(hasBlobURLs());
Modified: trunk/Source/WebCore/bindings/js/SerializedScriptValue.h (201695 => 201696)
--- trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/bindings/js/SerializedScriptValue.h 2016-06-05 14:54:36 UTC (rev 201696)
@@ -31,7 +31,6 @@
#include <runtime/ArrayBuffer.h>
#include <runtime/JSCJSValue.h>
#include <wtf/Forward.h>
-#include <wtf/NoncopyableFunction.h>
#include <wtf/RefCounted.h>
#include <wtf/text/WTFString.h>
@@ -87,7 +86,7 @@
#if ENABLE(INDEXED_DATABASE)
Vector<String> blobURLsIsolatedCopy() const;
- void writeBlobsToDiskForIndexedDB(NoncopyableFunction<void (const IDBValue&)>&& completionHandler);
+ void writeBlobsToDiskForIndexedDB(std::function<void (const IDBValue&)> completionHandler);
IDBValue writeBlobsToDiskForIndexedDBSynchronously();
#endif // ENABLE(INDEXED_DATABASE)
Modified: trunk/Source/WebCore/platform/network/BlobRegistry.h (201695 => 201696)
--- trunk/Source/WebCore/platform/network/BlobRegistry.h 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/platform/network/BlobRegistry.h 2016-06-05 14:54:36 UTC (rev 201696)
@@ -33,7 +33,6 @@
#include <functional>
#include <wtf/Forward.h>
-#include <wtf/NoncopyableFunction.h>
#include <wtf/Vector.h>
namespace WebCore {
@@ -68,7 +67,7 @@
virtual unsigned long long blobSize(const URL&) = 0;
- virtual void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) = 0;
+ virtual void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) = 0;
virtual bool isBlobRegistryImpl() const { return false; }
Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp (201695 => 201696)
--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.cpp 2016-06-05 14:54:36 UTC (rev 201696)
@@ -256,7 +256,7 @@
Vector<std::pair<String, ThreadSafeDataBuffer>> filePathsOrDataBuffers;
};
-void BlobRegistryImpl::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler)
+void BlobRegistryImpl::writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler)
{
Vector<BlobForFileWriting> blobsForWriting;
for (auto& url : blobURLs) {
@@ -287,45 +287,47 @@
blobUtilityQueue().dispatch([blobsForWriting = WTFMove(blobsForWriting), completionHandler = WTFMove(completionHandler)]() mutable {
Vector<String> filePaths;
- auto performWriting = [blobsForWriting = WTFMove(blobsForWriting), &filePaths]() {
- for (auto& blob : blobsForWriting) {
- PlatformFileHandle file;
- String tempFilePath = openTemporaryFile(ASCIILiteral("Blob"), file);
+ ScopeGuard completionCaller([completionHandler]() mutable {
+ callOnMainThread([completionHandler = WTFMove(completionHandler)]() {
+ Vector<String> filePaths;
+ completionHandler(filePaths);
+ });
+ });
- 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;
- }
+ for (auto& blob : blobsForWriting) {
+ PlatformFileHandle file;
+ String tempFilePath = openTemporaryFile(ASCIILiteral("Blob"), file);
- 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;
- }
+ 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;
}
+ } 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;
+ }
}
-
- filePaths.append(tempFilePath.isolatedCopy());
}
- return true;
- };
+ filePaths.append(tempFilePath.isolatedCopy());
+ }
- if (!performWriting())
- filePaths.clear();
-
+ completionCaller.disable();
callOnMainThread([completionHandler = WTFMove(completionHandler), filePaths = WTFMove(filePaths)]() {
completionHandler(filePaths);
});
Modified: trunk/Source/WebCore/platform/network/BlobRegistryImpl.h (201695 => 201696)
--- trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-05 14:53:28 UTC (rev 201695)
+++ trunk/Source/WebCore/platform/network/BlobRegistryImpl.h 2016-06-05 14:54:36 UTC (rev 201696)
@@ -68,7 +68,7 @@
unsigned long long blobSize(const URL&) override;
- void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, NoncopyableFunction<void (const Vector<String>& filePaths)>&& completionHandler) override;
+ void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, std::function<void (const Vector<String>& filePaths)> completionHandler) override;
HashMap<String, RefPtr<BlobData>> m_blobs;
};
