Changeset 252264 in webkit

Timestamp:

Nov 8, 2019 3:01:40 PM (4 years ago)

Author:

Antti Koivisto

Message:

Use separate cache directory for development WebKit on Mac
​https://bugs.webkit.org/show_bug.cgi?id=204015

Reviewed by Youenn Fablet.

Replace the NetworkCache::lastStableVersion scheme with a completely separate directory.
This way potential bugs in development WebKit can't end up affecting system WebKit cache.
This also removes the need to keep lastStableVersion updated.

• NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::makeCachePath):

Add '/Development' to cache path if this is not system WebKit.

(WebKit::NetworkCache::Storage::open):
(WebKit::NetworkCache::Storage::deleteOldVersions):

No need to avoid deleting lastStableVersion anymore.

• NetworkProcess/cache/NetworkCacheStorage.h:

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/cache/NetworkCacheStorage.cpp (modified) (3 diffs)
• NetworkProcess/cache/NetworkCacheStorage.h (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-11-08  Antti Koivisto  <antti@apple.com>
+
+        Use separate cache directory for development WebKit on Mac
+        https://bugs.webkit.org/show_bug.cgi?id=204015
+
+        Reviewed by Youenn Fablet.
+
+        Replace the NetworkCache::lastStableVersion scheme with a completely separate directory.
+        This way potential bugs in development WebKit can't end up affecting system WebKit cache.
+        This also removes the need to keep lastStableVersion updated.
+
+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
+        (WebKit::NetworkCache::makeCachePath):
+
+        Add '/Development' to cache path if this is not system WebKit.
+
+        (WebKit::NetworkCache::Storage::open):
+        (WebKit::NetworkCache::Storage::deleteOldVersions):
+
+        No need to avoid deleting lastStableVersion anymore.
+
+        * NetworkProcess/cache/NetworkCacheStorage.h:
+
 2019-11-08  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp

@@ -144 +144 @@
 };
 
+static String makeCachePath(const String& baseCachePath)
+{
+#if PLATFORM(MAC)
+    // Put development cache to a different directory to avoid affecting the system cache.
+    if (!AuxiliaryProcess::isSystemWebKit())
+        return FileSystem::pathByAppendingComponent(baseCachePath, "Development"_s);
+#endif
+    return baseCachePath;
+}
+
 static String makeVersionedDirectoryPath(const String& baseDirectoryPath)
 {
@@ -165 +175 @@
 }
 
-RefPtr<Storage> Storage::open(const String& cachePath, Mode mode)
-{
-    ASSERT(RunLoop::isMain());
+RefPtr<Storage> Storage::open(const String& baseCachePath, Mode mode)
+{
+    ASSERT(RunLoop::isMain());
+
+    auto cachePath = makeCachePath(baseCachePath);
 
     if (!FileSystem::makeAllDirectories(makeVersionedDirectoryPath(cachePath)))
         return nullptr;
+
     auto salt = readOrMakeSalt(makeSaltFilePath(cachePath));
     if (!salt)
         return nullptr;
+
     return adoptRef(new Storage(cachePath, mode, *salt));
 }
@@ -1123 +1137 @@
             if (directoryVersion >= version)
                 return;
-#if PLATFORM(MAC)
-            if (!AuxiliaryProcess::isSystemWebKit() && directoryVersion == lastStableVersion)
-                return;
-#endif
 
             auto oldVersionPath = FileSystem::pathByAppendingComponent(cachePath, subdirName);

trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.h

@@ -109 +109 @@
     // Incrementing this number will delete all existing cache content for everyone. Do you really need to do it?
     static const unsigned version = 15;
-#if PLATFORM(MAC)
-    /// Allow the last stable version of the cache to co-exist with the latest development one.
-    static const unsigned lastStableVersion = 13;
-#endif
 
     String basePathIsolatedCopy() const;