Attachment 356225 Details for Bug 192246 – Patch

[patch] Patch

bug-192246-20181130125104.patch (text/plain), 11.22 KB, created by Alex Christensen on 2018-11-30 12:51:05 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-11-30 12:51:05 PST

Size: 11.22 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 238749)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,34 @@
>+2018-11-30  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unused NetworkProcessCreationParameters.diskCacheSizeOverride
>+        https://bugs.webkit.org/show_bug.cgi?id=192246
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        The last use of this functionality was removed in rdar://problem/46344871
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::initializeNetworkProcess):
>+        (WebKit::NetworkProcess::setCacheModel):
>+        * NetworkProcess/NetworkProcess.h:
>+        * NetworkProcess/NetworkProcessCreationParameters.cpp:
>+        (WebKit::NetworkProcessCreationParameters::encode const):
>+        (WebKit::NetworkProcessCreationParameters::decode):
>+        * NetworkProcess/NetworkProcessCreationParameters.h:
>+        * UIProcess/API/APIProcessPoolConfiguration.cpp:
>+        (API::ProcessPoolConfiguration::copy):
>+        * UIProcess/API/APIProcessPoolConfiguration.h:
>+        * UIProcess/API/C/WKContextConfigurationRef.cpp:
>+        (WKContextConfigurationDiskCacheSizeOverride):
>+        (WKContextConfigurationSetDiskCacheSizeOverride):
>+        * UIProcess/API/C/WKContextConfigurationRef.h:
>+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h:
>+        * UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm:
>+        (-[_WKProcessPoolConfiguration diskCacheSizeOverride]):
>+        (-[_WKProcessPoolConfiguration setDiskCacheSizeOverride:]):
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::ensureNetworkProcess):
>+
> 2018-11-30  Alexey Proskuryakov  <ap@apple.com>
> 
>         Move USE_CFNETWORK_IGNORE_HSTS to its proper place
>Index: Source/WebKit/NetworkProcess/NetworkProcess.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcess.cpp	(revision 238746)
>+++ Source/WebKit/NetworkProcess/NetworkProcess.cpp	(working copy)
>@@ -308,7 +308,6 @@ void NetworkProcess::initializeNetworkPr
> 
>     m_diskCacheIsDisabledForTesting = parameters.shouldUseTestingNetworkSession;
> 
>-    m_diskCacheSizeOverride = parameters.diskCacheSizeOverride;
>     setCacheModel(static_cast<uint32_t>(parameters.cacheModel));
> 
>     setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
>@@ -875,9 +874,6 @@ void NetworkProcess::setCacheModel(uint3
>         calculateURLCacheSizes(cacheModel, diskFreeSize, urlCacheMemoryCapacity, urlCacheDiskCapacity);
>     }
> 
>-    if (m_diskCacheSizeOverride >= 0)
>-        urlCacheDiskCapacity = m_diskCacheSizeOverride;
>-
>     if (m_cache)
>         m_cache->setCapacity(urlCacheDiskCapacity);
> }
>Index: Source/WebKit/NetworkProcess/NetworkProcess.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcess.h	(revision 238746)
>+++ Source/WebKit/NetworkProcess/NetworkProcess.h	(working copy)
>@@ -354,7 +354,6 @@ private:
>     String m_diskCacheDirectory;
>     bool m_hasSetCacheModel;
>     CacheModel m_cacheModel;
>-    int64_t m_diskCacheSizeOverride { -1 };
>     bool m_suppressMemoryPressureHandler { false };
>     bool m_diskCacheIsDisabledForTesting;
>     bool m_canHandleHTTPSServerTrustEvaluation;
>Index: Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp	(revision 238746)
>+++ Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp	(working copy)
>@@ -42,7 +42,6 @@ NetworkProcessCreationParameters::Networ
> void NetworkProcessCreationParameters::encode(IPC::Encoder& encoder) const
> {
>     encoder.encodeEnum(cacheModel);
>-    encoder << diskCacheSizeOverride;
>     encoder << canHandleHTTPSServerTrustEvaluation;
>     encoder << diskCacheDirectory;
>     encoder << diskCacheDirectoryExtensionHandle;
>@@ -120,8 +119,6 @@ bool NetworkProcessCreationParameters::d
> {
>     if (!decoder.decodeEnum(result.cacheModel))
>         return false;
>-    if (!decoder.decode(result.diskCacheSizeOverride))
>-        return false;
>     if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
>         return false;
> 
>Index: Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h	(revision 238746)
>+++ Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h	(working copy)
>@@ -52,7 +52,6 @@ struct NetworkProcessCreationParameters 
>     static bool decode(IPC::Decoder&, NetworkProcessCreationParameters&);
> 
>     CacheModel cacheModel { CacheModelDocumentViewer };
>-    int64_t diskCacheSizeOverride { -1 };
>     bool canHandleHTTPSServerTrustEvaluation { true };
> 
>     String diskCacheDirectory;
>Index: Source/WebKit/UIProcess/WebProcessPool.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebProcessPool.cpp	(revision 238746)
>+++ Source/WebKit/UIProcess/WebProcessPool.cpp	(working copy)
>@@ -481,7 +481,6 @@ NetworkProcessProxy& WebProcessPool::ens
>     }
> 
>     parameters.cacheModel = cacheModel();
>-    parameters.diskCacheSizeOverride = m_configuration->diskCacheSizeOverride();
>     parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
> 
>     for (auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
>Index: Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp	(revision 238746)
>+++ Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp	(working copy)
>@@ -92,7 +92,6 @@ Ref<ProcessPoolConfiguration> ProcessPoo
>     copy->m_cacheModel = this->m_cacheModel;
>     copy->m_diskCacheDirectory = this->m_diskCacheDirectory;
>     copy->m_diskCacheSpeculativeValidationEnabled = this->m_diskCacheSpeculativeValidationEnabled;
>-    copy->m_diskCacheSizeOverride = this->m_diskCacheSizeOverride;
>     copy->m_applicationCacheDirectory = this->m_applicationCacheDirectory;
>     copy->m_applicationCacheFlatFileSubdirectoryName = this->m_applicationCacheFlatFileSubdirectoryName;
>     copy->m_mediaCacheDirectory = this->m_mediaCacheDirectory;
>Index: Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h
>===================================================================
>--- Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h	(revision 238746)
>+++ Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h	(working copy)
>@@ -76,9 +76,6 @@ public:
>     WebKit::CacheModel cacheModel() const { return m_cacheModel; }
>     void setCacheModel(WebKit::CacheModel cacheModel) { m_cacheModel = cacheModel; }
> 
>-    int64_t diskCacheSizeOverride() const { return m_diskCacheSizeOverride; }
>-    void setDiskCacheSizeOverride(int64_t size) { m_diskCacheSizeOverride = size; }
>-
>     const WTF::String& applicationCacheDirectory() const { return m_applicationCacheDirectory; }
>     void setApplicationCacheDirectory(const WTF::String& applicationCacheDirectory) { m_applicationCacheDirectory = applicationCacheDirectory; }
> 
>@@ -193,7 +190,6 @@ private:
>     unsigned m_maximumProcessCount { 0 };
>     bool m_diskCacheSpeculativeValidationEnabled { false };
>     WebKit::CacheModel m_cacheModel { WebKit::CacheModelPrimaryWebBrowser };
>-    int64_t m_diskCacheSizeOverride { -1 };
> 
>     WTF::String m_applicationCacheDirectory;
>     WTF::String m_applicationCacheFlatFileSubdirectoryName;
>Index: Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp	(revision 238746)
>+++ Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.cpp	(working copy)
>@@ -200,11 +200,10 @@ void WKContextConfigurationSetProcessSwa
> 
> int64_t WKContextConfigurationDiskCacheSizeOverride(WKContextConfigurationRef configuration)
> {
>-    return toImpl(configuration)->diskCacheSizeOverride();
>+    return 0;
> }
> 
> void WKContextConfigurationSetDiskCacheSizeOverride(WKContextConfigurationRef configuration, int64_t size)
> {
>-    toImpl(configuration)->setDiskCacheSizeOverride(size);
> }
> 
>Index: Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h
>===================================================================
>--- Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h	(revision 238746)
>+++ Source/WebKit/UIProcess/API/C/WKContextConfigurationRef.h	(working copy)
>@@ -27,6 +27,7 @@
> #define WKContextConfigurationRef_h
> 
> #include <WebKit/WKBase.h>
>+#include <WebKit/WKDeprecated.h>
> 
> #ifdef __cplusplus
> extern "C" {
>@@ -80,8 +81,8 @@ WK_EXPORT void WKContextConfigurationSet
> WK_EXPORT bool WKContextConfigurationProcessSwapsOnWindowOpenWithOpener(WKContextConfigurationRef configuration);
> WK_EXPORT void WKContextConfigurationSetProcessSwapsOnWindowOpenWithOpener(WKContextConfigurationRef configuration, bool swaps);
> 
>-WK_EXPORT int64_t WKContextConfigurationDiskCacheSizeOverride(WKContextConfigurationRef configuration);
>-WK_EXPORT void WKContextConfigurationSetDiskCacheSizeOverride(WKContextConfigurationRef configuration, int64_t size);
>+WK_EXPORT int64_t WKContextConfigurationDiskCacheSizeOverride(WKContextConfigurationRef configuration) WK_C_API_DEPRECATED;
>+WK_EXPORT void WKContextConfigurationSetDiskCacheSizeOverride(WKContextConfigurationRef configuration, int64_t size) WK_C_API_DEPRECATED;
>     
> #ifdef __cplusplus
> }
>Index: Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h	(revision 238746)
>+++ Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.h	(working copy)
>@@ -49,7 +49,7 @@ WK_CLASS_AVAILABLE(macosx(10.10), ios(8.
> // Network Process properties
> // FIXME: These should be be per-session/data store when we support multiple non-persistent sessions/data stores.
> 
>-@property (nonatomic) NSInteger diskCacheSizeOverride WK_API_AVAILABLE(macosx(10.11), ios(9.0));
>+@property (nonatomic) NSInteger diskCacheSizeOverride WK_API_DEPRECATED("Use [WKWebsiteDataStore nonPersistentDataStore] to limit disk cache size to 0", macosx(10.11, WK_MAC_TBA), ios(9.0, WK_IOS_TBA));
> @property (nonatomic, copy) NSArray *cachePartitionedURLSchemes;
> @property (nonatomic, copy) NSArray<NSString *> *alwaysRevalidatedURLSchemes WK_API_AVAILABLE(macosx(10.12), ios(10.0));
> @property (nonatomic) BOOL diskCacheSpeculativeValidationEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
>Index: Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm	(revision 238746)
>+++ Source/WebKit/UIProcess/API/Cocoa/_WKProcessPoolConfiguration.mm	(working copy)
>@@ -74,12 +74,11 @@ - (void)setMaximumProcessCount:(NSUInteg
> 
> - (NSInteger)diskCacheSizeOverride
> {
>-    return _processPoolConfiguration->diskCacheSizeOverride();
>+    return 0;
> }
> 
> - (void)setDiskCacheSizeOverride:(NSInteger)size
> {
>-    _processPoolConfiguration->setDiskCacheSizeOverride(size);
> }
> 
> - (BOOL)diskCacheSpeculativeValidationEnabled

Flags:

cdumez: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 192246: 356225