Attachment 373414 Details for Bug 199461 – Patch

[patch] Patch

bug-199461-20190703135613.patch (text/plain), 1.84 KB, created by youenn fablet on 2019-07-03 13:56:14 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-07-03 13:56:14 PDT

Size: 1.84 KB

patch

obsolete

>Subversion Revision: 247073
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index d975590393de44bfb49992d11879ad0790ec2cd6..55ad41e93362af9b65c192d618e4116feea8ac7e 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-07-03  Youenn Fablet  <youenn@apple.com>
>+
>+        Isolate CacheStorage::Engine path when hopping to a background thread
>+        https://bugs.webkit.org/show_bug.cgi?id=199461
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/cache/CacheStorageEngine.cpp:
>+        (WebKit::CacheStorage::Engine::initialize):
>+
> 2019-07-02  Youenn Fablet  <youenn@apple.com>
> 
>         Make sure to cross-thread copy in StorageManager when hopping back to the main thread
>diff --git a/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp b/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp
>index 80aab68d36c468a4b0cb908f6cff650c2af531a6..ac3cdb93046cb5743082c0215840f3e017b231e5 100644
>--- a/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp
>+++ b/Source/WebKit/NetworkProcess/cache/CacheStorageEngine.cpp
>@@ -299,9 +299,9 @@ void Engine::initialize(CompletionCallback&& callback)
>     if (!shouldComputeSalt)
>         return;
> 
>-    String saltPath = FileSystem::pathByAppendingComponent(m_rootPath, "salt"_s);
>-    m_ioQueue->dispatch([this, weakThis = makeWeakPtr(this), saltPath = WTFMove(saltPath)] () mutable {
>-        FileSystem::makeAllDirectories(m_rootPath);
>+    m_ioQueue->dispatch([this, weakThis = makeWeakPtr(this), rootPath = m_rootPath.isolatedCopy()] () mutable {
>+        FileSystem::makeAllDirectories(rootPath);
>+        String saltPath = FileSystem::pathByAppendingComponent(rootPath, "salt"_s);
>         RunLoop::main().dispatch([this, weakThis = WTFMove(weakThis), salt = readOrMakeSalt(saltPath)]() mutable {
>             if (!weakThis)
>                 return;

Actions: View | Formatted Diff | Diff

Attachments on bug 199461: 373414