Diff
Modified: trunk/Source/WebKit/ChangeLog (258664 => 258665)
--- trunk/Source/WebKit/ChangeLog 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/ChangeLog 2020-03-18 22:30:11 UTC (rev 258665)
@@ -1,3 +1,27 @@
+2020-03-18 Sihui Liu <[email protected]>
+
+ Remove unused IPC message NetworkProcess::ClearCacheForAllOrigins
+ https://bugs.webkit.org/show_bug.cgi?id=209152
+ <rdar://problem/59681717>
+
+ Reviewed by Chris Dumez.
+
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkProcess.messages.in:
+ * NetworkProcess/ios/NetworkProcessIOS.mm:
+ (WebKit::NetworkProcess::clearCacheForAllOrigins): Deleted.
+ * NetworkProcess/mac/NetworkProcessMac.mm:
+ (WebKit::NetworkProcess::clearCacheForAllOrigins): Deleted.
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::NetworkProcess::clearCacheForAllOrigins): Deleted.
+ * Shared/ResourceCachesToClear.h: Removed.
+ * UIProcess/API/C/WKAPICast.h:
+ (WebKit::toResourceCachesToClear): Deleted.
+ * WebKit.xcodeproj/project.pbxproj:
+ * WebProcess/WebProcess.cpp:
+ (WebKit::WebProcess::clearResourceCaches): Deleted.
+ * WebProcess/WebProcess.h:
+
2020-03-18 youenn fablet <[email protected]>
WebPage should own a Ref<WebFrame>
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (258664 => 258665)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2020-03-18 22:30:11 UTC (rev 258665)
@@ -415,7 +415,6 @@
void setCacheModel(CacheModel);
void setCacheModelSynchronouslyForTesting(CacheModel, CompletionHandler<void()>&&);
void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
- void clearCacheForAllOrigins(uint32_t cachesToClear);
void setAllowsAnySSLCertificateForWebSocket(bool, CompletionHandler<void()>&&);
void syncAllCookies();
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in (258664 => 258665)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in 2020-03-18 22:30:11 UTC (rev 258665)
@@ -68,8 +68,7 @@
SyncAllCookies()
AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
-
- ClearCacheForAllOrigins(uint32_t cachesToClear)
+
SetCacheModel(enum:uint8_t WebKit::CacheModel cacheModel)
SetCacheModelSynchronouslyForTesting(enum:uint8_t WebKit::CacheModel cacheModel) -> () Synchronous
Modified: trunk/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm (258664 => 258665)
--- trunk/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm 2020-03-18 22:30:11 UTC (rev 258665)
@@ -30,7 +30,6 @@
#import "NetworkCache.h"
#import "NetworkProcessCreationParameters.h"
-#import "ResourceCachesToClear.h"
#import "SandboxInitializationParameters.h"
#import "SecItemShim.h"
#import <WebCore/CertificateInfo.h>
@@ -61,17 +60,6 @@
[NSURLRequest setAllowsSpecificHTTPSCertificate:(NSArray *)certificateInfo.certificateChain() forHost:host];
}
-void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
-{
- ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
- if (resourceCachesToClear == InMemoryResourceCachesOnly)
- return;
- forEachNetworkSession([](NetworkSession& session) {
- if (auto* cache = session.cache())
- cache->clear();
- });
-}
-
void NetworkProcess::platformInitializeNetworkProcess(const NetworkProcessCreationParameters& parameters)
{
#if ENABLE(SEC_ITEM_SHIM)
Modified: trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm (258664 => 258665)
--- trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/NetworkProcess/mac/NetworkProcessMac.mm 2020-03-18 22:30:11 UTC (rev 258665)
@@ -31,7 +31,6 @@
#import "NetworkCache.h"
#import "NetworkProcessCreationParameters.h"
#import "NetworkResourceLoader.h"
-#import "ResourceCachesToClear.h"
#import "SandboxExtension.h"
#import "SandboxInitializationParameters.h"
#import "SecItemShim.h"
@@ -95,15 +94,6 @@
AuxiliaryProcess::initializeSandbox(parameters, sandboxParameters);
}
-void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
-{
- ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
- if (resourceCachesToClear == InMemoryResourceCachesOnly)
- return;
-
- clearDiskCache(-WallTime::infinity(), [] { });
-}
-
void NetworkProcess::platformTerminate()
{
if (m_clearCacheDispatchGroup) {
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp (258664 => 258665)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2020-03-18 22:30:11 UTC (rev 258665)
@@ -30,7 +30,6 @@
#include "NetworkCache.h"
#include "NetworkProcessCreationParameters.h"
#include "NetworkSessionSoup.h"
-#include "ResourceCachesToClear.h"
#include "WebCookieManager.h"
#include "WebKitCachedResolver.h"
#include <WebCore/CertificateInfo.h>
@@ -160,14 +159,6 @@
SoupNetworkSession::allowSpecificHTTPSCertificateForHost(certificateInfo, host);
}
-void NetworkProcess::clearCacheForAllOrigins(uint32_t cachesToClear)
-{
- if (cachesToClear == InMemoryResourceCachesOnly)
- return;
-
- clearDiskCache(-WallTime::infinity(), [] { });
-}
-
void NetworkProcess::clearDiskCache(WallTime modifiedSince, CompletionHandler<void()>&& completionHandler)
{
auto aggregator = CallbackAggregator::create(WTFMove(completionHandler));
Deleted: trunk/Source/WebKit/Shared/ResourceCachesToClear.h (258664 => 258665)
--- trunk/Source/WebKit/Shared/ResourceCachesToClear.h 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/Shared/ResourceCachesToClear.h 2020-03-18 22:30:11 UTC (rev 258665)
@@ -1,38 +0,0 @@
-/*
- * Copyright (C) 2011 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef ResourceCachesToClear_h
-#define ResourceCachesToClear_h
-
-namespace WebKit {
-
-enum ResourceCachesToClear {
- AllResourceCaches = 0,
- InMemoryResourceCachesOnly = 1
-};
-
-} // namespace WebKit
-
-#endif // ResourceCachesToClear_h
Modified: trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h (258664 => 258665)
--- trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h 2020-03-18 22:30:11 UTC (rev 258665)
@@ -31,7 +31,6 @@
#include "InjectedBundleHitTestResultMediaType.h"
#include "PluginModuleInfo.h"
#include "ProcessTerminationReason.h"
-#include "ResourceCachesToClear.h"
#include "WKBundleHitTestResult.h"
#include "WKContext.h"
#include "WKCookieManager.h"
@@ -357,19 +356,6 @@
}
}
-inline ResourceCachesToClear toResourceCachesToClear(WKResourceCachesToClear wkResourceCachesToClear)
-{
- switch (wkResourceCachesToClear) {
- case WKResourceCachesToClearAll:
- return AllResourceCaches;
- case WKResourceCachesToClearInMemoryOnly:
- return InMemoryResourceCachesOnly;
- }
-
- ASSERT_NOT_REACHED();
- return AllResourceCaches;
-}
-
inline WebCore::HTTPCookieAcceptPolicy toHTTPCookieAcceptPolicy(WKHTTPCookieAcceptPolicy policy)
{
switch (policy) {
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (258664 => 258665)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2020-03-18 22:30:11 UTC (rev 258665)
@@ -5344,7 +5344,6 @@
F6113E26126CE19B0057D0A7 /* WKUserContentURLPattern.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKUserContentURLPattern.cpp; sourceTree = "<group>"; };
F6113E27126CE19B0057D0A7 /* WKUserContentURLPattern.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKUserContentURLPattern.h; sourceTree = "<group>"; };
F634445512A885C8000612D8 /* APISecurityOrigin.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APISecurityOrigin.h; sourceTree = "<group>"; };
- F6A0C13F13281E6E0070430F /* ResourceCachesToClear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ResourceCachesToClear.h; sourceTree = "<group>"; };
F6A90811133C1F3D0082C3F4 /* WebCookieManagerMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCookieManagerMac.mm; sourceTree = "<group>"; };
F6D632BA133D181B00743D77 /* WebCookieManagerProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCookieManagerProxyMac.mm; sourceTree = "<group>"; };
FED3C1DA1B447AE800E0EB7F /* APISerializedScriptValueCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = APISerializedScriptValueCocoa.mm; sourceTree = "<group>"; };
@@ -6010,7 +6009,6 @@
E1CC1B8E12D7EADF00625838 /* PrintInfo.h */,
463FD4811EB94EAD00A2982C /* ProcessTerminationReason.h */,
9B1229D023FF2A5E008CA751 /* RemoteAudioDestinationIdentifier.h */,
- F6A0C13F13281E6E0070430F /* ResourceCachesToClear.h */,
5CB7AFE623C681B000E49CF3 /* ResourceLoadInfo.h */,
5C00993B2417FB7E00D53C25 /* ResourceLoadStatisticsParameters.h */,
410482CB1DDD2FB500F006D0 /* RTCNetwork.cpp */,
Modified: trunk/Source/WebKit/WebProcess/WebProcess.cpp (258664 => 258665)
--- trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/WebProcess/WebProcess.cpp 2020-03-18 22:30:11 UTC (rev 258665)
@@ -871,20 +871,6 @@
parentProcessConnection()->send(Messages::WebProcessProxy::DidDestroyUserGestureToken(identifier), 0);
}
-void WebProcess::clearResourceCaches(ResourceCachesToClear resourceCachesToClear)
-{
- // Toggling the cache model like this forces the cache to evict all its in-memory resources.
- // FIXME: We need a better way to do this.
- CacheModel cacheModel = m_cacheModel;
- setCacheModel(CacheModel::DocumentViewer);
- setCacheModel(cacheModel);
-
- MemoryCache::singleton().evictResources();
-
- // Empty the cross-origin preflight cache.
- CrossOriginPreflightResultCache::singleton().clear();
-}
-
static inline void addCaseFoldedCharacters(StringHasher& hasher, const String& string)
{
if (string.isEmpty())
Modified: trunk/Source/WebKit/WebProcess/WebProcess.h (258664 => 258665)
--- trunk/Source/WebKit/WebProcess/WebProcess.h 2020-03-18 22:27:22 UTC (rev 258664)
+++ trunk/Source/WebKit/WebProcess/WebProcess.h 2020-03-18 22:30:11 UTC (rev 258665)
@@ -31,7 +31,6 @@
#include "MediaDeviceSandboxExtensions.h"
#endif
#include "PluginProcessConnectionManager.h"
-#include "ResourceCachesToClear.h"
#include "SandboxExtension.h"
#include "StorageAreaIdentifier.h"
#include "TextCheckerState.h"
@@ -199,8 +198,6 @@
const TextCheckerState& textCheckerState() const { return m_textCheckerState; }
void setTextCheckerState(const TextCheckerState&);
-
- void clearResourceCaches(ResourceCachesToClear = AllResourceCaches);
#if ENABLE(NETSCAPE_PLUGIN_API)
PluginProcessConnectionManager& pluginProcessConnectionManager();
