Attachment 347792 Details for Bug 188843 – patch

[patch] patch

cache-old-version-system-3.patch (text/plain), 2.87 KB, created by Antti Koivisto on 2018-08-22 08:10:09 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Antti Koivisto

Created: 2018-08-22 08:10:09 PDT

Size: 2.87 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 235171)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,22 @@
>+2018-08-22  Antti Koivisto  <antti@apple.com>
>+
>+        NetworkCache::Storage::lastStableVersion should be a developer-only feature
>+        https://bugs.webkit.org/show_bug.cgi?id=188843
>+        <rdar://problem/43574100>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/cache/NetworkCacheStorage.cpp:
>+        (WebKit::NetworkCache::Storage::deleteOldVersions):
>+
>+        Delete old cache versions unconditionally if we are system WebKit.
>+
>+        * Shared/ChildProcess.h:
>+        * Shared/mac/ChildProcessMac.mm:
>+        (WebKit::ChildProcess::isSystemWebKit):
>+
>+        Find out if WebKit is installed under '/System/'.
>+
> 2018-08-22  Antti Koivisto  <antti@apple.com>
> 
>         Use OptionSet for NetworkCache::Storage::TraverseFlags
>Index: Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp	(revision 235170)
>+++ Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp	(working copy)
>@@ -26,6 +26,7 @@
> #include "config.h"
> #include "NetworkCacheStorage.h"
> 
>+#include "ChildProcess.h"
> #include "Logging.h"
> #include "NetworkCacheCoders.h"
> #include "NetworkCacheFileSystem.h"
>@@ -1137,7 +1138,7 @@ void Storage::deleteOldVersions()
>             if (directoryVersion >= version)
>                 return;
> #if PLATFORM(MAC)
>-            if (directoryVersion == lastStableVersion)
>+            if (!ChildProcess::isSystemWebKit() && directoryVersion == lastStableVersion)
>                 return;
> #endif
> 
>Index: Source/WebKit/Shared/ChildProcess.h
>===================================================================
>--- Source/WebKit/Shared/ChildProcess.h	(revision 235170)
>+++ Source/WebKit/Shared/ChildProcess.h	(working copy)
>@@ -77,6 +77,10 @@ public:
> 
>     IPC::MessageReceiverMap& messageReceiverMap() { return m_messageReceiverMap; }
> 
>+#if PLATFORM(MAC)
>+    static bool isSystemWebKit();
>+#endif
>+
> protected:
>     explicit ChildProcess();
>     virtual ~ChildProcess();
>Index: Source/WebKit/Shared/mac/ChildProcessMac.mm
>===================================================================
>--- Source/WebKit/Shared/mac/ChildProcessMac.mm	(revision 235170)
>+++ Source/WebKit/Shared/mac/ChildProcessMac.mm	(working copy)
>@@ -732,6 +732,16 @@ void ChildProcess::setQOS(int latencyQOS
>     task_policy_set(mach_task_self(), TASK_OVERRIDE_QOS_POLICY, (task_policy_t)&qosinfo, TASK_QOS_POLICY_COUNT);
> }
> 
>+#if PLATFORM(MAC)
>+bool ChildProcess::isSystemWebKit()
>+{
>+    static bool isSystemWebKit = [] {
>+        return [[webKit2Bundle() bundlePath] hasPrefix:@"/System/"];
>+    }();
>+    return isSystemWebKit;
>+}
>+#endif
>+
> } // namespace WebKit
> 
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 188843: 347792