Changeset 249589 in webkit
- Timestamp:
- Sep 6, 2019, 1:42:42 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 1 deleted
- 26 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified trunk/Source/WebKit/ChangeLog ¶
r249585 r249589 1 2019-09-06 Alex Christensen <achristensen@webkit.org> 2 3 Deprecate all WKCookieManagerRef functions 4 https://bugs.webkit.org/show_bug.cgi?id=201473 5 6 Reviewed by Chris Dumez. 7 8 Their use was removed in rdar://problem/55039275 9 Created replacement C API that more closely resembles the public ObjC API for WebKitTestRunner. 10 11 * Shared/API/c/WKBase.h: 12 * Sources.txt: 13 * UIProcess/API/APIHTTPCookieStore.cpp: 14 (API::HTTPCookieStore::deleteAllCookies): 15 (API::HTTPCookieStore::setHTTPCookieAcceptPolicy): 16 (API::HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore): 17 (API::HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore): 18 * UIProcess/API/APIHTTPCookieStore.h: 19 * UIProcess/API/C/WKAPICast.h: 20 * UIProcess/API/C/WKContext.cpp: 21 (WKContextSetStorageAccessAPIEnabled): 22 * UIProcess/API/C/WKContext.h: 23 * UIProcess/API/C/WKCookieManager.cpp: 24 (WKCookieManagerGetTypeID): 25 (WKCookieManagerSetClient): 26 (WKCookieManagerGetHostnamesWithCookies): 27 (WKCookieManagerDeleteCookiesForHostname): 28 (WKCookieManagerDeleteAllCookies): 29 (WKCookieManagerDeleteAllCookiesModifiedAfterDate): 30 (WKCookieManagerSetHTTPCookieAcceptPolicy): 31 (WKCookieManagerGetHTTPCookieAcceptPolicy): 32 (WKCookieManagerSetStorageAccessAPIEnabled): 33 (WKCookieManagerStartObservingCookieChanges): 34 (WKCookieManagerStopObservingCookieChanges): 35 * UIProcess/API/C/WKCookieManager.h: 36 * UIProcess/API/C/WKHTTPCookieStoreRef.cpp: Added. 37 (WKHTTPCookieStoreGetTypeID): 38 (WKHTTPCookieStoreDeleteAllCookies): 39 (WKHTTPCookieStoreSetHTTPCookieAcceptPolicy): 40 * UIProcess/API/C/WKHTTPCookieStoreRef.h: Added. 41 * UIProcess/API/C/WKWebsiteDataStoreRef.cpp: 42 (WKWebsiteDataStoreGetHTTPCookieStore): 43 * UIProcess/API/C/WKWebsiteDataStoreRef.h: 44 * UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm: 45 (API::HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore): 46 (API::toNSHTTPCookieAcceptPolicy): 47 (API::HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore): 48 * UIProcess/WebCookieManagerProxy.cpp: 49 (WebKit::WebCookieManagerProxy::setStorageAccessAPIEnabled): Deleted. 50 * UIProcess/WebCookieManagerProxy.h: 51 * WebKit.xcodeproj/project.pbxproj: 52 1 53 2019-09-06 Darryl Pogue <darryl@dpogue.ca> 2 54 -
TabularUnified trunk/Source/WebKit/PlatformWin.cmake ¶
r248029 r249589 263 263 UIProcess/API/C/WKGeolocationPermissionRequest.h 264 264 UIProcess/API/C/WKGeolocationPosition.h 265 UIProcess/API/C/WKHTTPCookieStoreRef.h 265 266 UIProcess/API/C/WKHitTestResult.h 266 267 UIProcess/API/C/WKIconDatabase.h -
TabularUnified trunk/Source/WebKit/Shared/API/c/WKBase.h ¶
r246856 r249589 101 101 typedef const struct OpaqueWKGeolocationPosition* WKGeolocationPositionRef; 102 102 typedef const struct OpaqueWKGrammarDetail* WKGrammarDetailRef; 103 typedef const struct OpaqueWKHTTPCookieStore* WKHTTPCookieStoreRef; 103 104 typedef const struct OpaqueWKHitTestResult* WKHitTestResultRef; 104 105 typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef; -
TabularUnified trunk/Source/WebKit/Sources.txt ¶
r249504 r249589 342 342 UIProcess/API/C/WKGeolocationPermissionRequest.cpp 343 343 UIProcess/API/C/WKGeolocationPosition.cpp 344 UIProcess/API/C/WKHTTPCookieStoreRef.cpp 344 345 UIProcess/API/C/WKHitTestResult.cpp 345 346 UIProcess/API/C/WKIconDatabase.cpp -
TabularUnified trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.cpp ¶
r248846 r249589 118 118 } 119 119 120 void HTTPCookieStore::deleteAllCookies(CompletionHandler<void()>&& completionHandler) 121 { 122 auto* pool = m_owningDataStore->processPoolForCookieStorageOperations(); 123 if (!pool) { 124 if (!m_owningDataStore->sessionID().isEphemeral()) 125 deleteCookiesInDefaultUIProcessCookieStore(); 126 RunLoop::main().dispatch(WTFMove(completionHandler)); 127 return; 128 } 129 130 auto* cookieManager = pool->supplement<WebKit::WebCookieManagerProxy>(); 131 cookieManager->deleteAllCookies(m_owningDataStore->sessionID()); 132 // FIXME: The CompletionHandler should be passed to WebCookieManagerProxy::deleteAllCookies. 133 RunLoop::main().dispatch(WTFMove(completionHandler)); 134 } 135 136 void HTTPCookieStore::setHTTPCookieAcceptPolicy(WebKit::HTTPCookieAcceptPolicy policy, CompletionHandler<void()>&& completionHandler) 137 { 138 auto* pool = m_owningDataStore->processPoolForCookieStorageOperations(); 139 if (!pool) { 140 if (!m_owningDataStore->sessionID().isEphemeral()) 141 setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(policy); 142 RunLoop::main().dispatch(WTFMove(completionHandler)); 143 return; 144 } 145 146 auto* cookieManager = pool->supplement<WebKit::WebCookieManagerProxy>(); 147 cookieManager->setHTTPCookieAcceptPolicy(m_owningDataStore->sessionID(), policy, [completionHandler = WTFMove(completionHandler)] (CallbackBase::Error) mutable { 148 completionHandler(); 149 }); 150 } 151 120 152 class APIWebCookieManagerProxyObserver : public WebCookieManagerProxy::Observer { 121 153 WTF_MAKE_FAST_ALLOCATED; … … 247 279 void HTTPCookieStore::startObservingChangesToDefaultUIProcessCookieStore(Function<void()>&&) { } 248 280 void HTTPCookieStore::stopObservingChangesToDefaultUIProcessCookieStore() { } 281 void HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore() { } 282 void HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebKit::HTTPCookieAcceptPolicy) { } 249 283 #endif 250 284 -
TabularUnified trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.h ¶
r248902 r249589 43 43 class WebCookieManagerProxy; 44 44 class WebsiteDataStore; 45 enum class HTTPCookieAcceptPolicy : uint8_t; 45 46 } 46 47 … … 62 63 void setCookies(const Vector<WebCore::Cookie>&, CompletionHandler<void()>&&); 63 64 void deleteCookie(const WebCore::Cookie&, CompletionHandler<void()>&&); 65 66 void deleteAllCookies(CompletionHandler<void()>&&); 67 void setHTTPCookieAcceptPolicy(WebKit::HTTPCookieAcceptPolicy, CompletionHandler<void()>&&); 64 68 65 69 class Observer { … … 87 91 void startObservingChangesToDefaultUIProcessCookieStore(Function<void()>&&); 88 92 void stopObservingChangesToDefaultUIProcessCookieStore(); 93 void deleteCookiesInDefaultUIProcessCookieStore(); 94 void setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebKit::HTTPCookieAcceptPolicy); 89 95 90 96 // FIXME: This is a reference cycle. -
TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h ¶
r246856 r249589 58 58 class FrameHandle; 59 59 class FrameInfo; 60 class HTTPCookieStore; 60 61 class HitTestResult; 61 62 class MessageListener; … … 134 135 WK_ADD_API_MAPPING(WKGeolocationPermissionRequestRef, GeolocationPermissionRequest) 135 136 WK_ADD_API_MAPPING(WKGeolocationPositionRef, WebGeolocationPosition) 137 WK_ADD_API_MAPPING(WKHTTPCookieStoreRef, API::HTTPCookieStore) 136 138 WK_ADD_API_MAPPING(WKHitTestResultRef, API::HitTestResult) 137 139 WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase) -
TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp ¶
r248856 r249589 418 418 } 419 419 420 void WKContextSetStorageAccessAPIEnabled(WKContextRef contextRef, bool enabled) 421 { 422 WebKit::toImpl(contextRef)->setStorageAccessAPIEnabled(enabled); 423 } 424 420 425 void WKContextSetCustomWebContentServiceBundleIdentifier(WKContextRef contextRef, WKStringRef name) 421 426 { -
TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKContext.h ¶
r248797 r249589 138 138 WK_EXPORT bool WKContextGetUsesSingleWebProcess(WKContextRef); 139 139 140 WK_EXPORT void WKContextSetStorageAccessAPIEnabled(WKContextRef, bool enabled); 141 140 142 WK_EXPORT void WKContextStartMemorySampler(WKContextRef context, WKDoubleRef interval); 141 143 WK_EXPORT void WKContextStopMemorySampler(WKContextRef context); … … 144 146 145 147 WK_EXPORT WKApplicationCacheManagerRef WKContextGetApplicationCacheManager(WKContextRef context); 146 WK_EXPORT WKCookieManagerRef WKContextGetCookieManager(WKContextRef context) ;148 WK_EXPORT WKCookieManagerRef WKContextGetCookieManager(WKContextRef context) WK_C_API_DEPRECATED; 147 149 WK_EXPORT WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef context); 148 150 WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context); -
TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKCookieManager.cpp ¶
r246856 r249589 29 29 #include "APIArray.h" 30 30 #include "WKAPICast.h" 31 #include "WebCookieManagerProxy.h"32 31 33 32 using namespace WebKit; … … 35 34 WKTypeID WKCookieManagerGetTypeID() 36 35 { 37 return toAPI(WebCookieManagerProxy::APIType);36 return 0; 38 37 } 39 38 40 void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClientBase* wkClient)39 void WKCookieManagerSetClient(WKCookieManagerRef, const WKCookieManagerClientBase*) 41 40 { 42 toImpl(cookieManagerRef)->initializeClient(wkClient);43 41 } 44 42 45 void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManagerRef, void* context, WKCookieManagerGetCookieHostnamesFunction callback)43 void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef, void*, WKCookieManagerGetCookieHostnamesFunction) 46 44 { 47 toImpl(cookieManagerRef)->getHostnamesWithCookies(PAL::SessionID::defaultSessionID(), toGenericCallbackFunction(context, callback));48 45 } 49 46 50 void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManagerRef, WKStringRef hostname)47 void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef, WKStringRef) 51 48 { 52 toImpl(cookieManagerRef)->deleteCookiesForHostnames(PAL::SessionID::defaultSessionID(), { toImpl(hostname)->string() });53 49 } 54 50 55 void WKCookieManagerDeleteAllCookies(WKCookieManagerRef cookieManagerRef)51 void WKCookieManagerDeleteAllCookies(WKCookieManagerRef) 56 52 { 57 toImpl(cookieManagerRef)->deleteAllCookies(PAL::SessionID::defaultSessionID());58 53 } 59 54 60 void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManagerRef, double date)55 void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef, double) 61 56 { 62 toImpl(cookieManagerRef)->deleteAllCookiesModifiedSince(PAL::SessionID::defaultSessionID(), WallTime::fromRawSeconds(date), [](CallbackBase::Error){});63 57 } 64 58 65 void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy, void* context, WKCookieManagerSetHTTPCookieAcceptPolicyFunction callback)59 void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef, WKHTTPCookieAcceptPolicy, void*, WKCookieManagerSetHTTPCookieAcceptPolicyFunction) 66 60 { 67 toImpl(cookieManager)->setHTTPCookieAcceptPolicy(PAL::SessionID::defaultSessionID(), toHTTPCookieAcceptPolicy(policy), [context, callback](CallbackBase::Error error) {68 if (callback)69 callback(error != CallbackBase::Error::None ? toAPI(API::Error::create().ptr()) : nullptr, context);70 });71 61 } 72 62 73 void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback)63 void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef, void*, WKCookieManagerGetHTTPCookieAcceptPolicyFunction) 74 64 { 75 toImpl(cookieManager)->getHTTPCookieAcceptPolicy(PAL::SessionID::defaultSessionID(), toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(context, callback));76 65 } 77 66 78 void WKCookieManagerSetStorageAccessAPIEnabled(WKCookieManagerRef cookieManager, bool enabled)67 void WKCookieManagerSetStorageAccessAPIEnabled(WKCookieManagerRef, bool) 79 68 { 80 toImpl(cookieManager)->setStorageAccessAPIEnabled(enabled);81 69 } 82 70 83 void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager)71 void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef) 84 72 { 85 toImpl(cookieManager)->startObservingCookieChanges(PAL::SessionID::defaultSessionID());86 73 } 87 74 88 void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef cookieManager)75 void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef) 89 76 { 90 toImpl(cookieManager)->stopObservingCookieChanges(PAL::SessionID::defaultSessionID());91 77 } -
TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKCookieManager.h ¶
r246856 r249589 28 28 29 29 #include <WebKit/WKBase.h> 30 #include <WebKit/WKDeprecated.h> 30 31 31 32 #ifdef __cplusplus … … 56 57 } WKCookieManagerClientV0; 57 58 58 WK_EXPORT WKTypeID WKCookieManagerGetTypeID() ;59 WK_EXPORT WKTypeID WKCookieManagerGetTypeID() WK_C_API_DEPRECATED; 59 60 60 WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClientBase* client) ;61 WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClientBase* client) WK_C_API_DEPRECATED; 61 62 62 63 typedef void (*WKCookieManagerGetCookieHostnamesFunction)(WKArrayRef, WKErrorRef, void*); 63 WK_EXPORT void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetCookieHostnamesFunction function) ;64 WK_EXPORT void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetCookieHostnamesFunction function) WK_C_API_DEPRECATED; 64 65 65 WK_EXPORT void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManager, WKStringRef hostname) ;66 WK_EXPORT void WKCookieManagerDeleteAllCookies(WKCookieManagerRef cookieManager) ;66 WK_EXPORT void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManager, WKStringRef hostname) WK_C_API_DEPRECATED; 67 WK_EXPORT void WKCookieManagerDeleteAllCookies(WKCookieManagerRef cookieManager) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKHTTPCookieStoreDeleteAllCookies); 67 68 68 69 // The time here is relative to the Unix epoch. 69 WK_EXPORT void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManager, double) ;70 WK_EXPORT void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManager, double) WK_C_API_DEPRECATED; 70 71 71 72 typedef void (*WKCookieManagerSetHTTPCookieAcceptPolicyFunction)(WKErrorRef, void*); 72 WK_EXPORT void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy, void* context, WKCookieManagerSetHTTPCookieAcceptPolicyFunction callback) ;73 WK_EXPORT void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy, void* context, WKCookieManagerSetHTTPCookieAcceptPolicyFunction callback) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKHTTPCookieStoreSetHTTPCookieAcceptPolicy); 73 74 typedef void (*WKCookieManagerGetHTTPCookieAcceptPolicyFunction)(WKHTTPCookieAcceptPolicy, WKErrorRef, void*); 74 WK_EXPORT void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback) ;75 WK_EXPORT void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback) WK_C_API_DEPRECATED; 75 76 76 WK_EXPORT void WKCookieManagerSetStorageAccessAPIEnabled(WKCookieManagerRef cookieManager, bool enabled) ;77 WK_EXPORT void WKCookieManagerSetStorageAccessAPIEnabled(WKCookieManagerRef cookieManager, bool enabled) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKContextSetStorageAccessAPIEnabled); 77 78 78 WK_EXPORT void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager) ;79 WK_EXPORT void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef cookieManager) ;79 WK_EXPORT void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager) WK_C_API_DEPRECATED; 80 WK_EXPORT void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef cookieManager) WK_C_API_DEPRECATED; 80 81 81 82 #ifdef __cplusplus -
TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp ¶
r249059 r249589 76 76 } 77 77 78 WKHTTPCookieStoreRef WKWebsiteDataStoreGetHTTPCookieStore(WKWebsiteDataStoreRef dataStoreRef) 79 { 80 return WebKit::toAPI(&WebKit::toImpl(dataStoreRef)->httpCookieStore()); 81 } 82 78 83 void WKWebsiteDataStoreSetResourceLoadStatisticsDebugModeWithCompletionHandler(WKWebsiteDataStoreRef dataStoreRef, bool enable, void* context, WKWebsiteDataStoreStatisticsDebugModeFunction completionHandler) 79 84 { -
TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h ¶
r248734 r249589 37 37 WK_EXPORT WKWebsiteDataStoreRef WKWebsiteDataStoreGetDefaultDataStore(); 38 38 WK_EXPORT WKWebsiteDataStoreRef WKWebsiteDataStoreCreateNonPersistentDataStore(); 39 40 WK_EXPORT WKHTTPCookieStoreRef WKWebsiteDataStoreGetHTTPCookieStore(WKWebsiteDataStoreRef dataStoreRef); 39 41 40 42 WK_EXPORT bool WKWebsiteDataStoreGetResourceLoadStatisticsEnabled(WKWebsiteDataStoreRef dataStoreRef); -
TabularUnified trunk/Source/WebKit/UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm ¶
r248902 r249589 71 71 } 72 72 73 void HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore() 74 { 75 [[NSHTTPCookieStorage sharedHTTPCookieStorage] removeCookiesSinceDate:[NSDate distantPast]]; 76 } 77 78 static NSHTTPCookieAcceptPolicy toNSHTTPCookieAcceptPolicy(WebKit::HTTPCookieAcceptPolicy policy) 79 { 80 switch (policy) { 81 case WebKit::HTTPCookieAcceptPolicy::AlwaysAccept: 82 return NSHTTPCookieAcceptPolicyAlways; 83 case WebKit::HTTPCookieAcceptPolicy::Never: 84 return NSHTTPCookieAcceptPolicyNever; 85 case WebKit::HTTPCookieAcceptPolicy::OnlyFromMainDocumentDomain: 86 return NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain; 87 case WebKit::HTTPCookieAcceptPolicy::ExclusivelyFromMainDocumentDomain: 88 return (NSHTTPCookieAcceptPolicy)NSHTTPCookieAcceptPolicyExclusivelyFromMainDocumentDomain; 89 } 90 ASSERT_NOT_REACHED(); 91 return NSHTTPCookieAcceptPolicyAlways; 92 } 93 94 void HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebKit::HTTPCookieAcceptPolicy policy) 95 { 96 [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:toNSHTTPCookieAcceptPolicy(policy)]; 97 } 98 73 99 } // namespace API -
TabularUnified trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm ¶
r249019 r249589 545 545 } 546 546 547 void WebProcessPool::setStorageAccessAPIEnabled(bool enabled)548 {549 m_storageAccessAPIEnabled = enabled;550 sendToNetworkingProcess(Messages::NetworkProcess::SetStorageAccessAPIEnabled(enabled));551 }552 553 547 void WebProcessPool::clearPermanentCredentialsForProtectionSpace(WebCore::ProtectionSpace&& protectionSpace) 554 548 { -
TabularUnified trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp ¶
r246807 r249589 269 269 } 270 270 271 void WebCookieManagerProxy::setStorageAccessAPIEnabled(bool enabled)272 {273 #if PLATFORM(COCOA)274 processPool()->sendToNetworkingProcess(Messages::NetworkProcess::SetStorageAccessAPIEnabled(enabled));275 #else276 UNUSED_PARAM(enabled);277 #endif278 }279 280 271 } // namespace WebKit -
TabularUnified trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.h ¶
r246807 r249589 81 81 void getHTTPCookieAcceptPolicy(PAL::SessionID, Function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)>&&); 82 82 83 void setStorageAccessAPIEnabled(bool);84 85 83 void startObservingCookieChanges(PAL::SessionID); 86 84 void stopObservingCookieChanges(PAL::SessionID); -
TabularUnified trunk/Source/WebKit/UIProcess/WebProcessPool.cpp ¶
r249501 r249589 409 409 } 410 410 411 void WebProcessPool::setStorageAccessAPIEnabled(bool enabled) 412 { 413 m_storageAccessAPIEnabled = enabled; 414 #if PLATFORM(COCOA) 415 sendToNetworkingProcess(Messages::NetworkProcess::SetStorageAccessAPIEnabled(enabled)); 416 #endif 417 } 418 411 419 void WebProcessPool::setCustomWebContentServiceBundleIdentifier(const String& customWebContentServiceBundleIdentifier) 412 420 { -
TabularUnified trunk/Source/WebKit/UIProcess/WebProcessPool.h ¶
r249501 r249589 466 466 bool cookieStoragePartitioningEnabled() const { return m_cookieStoragePartitioningEnabled; } 467 467 void setCookieStoragePartitioningEnabled(bool); 468 469 void clearPermanentCredentialsForProtectionSpace(WebCore::ProtectionSpace&&); 470 #endif 468 471 bool storageAccessAPIEnabled() const { return m_storageAccessAPIEnabled; } 469 472 void setStorageAccessAPIEnabled(bool); 470 471 void clearPermanentCredentialsForProtectionSpace(WebCore::ProtectionSpace&&);472 #endif473 473 474 474 static uint64_t registerProcessPoolCreationListener(Function<void(WebProcessPool&)>&&); … … 757 757 #if PLATFORM(COCOA) 758 758 bool m_cookieStoragePartitioningEnabled { false }; 759 #endif 759 760 bool m_storageAccessAPIEnabled { false }; 760 #endif761 761 762 762 struct Paths { -
TabularUnified trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj ¶
r249504 r249589 1103 1103 5C5D238C227A2CDA000B9BDA /* _WKCustomHeaderFields.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5D2389227A1892000B9BDA /* _WKCustomHeaderFields.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1104 1104 5C62FDF91EFC271C00CE072E /* WKURLSchemeTaskPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1105 5C66A4B52320962400EA4D44 /* WKHTTPCookieStoreRef.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C66A4B42320961400EA4D44 /* WKHTTPCookieStoreRef.h */; settings = {ATTRIBUTES = (Private, ); }; }; 1105 1106 5C795D70229F373F003FF1C4 /* WKContextMenuElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE0C369229F2D4A003695F0 /* WKContextMenuElementInfo.h */; settings = {ATTRIBUTES = (Public, ); }; }; 1106 1107 5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE0C36A229F2D4A003695F0 /* WKContextMenuElementInfoPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; }; … … 1724 1725 filePatterns = "*.h"; 1725 1726 fileType = pattern.proxy; 1726 inputFiles = (1727 );1728 1727 isEditable = 1; 1729 1728 outputFiles = ( … … 3637 3636 5C5D238A227A1D9B000B9BDA /* APICustomHeaderFields.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APICustomHeaderFields.h; sourceTree = "<group>"; }; 3638 3637 5C62FDF81EFC263C00CE072E /* WKURLSchemeTaskPrivate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = WKURLSchemeTaskPrivate.h; sourceTree = "<group>"; }; 3638 5C66A4B32320961300EA4D44 /* WKHTTPCookieStoreRef.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKHTTPCookieStoreRef.cpp; sourceTree = "<group>"; }; 3639 5C66A4B42320961400EA4D44 /* WKHTTPCookieStoreRef.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKHTTPCookieStoreRef.h; sourceTree = "<group>"; }; 3639 3640 5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImplCocoa.mm; sourceTree = "<group>"; }; 3640 3641 5C6CE6D31F59EA350007C6CB /* PageClientImplCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageClientImplCocoa.h; sourceTree = "<group>"; }; … … 8041 8042 B62E730F143047A60069EC35 /* WKHitTestResult.cpp */, 8042 8043 B62E7311143047B00069EC35 /* WKHitTestResult.h */, 8044 5C66A4B32320961300EA4D44 /* WKHTTPCookieStoreRef.cpp */, 8045 5C66A4B42320961400EA4D44 /* WKHTTPCookieStoreRef.h */, 8043 8046 5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */, 8044 8047 5110AE0B133C16CB0072717A /* WKIconDatabase.h */, … … 10197 10200 B62E7312143047B00069EC35 /* WKHitTestResult.h in Headers */, 10198 10201 51D124991E763C01002B2820 /* WKHTTPCookieStore.h in Headers */, 10202 5C66A4B52320962400EA4D44 /* WKHTTPCookieStoreRef.h in Headers */, 10199 10203 5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */, 10200 10204 5123CF1C133D260A0056F800 /* WKIconDatabaseCG.h in Headers */, -
TabularUnified trunk/Tools/ChangeLog ¶
r249584 r249589 1 2019-09-06 Alex Christensen <achristensen@webkit.org> 2 3 Deprecate all WKCookieManagerRef functions 4 https://bugs.webkit.org/show_bug.cgi?id=201473 5 6 Reviewed by Chris Dumez. 7 8 Adopt replacement C API in WebKitTestRunner. 9 10 * TestWebKitAPI/CMakeLists.txt: 11 * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj: 12 * TestWebKitAPI/Tests/WebKit/CookieManager.cpp: Removed, because the functions it tests were removed. 13 * WebKitTestRunner/TestController.cpp: 14 (WTR::TestController::resetPreferencesToConsistentValues): 15 (WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle): 16 * WebKitTestRunner/TestInvocation.cpp: 17 (WTR::TestInvocation::invoke): 18 (WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle): 19 * WebKitTestRunner/cocoa/TestControllerCocoa.mm: 20 (WTR::initializeWebViewConfiguration): 21 1 22 2019-09-06 Tim Horton <timothy_horton@apple.com> 2 23 -
TabularUnified trunk/Tools/TestWebKitAPI/CMakeLists.txt ¶
r248029 r249589 196 196 Tests/WebKit/AboutBlankLoad.cpp 197 197 Tests/WebKit/CanHandleRequest.cpp 198 Tests/WebKit/CookieManager.cpp199 198 Tests/WebKit/DOMWindowExtensionBasic.cpp 200 199 Tests/WebKit/DOMWindowExtensionNoCache.cpp -
TabularUnified trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj ¶
r249584 r249589 283 283 51CD1C721B38D48400142CA5 /* modal-alerts-in-new-about-blank-window.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51CD1C711B38D48400142CA5 /* modal-alerts-in-new-about-blank-window.html */; }; 284 284 51D124981E763B02002B2820 /* WKHTTPCookieStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D124971E763AF8002B2820 /* WKHTTPCookieStore.mm */; }; 285 51D1249B1E785425002B2820 /* CookieManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */; };286 285 51D8C1902267B26D00797E40 /* PDFLinkReferrer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D8C18F2267B26700797E40 /* PDFLinkReferrer.mm */; }; 287 286 51DB16CE1F085137001FA4C5 /* WebViewIconLoading.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51DB16CD1F085047001FA4C5 /* WebViewIconLoading.mm */; }; … … 2527 2526 F6B7BE93174691EF008A3445 /* DidAssociateFormControls.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DidAssociateFormControls.cpp; sourceTree = "<group>"; }; 2528 2527 F6B7BE9617469B7E008A3445 /* associate-form-controls.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = "associate-form-controls.html"; sourceTree = "<group>"; }; 2529 F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieManager.cpp; sourceTree = "<group>"; };2530 2528 F6F49C6615545C8D0007F39D /* DOMWindowExtensionNoCache_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowExtensionNoCache_Bundle.cpp; sourceTree = "<group>"; }; 2531 2529 F6F49C6715545C8D0007F39D /* DOMWindowExtensionNoCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowExtensionNoCache.cpp; sourceTree = "<group>"; }; … … 3449 3447 1A50AA1C1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp */, 3450 3448 7C8DDAA91735DE1D00EA5AC0 /* CloseThenTerminate.cpp */, 3451 F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */,3452 3449 F6B7BE93174691EF008A3445 /* DidAssociateFormControls.cpp */, 3453 3450 F6B7BE92174691EF008A3445 /* DidAssociateFormControls_Bundle.cpp */, … … 4420 4417 5C3B1D2622A74F6700BCF4D0 /* ContextMenus.mm in Sources */, 4421 4418 5C2936931D5BF70D00DEAB1E /* CookieAcceptPolicy.mm in Sources */, 4422 51D1249B1E785425002B2820 /* CookieManager.cpp in Sources */,4423 4419 5C19A5241FD0F60100EEA323 /* CookiePrivateBrowsing.mm in Sources */, 4424 4420 9B1F6F781F90558400B55744 /* CopyHTML.mm in Sources */, -
TabularUnified trunk/Tools/WebKitTestRunner/TestController.cpp ¶
r249542 r249589 39 39 #include <WebKit/WKContextConfigurationRef.h> 40 40 #include <WebKit/WKContextPrivate.h> 41 #include <WebKit/WKCookieManager.h>42 41 #include <WebKit/WKCredential.h> 43 42 #include <WebKit/WKFrameHandleRef.h> 44 43 #include <WebKit/WKFrameInfoRef.h> 44 #include <WebKit/WKHTTPCookieStoreRef.h> 45 45 #include <WebKit/WKIconDatabase.h> 46 46 #include <WebKit/WKMessageListener.h> … … 872 872 WKPreferencesSetDirectoryUploadEnabled(preferences, true); 873 873 874 WK CookieManagerDeleteAllCookies(WKContextGetCookieManager(m_context.get()));874 WKHTTPCookieStoreDeleteAllCookies(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(m_context.get())), nullptr, nullptr); 875 875 876 876 WKPreferencesSetMockCaptureDevicesEnabled(preferences, true); … … 2099 2099 auto setHTTPCookieAcceptPolicy = [&] (WKHTTPCookieAcceptPolicy policy, CompletionHandler<void(WKTypeRef)>&& completionHandler) { 2100 2100 auto context = new CompletionHandler<void(WKTypeRef)>(WTFMove(completionHandler)); 2101 WK CookieManagerSetHTTPCookieAcceptPolicy(WKContextGetCookieManager(this->context()), policy, context, [] (WKErrorRef error,void* context) {2101 WKHTTPCookieStoreSetHTTPCookieAcceptPolicy(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(m_context.get())), policy, context, [] (void* context) { 2102 2102 auto completionHandlerPointer = static_cast<CompletionHandler<void(WKTypeRef)>*>(context); 2103 2103 (*completionHandlerPointer)(nullptr); -
TabularUnified trunk/Tools/WebKitTestRunner/TestInvocation.cpp ¶
r248856 r249589 34 34 #include "WebCoreTestSupport.h" 35 35 #include <WebKit/WKContextPrivate.h> 36 #include <WebKit/WKCookieManager.h>37 36 #include <WebKit/WKData.h> 38 37 #include <WebKit/WKDictionary.h> 38 #include <WebKit/WKHTTPCookieStoreRef.h> 39 39 #include <WebKit/WKInspector.h> 40 40 #include <WebKit/WKPagePrivate.h> … … 165 165 TestController::singleton().setShouldLogHistoryClientCallbacks(shouldLogHistoryClientCallbacks()); 166 166 167 WK CookieManagerSetHTTPCookieAcceptPolicy(WKContextGetCookieManager(TestController::singleton().context()), kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain, nullptr, nullptr);167 WKHTTPCookieStoreSetHTTPCookieAcceptPolicy(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(TestController::singleton().context())), kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain, nullptr, nullptr); 168 168 169 169 // FIXME: We should clear out visited links here. … … 913 913 if (WKStringIsEqualToUTF8CString(messageName, "SetStorageAccessAPIEnabled")) { 914 914 WKBooleanRef accept = static_cast<WKBooleanRef>(messageBody); 915 WKCo okieManagerSetStorageAccessAPIEnabled(WKContextGetCookieManager(TestController::singleton().context()), WKBooleanGetValue(accept));915 WKContextSetStorageAccessAPIEnabled(TestController::singleton().context(), WKBooleanGetValue(accept)); 916 916 return nullptr; 917 917 } -
TabularUnified trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm ¶
r249542 r249589 37 37 #import <WebKit/WKContextConfigurationRef.h> 38 38 #import <WebKit/WKContextPrivate.h> 39 #import <WebKit/WKCookieManager.h>40 39 #import <WebKit/WKPreferencesRefPrivate.h> 41 40 #import <WebKit/WKProcessPoolPrivate.h> … … 70 69 globalWebViewConfiguration._applePayEnabled = YES; 71 70 72 WKCo okieManagerSetStorageAccessAPIEnabled(WKContextGetCookieManager(context), true);71 WKContextSetStorageAccessAPIEnabled(context, true); 73 72 74 73 WKWebsiteDataStore* poolWebsiteDataStore = (__bridge WKWebsiteDataStore *)WKContextGetWebsiteDataStore((__bridge WKContextRef)globalWebViewConfiguration.processPool);
Note:
See TracChangeset
for help on using the changeset viewer.