Diff
Modified: trunk/Source/WTF/ChangeLog (287404 => 287405)
--- trunk/Source/WTF/ChangeLog 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WTF/ChangeLog 2021-12-23 18:36:33 UTC (rev 287405)
@@ -1,3 +1,12 @@
+2021-12-23 Sihui Liu <[email protected]>
+
+ Ensure file handles used in FileSystemAccess API are closed
+ https://bugs.webkit.org/show_bug.cgi?id=234520
+
+ Reviewed by Darin Adler.
+
+ * wtf/CrossThreadCopier.h:
+
2021-12-22 Sihui Liu <[email protected]>
WebsiteDataStore::excludeDirectoryFromBackup should set attribute for existing directories
Modified: trunk/Source/WebCore/ChangeLog (287404 => 287405)
--- trunk/Source/WebCore/ChangeLog 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/ChangeLog 2021-12-23 18:36:33 UTC (rev 287405)
@@ -1,3 +1,43 @@
+2021-12-23 Sihui Liu <[email protected]>
+
+ Ensure file handles used in FileSystemAccess API are closed
+ https://bugs.webkit.org/show_bug.cgi?id=234520
+
+ Reviewed by Darin Adler.
+
+ WebCore::FileHandle closes file handle in its destructor. Replace FileSystem::PlatformFileHandle with
+ WebCore::FileHandle in FileSystemSyncAccessHandle and WorkerFileSystemStorageConnection to ensure file handle
+ get closed if worker thread fails to execute the callback of createSyncAccessHandle, and if
+ FileSystemSyncAccessHandle is destroyed.
+
+ * Modules/filesystemaccess/FileSystemFileHandle.cpp:
+ (WebCore::FileSystemFileHandle::createSyncAccessHandle):
+ * Modules/filesystemaccess/FileSystemStorageConnection.h:
+ * Modules/filesystemaccess/FileSystemSyncAccessHandle.cpp:
+ (WebCore::FileSystemSyncAccessHandle::create):
+ (WebCore::FileSystemSyncAccessHandle::FileSystemSyncAccessHandle):
+ (WebCore::FileSystemSyncAccessHandle::truncate):
+ (WebCore::FileSystemSyncAccessHandle::getSize):
+ (WebCore::FileSystemSyncAccessHandle::flush):
+ (WebCore::FileSystemSyncAccessHandle::closeInternal):
+ (WebCore::FileSystemSyncAccessHandle::closeFile):
+ (WebCore::FileSystemSyncAccessHandle::read):
+ (WebCore::FileSystemSyncAccessHandle::write):
+ * Modules/filesystemaccess/FileSystemSyncAccessHandle.h:
+ * Modules/filesystemaccess/WorkerFileSystemStorageConnection.cpp:
+ (WebCore::WorkerFileSystemStorageConnection::didCreateSyncAccessHandle):
+ (WebCore::WorkerFileSystemStorageConnection::createSyncAccessHandle):
+ * Modules/filesystemaccess/WorkerFileSystemStorageConnection.h:
+ * platform/FileHandle.cpp:
+ (WebCore::FileHandle::FileHandle):
+ (WebCore::FileHandle::operator=):
+ (WebCore::FileHandle::open):
+ (WebCore::FileHandle::read):
+ (WebCore::FileHandle::write):
+ (WebCore::FileHandle::close):
+ (WebCore::FileHandle::handle const):
+ * platform/FileHandle.h:
+
2021-12-23 Wenson Hsieh <[email protected]>
Add API testing support for modal container observation
Modified: trunk/Source/WebCore/Modules/filesystemaccess/FileSystemFileHandle.cpp (287404 => 287405)
--- trunk/Source/WebCore/Modules/filesystemaccess/FileSystemFileHandle.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/Modules/filesystemaccess/FileSystemFileHandle.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -79,17 +79,16 @@
return promise.reject(result.releaseException());
auto [identifier, file] = result.releaseReturnValue();
- if (file == FileSystem::invalidPlatformFileHandle)
+ if (!file)
return promise.reject(Exception { UnknownError, "Invalid platform file handle"_s });
auto* context = protectedThis->scriptExecutionContext();
if (!context) {
- FileSystem::closeFile(file);
protectedThis->closeSyncAccessHandle(identifier, { });
return promise.reject(Exception { InvalidStateError, "Context has stopped"_s });
}
- promise.resolve(FileSystemSyncAccessHandle::create(*context, protectedThis.get(), identifier, file));
+ promise.resolve(FileSystemSyncAccessHandle::create(*context, protectedThis.get(), identifier, WTFMove(file)));
});
}
Modified: trunk/Source/WebCore/Modules/filesystemaccess/FileSystemStorageConnection.h (287404 => 287405)
--- trunk/Source/WebCore/Modules/filesystemaccess/FileSystemStorageConnection.h 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/Modules/filesystemaccess/FileSystemStorageConnection.h 2021-12-23 18:36:33 UTC (rev 287405)
@@ -37,6 +37,7 @@
class FileSystemDirectoryHandle;
class FileSystemFileHandle;
+class FileHandle;
class FileSystemHandleCloseScope;
class FileSystemSyncAccessHandle;
template<typename> class ExceptionOr;
@@ -48,7 +49,7 @@
using SameEntryCallback = CompletionHandler<void(ExceptionOr<bool>&&)>;
using GetHandleCallback = CompletionHandler<void(ExceptionOr<Ref<FileSystemHandleCloseScope>>&&)>;
using ResolveCallback = CompletionHandler<void(ExceptionOr<Vector<String>>&&)>;
- using GetAccessHandleCallback = CompletionHandler<void(ExceptionOr<std::pair<FileSystemSyncAccessHandleIdentifier, FileSystem::PlatformFileHandle>>&&)>;
+ using GetAccessHandleCallback = CompletionHandler<void(ExceptionOr<std::pair<FileSystemSyncAccessHandleIdentifier, FileHandle>>&&)>;
using VoidCallback = CompletionHandler<void(ExceptionOr<void>&&)>;
using GetHandleNamesCallback = CompletionHandler<void(ExceptionOr<Vector<String>>&&)>;
using StringCallback = CompletionHandler<void(ExceptionOr<String>&&)>;
Modified: trunk/Source/WebCore/Modules/filesystemaccess/FileSystemSyncAccessHandle.cpp (287404 => 287405)
--- trunk/Source/WebCore/Modules/filesystemaccess/FileSystemSyncAccessHandle.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/Modules/filesystemaccess/FileSystemSyncAccessHandle.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -35,20 +35,20 @@
namespace WebCore {
-Ref<FileSystemSyncAccessHandle> FileSystemSyncAccessHandle::create(ScriptExecutionContext& context, FileSystemFileHandle& source, FileSystemSyncAccessHandleIdentifier identifier, FileSystem::PlatformFileHandle file)
+Ref<FileSystemSyncAccessHandle> FileSystemSyncAccessHandle::create(ScriptExecutionContext& context, FileSystemFileHandle& source, FileSystemSyncAccessHandleIdentifier identifier, FileHandle&& file)
{
- auto handle = adoptRef(*new FileSystemSyncAccessHandle(context, source, identifier, file));
+ auto handle = adoptRef(*new FileSystemSyncAccessHandle(context, source, identifier, WTFMove(file)));
handle->suspendIfNeeded();
return handle;
}
-FileSystemSyncAccessHandle::FileSystemSyncAccessHandle(ScriptExecutionContext& context, FileSystemFileHandle& source, FileSystemSyncAccessHandleIdentifier identifier, FileSystem::PlatformFileHandle file)
+FileSystemSyncAccessHandle::FileSystemSyncAccessHandle(ScriptExecutionContext& context, FileSystemFileHandle& source, FileSystemSyncAccessHandleIdentifier identifier, FileHandle&& file)
: ActiveDOMObject(&context)
, m_source(source)
, m_identifier(identifier)
- , m_file(file)
+ , m_file(WTFMove(file))
{
- ASSERT(m_file != FileSystem::invalidPlatformFileHandle);
+ ASSERT(m_file);
m_source->registerSyncAccessHandle(m_identifier, *this);
}
@@ -88,7 +88,7 @@
return promise.reject(Exception { InvalidStateError, "Context is invalid"_s });
m_pendingPromises.append(WTFMove(promise));
- WorkerGlobalScope::postFileSystemStorageTask([weakThis = WeakPtr { *this }, file = m_file, size, workerThread = Ref { scope->thread() }]() mutable {
+ WorkerGlobalScope::postFileSystemStorageTask([weakThis = WeakPtr { *this }, file = m_file.handle(), size, workerThread = Ref { scope->thread() }]() mutable {
workerThread->runLoop().postTask([weakThis = WTFMove(weakThis), success = FileSystem::truncateFile(file, size)](auto&) mutable {
if (weakThis)
weakThis->completePromise(success ? ExceptionOr<void> { } : Exception { UnknownError });
@@ -106,7 +106,7 @@
return promise.reject(Exception { InvalidStateError, "Context is invalid"_s });
m_pendingPromises.append(WTFMove(promise));
- WorkerGlobalScope::postFileSystemStorageTask([weakThis = WeakPtr { *this }, file = m_file, workerThread = Ref { scope->thread() }]() mutable {
+ WorkerGlobalScope::postFileSystemStorageTask([weakThis = WeakPtr { *this }, file = m_file.handle(), workerThread = Ref { scope->thread() }]() mutable {
workerThread->runLoop().postTask([weakThis = WTFMove(weakThis), success = FileSystem::fileSize(file)](auto&) mutable {
if (weakThis)
weakThis->completePromise(success ? ExceptionOr<uint64_t> { success.value() } : Exception { UnknownError });
@@ -124,7 +124,7 @@
return promise.reject(Exception { InvalidStateError, "Context is invalid"_s });
m_pendingPromises.append(WTFMove(promise));
- WorkerGlobalScope::postFileSystemStorageTask([weakThis = WeakPtr { *this }, file = m_file, workerThread = Ref { scope->thread() }]() mutable {
+ WorkerGlobalScope::postFileSystemStorageTask([weakThis = WeakPtr { *this }, file = m_file.handle(), workerThread = Ref { scope->thread() }]() mutable {
workerThread->runLoop().postTask([weakThis = WTFMove(weakThis), success = FileSystem::flushFile(file)](auto&) mutable {
if (weakThis)
weakThis->completePromise(success ? ExceptionOr<void> { } : Exception { UnknownError });
@@ -149,20 +149,19 @@
if (isClosing)
return;
- ASSERT(m_file != FileSystem::invalidPlatformFileHandle);
+ ASSERT(m_file);
closeFile();
}
void FileSystemSyncAccessHandle::closeFile()
{
- if (m_file == FileSystem::invalidPlatformFileHandle)
+ if (!m_file)
return;
auto* scope = downcast<WorkerGlobalScope>(scriptExecutionContext());
ASSERT(scope);
- WorkerGlobalScope::postFileSystemStorageTask([weakThis = WeakPtr { *this }, file = std::exchange(m_file, FileSystem::invalidPlatformFileHandle), workerThread = Ref { scope->thread() }]() mutable {
- FileSystem::closeFile(file);
+ WorkerGlobalScope::postFileSystemStorageTask([weakThis = WeakPtr { *this }, file = std::exchange(m_file, { }), workerThread = Ref { scope->thread() }]() mutable {
workerThread->runLoop().postTask([weakThis = WTFMove(weakThis)](auto&) mutable {
if (weakThis)
weakThis->didCloseFile();
@@ -212,11 +211,11 @@
if (!m_pendingPromises.isEmpty())
return Exception { InvalidStateError, "Access handle has unfinished operation"_s };
- int result = FileSystem::seekFile(m_file, options.at, FileSystem::FileSeekOrigin::Beginning);
+ int result = FileSystem::seekFile(m_file.handle(), options.at, FileSystem::FileSeekOrigin::Beginning);
if (result == -1)
return Exception { InvalidStateError, "Failed to read at offset"_s };
- result = FileSystem::readFromFile(m_file, buffer.mutableData(), buffer.length());
+ result = FileSystem::readFromFile(m_file.handle(), buffer.mutableData(), buffer.length());
if (result == -1)
return Exception { InvalidStateError, "Failed to read from file"_s };
@@ -233,11 +232,11 @@
if (!m_pendingPromises.isEmpty())
return Exception { InvalidStateError, "Access handle has unfinished operation"_s };
- int result = FileSystem::seekFile(m_file, options.at, FileSystem::FileSeekOrigin::Beginning);
+ int result = FileSystem::seekFile(m_file.handle(), options.at, FileSystem::FileSeekOrigin::Beginning);
if (result == -1)
return Exception { InvalidStateError, "Failed to write at offset"_s };
- result = FileSystem::writeToFile(m_file, buffer.data(), buffer.length());
+ result = FileSystem::writeToFile(m_file.handle(), buffer.data(), buffer.length());
if (result == -1)
return Exception { InvalidStateError, "Failed to write to file"_s };
Modified: trunk/Source/WebCore/Modules/filesystemaccess/FileSystemSyncAccessHandle.h (287404 => 287405)
--- trunk/Source/WebCore/Modules/filesystemaccess/FileSystemSyncAccessHandle.h 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/Modules/filesystemaccess/FileSystemSyncAccessHandle.h 2021-12-23 18:36:33 UTC (rev 287405)
@@ -28,6 +28,7 @@
#include "ActiveDOMObject.h"
#include "BufferSource.h"
#include "ExceptionOr.h"
+#include "FileHandle.h"
#include "FileSystemSyncAccessHandleIdentifier.h"
#include "IDLTypes.h"
#include <wtf/Deque.h>
@@ -45,7 +46,7 @@
unsigned long long at;
};
- static Ref<FileSystemSyncAccessHandle> create(ScriptExecutionContext&, FileSystemFileHandle&, FileSystemSyncAccessHandleIdentifier, FileSystem::PlatformFileHandle);
+ static Ref<FileSystemSyncAccessHandle> create(ScriptExecutionContext&, FileSystemFileHandle&, FileSystemSyncAccessHandleIdentifier, FileHandle&&);
~FileSystemSyncAccessHandle();
void truncate(unsigned long long size, DOMPromiseDeferred<void>&&);
@@ -59,7 +60,7 @@
void invalidate();
private:
- FileSystemSyncAccessHandle(ScriptExecutionContext&, FileSystemFileHandle&, FileSystemSyncAccessHandleIdentifier, FileSystem::PlatformFileHandle);
+ FileSystemSyncAccessHandle(ScriptExecutionContext&, FileSystemFileHandle&, FileSystemSyncAccessHandleIdentifier, FileHandle&&);
bool isClosingOrClosed() const;
using CloseCallback = CompletionHandler<void(ExceptionOr<void>&&)>;
void closeInternal(CloseCallback&&);
@@ -75,7 +76,7 @@
Ref<FileSystemFileHandle> m_source;
FileSystemSyncAccessHandleIdentifier m_identifier;
- FileSystem::PlatformFileHandle m_file;
+ FileHandle m_file;
std::optional<ExceptionOr<void>> m_closeResult;
Vector<CloseCallback> m_closeCallbacks;
using Promise = std::variant<DOMPromiseDeferred<void>, DOMPromiseDeferred<IDLUnsignedLongLong>>;
Modified: trunk/Source/WebCore/Modules/filesystemaccess/WorkerFileSystemStorageConnection.cpp (287404 => 287405)
--- trunk/Source/WebCore/Modules/filesystemaccess/WorkerFileSystemStorageConnection.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/Modules/filesystemaccess/WorkerFileSystemStorageConnection.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -237,7 +237,7 @@
callback(WTFMove(result));
}
-void WorkerFileSystemStorageConnection::didCreateSyncAccessHandle(CallbackIdentifier callbackIdentifier, ExceptionOr<std::pair<FileSystemSyncAccessHandleIdentifier, FileSystem::PlatformFileHandle>>&& result)
+void WorkerFileSystemStorageConnection::didCreateSyncAccessHandle(CallbackIdentifier callbackIdentifier, ExceptionOr<std::pair<FileSystemSyncAccessHandleIdentifier, FileHandle>>&& result)
{
if (auto callback = m_getAccessHandlCallbacks.take(callbackIdentifier))
callback(WTFMove(result));
@@ -259,10 +259,9 @@
callOnMainThread([callbackIdentifier, workerThread = Ref { m_scope->thread() }, mainThreadConnection = m_mainThreadConnection, identifier]() mutable {
auto mainThreadCallback = [callbackIdentifier, workerThread = WTFMove(workerThread)](auto result) mutable {
- auto crossThreadResult = result;
if (result.hasException())
- crossThreadResult = crossThreadCopy(result.exception());
- workerThread->runLoop().postTaskForMode([callbackIdentifier, result = WTFMove(crossThreadResult)] (auto& scope) mutable {
+ result = crossThreadCopy(result.exception());
+ workerThread->runLoop().postTaskForMode([callbackIdentifier, result = WTFMove(result)] (auto& scope) mutable {
if (auto connection = downcast<WorkerGlobalScope>(scope).fileSystemStorageConnection())
connection->didCreateSyncAccessHandle(callbackIdentifier, WTFMove(result));
}, WorkerRunLoop::defaultMode());
Modified: trunk/Source/WebCore/Modules/filesystemaccess/WorkerFileSystemStorageConnection.h (287404 => 287405)
--- trunk/Source/WebCore/Modules/filesystemaccess/WorkerFileSystemStorageConnection.h 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/Modules/filesystemaccess/WorkerFileSystemStorageConnection.h 2021-12-23 18:36:33 UTC (rev 287405)
@@ -32,6 +32,7 @@
namespace WebCore {
+class FileHandle;
class FileSystemSyncAccessHandle;
class WorkerGlobalScope;
class WorkerThread;
@@ -50,7 +51,7 @@
void didGetHandle(CallbackIdentifier, ExceptionOr<Ref<FileSystemHandleCloseScope>>&&);
void didResolve(CallbackIdentifier, ExceptionOr<Vector<String>>&&);
void completeStringCallback(CallbackIdentifier, ExceptionOr<String>&&);
- void didCreateSyncAccessHandle(CallbackIdentifier, ExceptionOr<std::pair<FileSystemSyncAccessHandleIdentifier, FileSystem::PlatformFileHandle>>&&);
+ void didCreateSyncAccessHandle(CallbackIdentifier, ExceptionOr<std::pair<FileSystemSyncAccessHandleIdentifier, FileHandle>>&&);
void completeVoidCallback(CallbackIdentifier, ExceptionOr<void>&& result);
void didGetHandleNames(CallbackIdentifier, ExceptionOr<Vector<String>>&&);
Modified: trunk/Source/WebCore/platform/FileHandle.cpp (287404 => 287405)
--- trunk/Source/WebCore/platform/FileHandle.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/platform/FileHandle.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -52,6 +52,11 @@
{
}
+FileHandle::FileHandle(FileSystem::PlatformFileHandle&& handle)
+ : m_fileHandle(WTFMove(handle))
+{
+}
+
FileHandle::~FileHandle()
{
close();
@@ -63,6 +68,9 @@
m_path = WTFMove(other.m_path);
m_mode = WTFMove(other.m_mode);
m_fileHandle = std::exchange(other.m_fileHandle, FileSystem::invalidPlatformFileHandle);
+ m_shouldLock = other.m_shouldLock;
+ m_lockMode = other.m_lockMode;
+
return *this;
}
@@ -84,8 +92,12 @@
bool FileHandle::open()
{
+ if (m_path.isEmpty())
+ return false;
+
if (!*this)
m_fileHandle = m_shouldLock ? FileSystem::openAndLockFile(m_path, m_mode, m_lockMode) : FileSystem::openFile(m_path, m_mode);
+
return static_cast<bool>(*this);
}
@@ -93,6 +105,7 @@
{
if (!open())
return -1;
+
return FileSystem::readFromFile(m_fileHandle, data, length);
}
@@ -100,6 +113,7 @@
{
if (!open())
return -1;
+
return FileSystem::writeToFile(m_fileHandle, data, length);
}
@@ -126,8 +140,15 @@
if (m_shouldLock && *this) {
// FileSystem::unlockAndCloseFile requires the file handle to be valid while closeFile does not
FileSystem::unlockAndCloseFile(m_fileHandle);
- } else
- FileSystem::closeFile(m_fileHandle);
+ return;
+ }
+
+ FileSystem::closeFile(m_fileHandle);
}
+FileSystem::PlatformFileHandle FileHandle::handle() const
+{
+ return m_fileHandle;
+}
+
} // namespace WebCore
Modified: trunk/Source/WebCore/platform/FileHandle.h (287404 => 287405)
--- trunk/Source/WebCore/platform/FileHandle.h 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebCore/platform/FileHandle.h 2021-12-23 18:36:33 UTC (rev 287405)
@@ -36,15 +36,14 @@
class WEBCORE_EXPORT FileHandle final {
public:
FileHandle() = default;
+ ~FileHandle();
FileHandle(const String& path, FileSystem::FileOpenMode);
FileHandle(const String& path, FileSystem::FileOpenMode, OptionSet<FileSystem::FileLockMode>);
- FileHandle(const FileHandle& other) = delete;
FileHandle(FileHandle&& other);
-
- ~FileHandle();
-
- FileHandle& operator=(const FileHandle& other) = delete;
FileHandle& operator=(FileHandle&& other);
+ FileHandle(const FileHandle&) = delete;
+ FileHandle& operator=(const FileHandle&) = delete;
+ explicit FileHandle(FileSystem::PlatformFileHandle&&);
explicit operator bool() const;
@@ -55,6 +54,8 @@
bool printf(const char* format, ...) WTF_ATTRIBUTE_PRINTF(2, 3);
void close();
+ FileSystem::PlatformFileHandle handle() const;
+
private:
String m_path;
FileSystem::FileOpenMode m_mode { FileSystem::FileOpenMode::Read };
Modified: trunk/Source/WebKit/ChangeLog (287404 => 287405)
--- trunk/Source/WebKit/ChangeLog 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebKit/ChangeLog 2021-12-23 18:36:33 UTC (rev 287405)
@@ -1,3 +1,32 @@
+2021-12-23 Sihui Liu <[email protected]>
+
+ Ensure file handles used in FileSystemAccess API are closed
+ https://bugs.webkit.org/show_bug.cgi?id=234520
+
+ Reviewed by Darin Adler.
+
+ Replace FileSystem::PlatformFileHandle with WebCore::FileHandle in SharedFileHandle to ensure file handle get
+ closed, if it's not released for use.
+
+ * NetworkProcess/storage/FileSystemStorageHandle.cpp:
+ (WebKit::FileSystemStorageHandle::createSyncAccessHandle):
+ * NetworkProcess/storage/NetworkStorageManager.cpp:
+ (WebKit::NetworkStorageManager::createSyncAccessHandle):
+ * Platform/IPC/SharedFileHandle.cpp:
+ (IPC::SharedFileHandle::create):
+ (IPC::SharedFileHandle::close): Deleted.
+ * Platform/IPC/SharedFileHandle.h:
+ (IPC::SharedFileHandle::release):
+ (IPC::SharedFileHandle::SharedFileHandle):
+ (IPC::SharedFileHandle::handle): Deleted.
+ (): Deleted.
+ * Platform/IPC/cocoa/SharedFileHandleCocoa.cpp:
+ (IPC::SharedFileHandle::create):
+ (IPC::SharedFileHandle::encode const):
+ (IPC::SharedFileHandle::decode):
+ * WebProcess/WebCoreSupport/WebFileSystemStorageConnection.cpp:
+ (WebKit::WebFileSystemStorageConnection::createSyncAccessHandle):
+
2021-12-22 Alex Christensen <[email protected]>
Re-enable WebPushD.HandleInjectedPush API test
Modified: trunk/Source/WebKit/NetworkProcess/storage/FileSystemStorageHandle.cpp (287404 => 287405)
--- trunk/Source/WebKit/NetworkProcess/storage/FileSystemStorageHandle.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebKit/NetworkProcess/storage/FileSystemStorageHandle.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -172,7 +172,7 @@
if (handle == FileSystem::invalidPlatformFileHandle)
return makeUnexpected(FileSystemStorageError::Unknown);
- auto ipcHandle = IPC::SharedFileHandle::create(handle);
+ auto ipcHandle = IPC::SharedFileHandle::create(std::exchange(handle, FileSystem::invalidPlatformFileHandle));
if (!ipcHandle) {
FileSystem::closeFile(handle);
return makeUnexpected(FileSystemStorageError::BackendNotSupported);
Modified: trunk/Source/WebKit/NetworkProcess/storage/NetworkStorageManager.cpp (287404 => 287405)
--- trunk/Source/WebKit/NetworkProcess/storage/NetworkStorageManager.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebKit/NetworkProcess/storage/NetworkStorageManager.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -371,12 +371,7 @@
if (!handle)
return completionHandler(makeUnexpected(FileSystemStorageError::Unknown));
- auto result = handle->createSyncAccessHandle();
- auto fileHandle = result ? result.value().second : IPC::SharedFileHandle();
- completionHandler(WTFMove(result));
-
- // Close the file handle in network process.
- fileHandle.close();
+ completionHandler(handle->createSyncAccessHandle());
}
void NetworkStorageManager::closeSyncAccessHandle(WebCore::FileSystemHandleIdentifier identifier, WebCore::FileSystemSyncAccessHandleIdentifier accessHandleIdentifier, CompletionHandler<void(std::optional<FileSystemStorageError>)>&& completionHandler)
Modified: trunk/Source/WebKit/Platform/IPC/SharedFileHandle.cpp (287404 => 287405)
--- trunk/Source/WebKit/Platform/IPC/SharedFileHandle.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebKit/Platform/IPC/SharedFileHandle.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -28,15 +28,13 @@
namespace IPC {
-void SharedFileHandle::close()
-{
- FileSystem::closeFile(m_handle);
-}
-
#if !PLATFORM(COCOA)
-std::optional<SharedFileHandle> SharedFileHandle::create(FileSystem::PlatformFileHandle)
+std::optional<SharedFileHandle> SharedFileHandle::create(FileSystem::PlatformFileHandle&& handle)
{
+ auto currentHandle = WTFMove(handle);
+ FileSystem::closeFile(currentHandle);
+
return std::nullopt;
}
Modified: trunk/Source/WebKit/Platform/IPC/SharedFileHandle.h (287404 => 287405)
--- trunk/Source/WebKit/Platform/IPC/SharedFileHandle.h 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebKit/Platform/IPC/SharedFileHandle.h 2021-12-23 18:36:33 UTC (rev 287405)
@@ -25,6 +25,7 @@
#pragma once
+#include <WebCore/FileHandle.h>
#include <fcntl.h>
#include <wtf/FileSystem.h>
@@ -35,22 +36,21 @@
class SharedFileHandle {
public:
- static std::optional<SharedFileHandle> create(FileSystem::PlatformFileHandle);
+ static std::optional<SharedFileHandle> create(FileSystem::PlatformFileHandle&&);
SharedFileHandle() = default;
- FileSystem::PlatformFileHandle handle() { return m_handle; }
- void close();
+ WebCore::FileHandle release() { return std::exchange(m_handle, { }); }
void encode(Encoder&) const;
static std::optional<SharedFileHandle> decode(Decoder&);
private:
- explicit SharedFileHandle(FileSystem::PlatformFileHandle handle)
- : m_handle(handle)
+ explicit SharedFileHandle(FileSystem::PlatformFileHandle&& handle)
+ : m_handle(WTFMove(handle))
{
}
- FileSystem::PlatformFileHandle m_handle { FileSystem::invalidPlatformFileHandle };
+ WebCore::FileHandle m_handle;
};
} // namespace IPC
Modified: trunk/Source/WebKit/Platform/IPC/cocoa/SharedFileHandleCocoa.cpp (287404 => 287405)
--- trunk/Source/WebKit/Platform/IPC/cocoa/SharedFileHandleCocoa.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebKit/Platform/IPC/cocoa/SharedFileHandleCocoa.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -31,15 +31,15 @@
namespace IPC {
-std::optional<SharedFileHandle> SharedFileHandle::create(FileSystem::PlatformFileHandle handle)
+std::optional<SharedFileHandle> SharedFileHandle::create(FileSystem::PlatformFileHandle&& handle)
{
- return SharedFileHandle { handle };
+ return SharedFileHandle { WTFMove(handle) };
}
void SharedFileHandle::encode(Encoder& encoder) const
{
mach_port_name_t fileport = MACH_PORT_NULL;
- if (fileport_makeport(m_handle, &fileport) == -1) {
+ if (fileport_makeport(m_handle.handle(), &fileport) == -1) {
encoder << MachPort();
return;
}
@@ -57,7 +57,7 @@
if (fd == -1)
return SharedFileHandle { };
- return SharedFileHandle::create(fd);
+ return SharedFileHandle::create(WTFMove(fd));
}
} // namespace IPC
Modified: trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFileSystemStorageConnection.cpp (287404 => 287405)
--- trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFileSystemStorageConnection.cpp 2021-12-23 17:57:29 UTC (rev 287404)
+++ trunk/Source/WebKit/WebProcess/WebCoreSupport/WebFileSystemStorageConnection.cpp 2021-12-23 18:36:33 UTC (rev 287405)
@@ -149,8 +149,7 @@
if (!result)
return completionHandler(convertToException(result.error()));
- auto resultValue = result.value();
- completionHandler(std::pair { resultValue.first, resultValue.second.handle() });
+ completionHandler(std::pair { result.value().first, result.value().second.release() });
});
}
