Changeset 249589 in webkit


Ignore:
Timestamp:
Sep 6, 2019, 1:42:42 PM (6 years ago)
Author:
achristensen@apple.com
Message:

Deprecate all WKCookieManagerRef functions
​https://bugs.webkit.org/show_bug.cgi?id=201473

Reviewed by Chris Dumez.

Source/WebKit:

Their use was removed in rdar://problem/55039275
Created replacement C API that more closely resembles the public ObjC API for WebKitTestRunner.

  • Shared/API/c/WKBase.h:
  • Sources.txt:
  • UIProcess/API/APIHTTPCookieStore.cpp:

(API::HTTPCookieStore::deleteAllCookies):
(API::HTTPCookieStore::setHTTPCookieAcceptPolicy):
(API::HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore):
(API::HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore):

  • UIProcess/API/APIHTTPCookieStore.h:
  • UIProcess/API/C/WKAPICast.h:
  • UIProcess/API/C/WKContext.cpp:

(WKContextSetStorageAccessAPIEnabled):

  • UIProcess/API/C/WKContext.h:
  • UIProcess/API/C/WKCookieManager.cpp:

(WKCookieManagerGetTypeID):
(WKCookieManagerSetClient):
(WKCookieManagerGetHostnamesWithCookies):
(WKCookieManagerDeleteCookiesForHostname):
(WKCookieManagerDeleteAllCookies):
(WKCookieManagerDeleteAllCookiesModifiedAfterDate):
(WKCookieManagerSetHTTPCookieAcceptPolicy):
(WKCookieManagerGetHTTPCookieAcceptPolicy):
(WKCookieManagerSetStorageAccessAPIEnabled):
(WKCookieManagerStartObservingCookieChanges):
(WKCookieManagerStopObservingCookieChanges):

  • UIProcess/API/C/WKCookieManager.h:
  • UIProcess/API/C/WKHTTPCookieStoreRef.cpp: Added.

(WKHTTPCookieStoreGetTypeID):
(WKHTTPCookieStoreDeleteAllCookies):
(WKHTTPCookieStoreSetHTTPCookieAcceptPolicy):

  • UIProcess/API/C/WKHTTPCookieStoreRef.h: Added.
  • UIProcess/API/C/WKWebsiteDataStoreRef.cpp:

(WKWebsiteDataStoreGetHTTPCookieStore):

  • UIProcess/API/C/WKWebsiteDataStoreRef.h:
  • UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm:

(API::HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore):
(API::toNSHTTPCookieAcceptPolicy):
(API::HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore):

  • UIProcess/WebCookieManagerProxy.cpp:

(WebKit::WebCookieManagerProxy::setStorageAccessAPIEnabled): Deleted.

  • UIProcess/WebCookieManagerProxy.h:
  • WebKit.xcodeproj/project.pbxproj:

Tools:

Adopt replacement C API in WebKitTestRunner.

  • TestWebKitAPI/CMakeLists.txt:
  • TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
  • TestWebKitAPI/Tests/WebKit/CookieManager.cpp: Removed, because the functions it tests were removed.
  • WebKitTestRunner/TestController.cpp:

(WTR::TestController::resetPreferencesToConsistentValues):
(WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):

  • WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::invoke):
(WTR::TestInvocation::didReceiveSynchronousMessageFromInjectedBundle):

  • WebKitTestRunner/cocoa/TestControllerCocoa.mm:

(WTR::initializeWebViewConfiguration):

Location:
trunk
Files:
2 added
1 deleted
26 edited

Legend:

Unmodified
Added
Removed

  • TabularUnified trunk/Source/WebKit/ChangeLog

    r249585 r249589  
     12019-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
    1532019-09-06  Darryl Pogue  <darryl@dpogue.ca>
    254

  • TabularUnified trunk/Source/WebKit/PlatformWin.cmake

    r248029 r249589  
    263263    UIProcess/API/C/WKGeolocationPermissionRequest.h
    264264    UIProcess/API/C/WKGeolocationPosition.h
     265    UIProcess/API/C/WKHTTPCookieStoreRef.h
    265266    UIProcess/API/C/WKHitTestResult.h
    266267    UIProcess/API/C/WKIconDatabase.h

  • TabularUnified trunk/Source/WebKit/Shared/API/c/WKBase.h

    r246856 r249589  
    101101typedef const struct OpaqueWKGeolocationPosition* WKGeolocationPositionRef;
    102102typedef const struct OpaqueWKGrammarDetail* WKGrammarDetailRef;
     103typedef const struct OpaqueWKHTTPCookieStore* WKHTTPCookieStoreRef;
    103104typedef const struct OpaqueWKHitTestResult* WKHitTestResultRef;
    104105typedef const struct OpaqueWKIconDatabase* WKIconDatabaseRef;

  • TabularUnified trunk/Source/WebKit/Sources.txt

    r249504 r249589  
    342342UIProcess/API/C/WKGeolocationPermissionRequest.cpp
    343343UIProcess/API/C/WKGeolocationPosition.cpp
     344UIProcess/API/C/WKHTTPCookieStoreRef.cpp
    344345UIProcess/API/C/WKHitTestResult.cpp
    345346UIProcess/API/C/WKIconDatabase.cpp

  • TabularUnified trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.cpp

    r248846 r249589  
    118118}
    119119
     120void 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
     136void 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
    120152class APIWebCookieManagerProxyObserver : public WebCookieManagerProxy::Observer {
    121153    WTF_MAKE_FAST_ALLOCATED;
    … …  
    247279void HTTPCookieStore::startObservingChangesToDefaultUIProcessCookieStore(Function<void()>&&) { }
    248280void HTTPCookieStore::stopObservingChangesToDefaultUIProcessCookieStore() { }
     281void HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore() { }
     282void HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebKit::HTTPCookieAcceptPolicy) { }
    249283#endif
    250284   

  • TabularUnified trunk/Source/WebKit/UIProcess/API/APIHTTPCookieStore.h

    r248902 r249589  
    4343class WebCookieManagerProxy;
    4444class WebsiteDataStore;
     45enum class HTTPCookieAcceptPolicy : uint8_t;
    4546}
    4647
    … …  
    6263    void setCookies(const Vector<WebCore::Cookie>&, CompletionHandler<void()>&&);
    6364    void deleteCookie(const WebCore::Cookie&, CompletionHandler<void()>&&);
     65   
     66    void deleteAllCookies(CompletionHandler<void()>&&);
     67    void setHTTPCookieAcceptPolicy(WebKit::HTTPCookieAcceptPolicy, CompletionHandler<void()>&&);
    6468
    6569    class Observer {
    … …  
    8791    void startObservingChangesToDefaultUIProcessCookieStore(Function<void()>&&);
    8892    void stopObservingChangesToDefaultUIProcessCookieStore();
     93    void deleteCookiesInDefaultUIProcessCookieStore();
     94    void setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebKit::HTTPCookieAcceptPolicy);
    8995   
    9096    // FIXME: This is a reference cycle.

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKAPICast.h

    r246856 r249589  
    5858class FrameHandle;
    5959class FrameInfo;
     60class HTTPCookieStore;
    6061class HitTestResult;
    6162class MessageListener;
    … …  
    134135WK_ADD_API_MAPPING(WKGeolocationPermissionRequestRef, GeolocationPermissionRequest)
    135136WK_ADD_API_MAPPING(WKGeolocationPositionRef, WebGeolocationPosition)
     137WK_ADD_API_MAPPING(WKHTTPCookieStoreRef, API::HTTPCookieStore)
    136138WK_ADD_API_MAPPING(WKHitTestResultRef, API::HitTestResult)
    137139WK_ADD_API_MAPPING(WKIconDatabaseRef, WebIconDatabase)

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r248856 r249589  
    418418}
    419419
     420void WKContextSetStorageAccessAPIEnabled(WKContextRef contextRef, bool enabled)
     421{
     422    WebKit::toImpl(contextRef)->setStorageAccessAPIEnabled(enabled);
     423}
     424
    420425void WKContextSetCustomWebContentServiceBundleIdentifier(WKContextRef contextRef, WKStringRef name)
    421426{

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKContext.h

    r248797 r249589  
    138138WK_EXPORT bool WKContextGetUsesSingleWebProcess(WKContextRef);
    139139
     140WK_EXPORT void WKContextSetStorageAccessAPIEnabled(WKContextRef, bool enabled);
     141
    140142WK_EXPORT void WKContextStartMemorySampler(WKContextRef context, WKDoubleRef interval);
    141143WK_EXPORT void WKContextStopMemorySampler(WKContextRef context);
    … …  
    144146
    145147WK_EXPORT WKApplicationCacheManagerRef WKContextGetApplicationCacheManager(WKContextRef context);
    146 WK_EXPORT WKCookieManagerRef WKContextGetCookieManager(WKContextRef context);
     148WK_EXPORT WKCookieManagerRef WKContextGetCookieManager(WKContextRef context) WK_C_API_DEPRECATED;
    147149WK_EXPORT WKGeolocationManagerRef WKContextGetGeolocationManager(WKContextRef context);
    148150WK_EXPORT WKIconDatabaseRef WKContextGetIconDatabase(WKContextRef context);

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKCookieManager.cpp

    r246856 r249589  
    2929#include "APIArray.h"
    3030#include "WKAPICast.h"
    31 #include "WebCookieManagerProxy.h"
    3231
    3332using namespace WebKit;
    … …  
    3534WKTypeID WKCookieManagerGetTypeID()
    3635{
    37     return toAPI(WebCookieManagerProxy::APIType);
     36    return 0;
    3837}
    3938
    40 void WKCookieManagerSetClient(WKCookieManagerRef cookieManagerRef, const WKCookieManagerClientBase* wkClient)
     39void WKCookieManagerSetClient(WKCookieManagerRef, const WKCookieManagerClientBase*)
    4140{
    42     toImpl(cookieManagerRef)->initializeClient(wkClient);
    4341}
    4442
    45 void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManagerRef, void* context, WKCookieManagerGetCookieHostnamesFunction callback)
     43void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef, void*, WKCookieManagerGetCookieHostnamesFunction)
    4644{
    47     toImpl(cookieManagerRef)->getHostnamesWithCookies(PAL::SessionID::defaultSessionID(), toGenericCallbackFunction(context, callback));
    4845}
    4946
    50 void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManagerRef, WKStringRef hostname)
     47void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef, WKStringRef)
    5148{
    52     toImpl(cookieManagerRef)->deleteCookiesForHostnames(PAL::SessionID::defaultSessionID(), { toImpl(hostname)->string() });
    5349}
    5450
    55 void WKCookieManagerDeleteAllCookies(WKCookieManagerRef cookieManagerRef)
     51void WKCookieManagerDeleteAllCookies(WKCookieManagerRef)
    5652{
    57     toImpl(cookieManagerRef)->deleteAllCookies(PAL::SessionID::defaultSessionID());
    5853}
    5954
    60 void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManagerRef, double date)
     55void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef, double)
    6156{
    62     toImpl(cookieManagerRef)->deleteAllCookiesModifiedSince(PAL::SessionID::defaultSessionID(), WallTime::fromRawSeconds(date), [](CallbackBase::Error){});
    6357}
    6458
    65 void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy, void* context, WKCookieManagerSetHTTPCookieAcceptPolicyFunction callback)
     59void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef, WKHTTPCookieAcceptPolicy, void*, WKCookieManagerSetHTTPCookieAcceptPolicyFunction)
    6660{
    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     });
    7161}
    7262
    73 void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback)
     63void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef, void*, WKCookieManagerGetHTTPCookieAcceptPolicyFunction)
    7464{
    75     toImpl(cookieManager)->getHTTPCookieAcceptPolicy(PAL::SessionID::defaultSessionID(), toGenericCallbackFunction<WKHTTPCookieAcceptPolicy, HTTPCookieAcceptPolicy>(context, callback));
    7665}
    7766
    78 void WKCookieManagerSetStorageAccessAPIEnabled(WKCookieManagerRef cookieManager, bool enabled)
     67void WKCookieManagerSetStorageAccessAPIEnabled(WKCookieManagerRef, bool)
    7968{
    80     toImpl(cookieManager)->setStorageAccessAPIEnabled(enabled);
    8169}
    8270
    83 void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager)
     71void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef)
    8472{
    85     toImpl(cookieManager)->startObservingCookieChanges(PAL::SessionID::defaultSessionID());
    8673}
    8774
    88 void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef cookieManager)
     75void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef)
    8976{
    90     toImpl(cookieManager)->stopObservingCookieChanges(PAL::SessionID::defaultSessionID());
    9177}

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKCookieManager.h

    r246856 r249589  
    2828
    2929#include <WebKit/WKBase.h>
     30#include <WebKit/WKDeprecated.h>
    3031
    3132#ifdef __cplusplus
    … …  
    5657} WKCookieManagerClientV0;
    5758
    58 WK_EXPORT WKTypeID WKCookieManagerGetTypeID();
     59WK_EXPORT WKTypeID WKCookieManagerGetTypeID() WK_C_API_DEPRECATED;
    5960
    60 WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClientBase* client);
     61WK_EXPORT void WKCookieManagerSetClient(WKCookieManagerRef cookieManager, const WKCookieManagerClientBase* client) WK_C_API_DEPRECATED;
    6162
    6263typedef void (*WKCookieManagerGetCookieHostnamesFunction)(WKArrayRef, WKErrorRef, void*);
    63 WK_EXPORT void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetCookieHostnamesFunction function);
     64WK_EXPORT void WKCookieManagerGetHostnamesWithCookies(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetCookieHostnamesFunction function) WK_C_API_DEPRECATED;
    6465
    65 WK_EXPORT void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManager, WKStringRef hostname);
    66 WK_EXPORT void WKCookieManagerDeleteAllCookies(WKCookieManagerRef cookieManager);
     66WK_EXPORT void WKCookieManagerDeleteCookiesForHostname(WKCookieManagerRef cookieManager, WKStringRef hostname) WK_C_API_DEPRECATED;
     67WK_EXPORT void WKCookieManagerDeleteAllCookies(WKCookieManagerRef cookieManager) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKHTTPCookieStoreDeleteAllCookies);
    6768
    6869// The time here is relative to the Unix epoch.
    69 WK_EXPORT void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManager, double);
     70WK_EXPORT void WKCookieManagerDeleteAllCookiesModifiedAfterDate(WKCookieManagerRef cookieManager, double) WK_C_API_DEPRECATED;
    7071
    7172typedef void (*WKCookieManagerSetHTTPCookieAcceptPolicyFunction)(WKErrorRef, void*);
    72 WK_EXPORT void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy, void* context, WKCookieManagerSetHTTPCookieAcceptPolicyFunction callback);
     73WK_EXPORT void WKCookieManagerSetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, WKHTTPCookieAcceptPolicy policy, void* context, WKCookieManagerSetHTTPCookieAcceptPolicyFunction callback) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKHTTPCookieStoreSetHTTPCookieAcceptPolicy);
    7374typedef void (*WKCookieManagerGetHTTPCookieAcceptPolicyFunction)(WKHTTPCookieAcceptPolicy, WKErrorRef, void*);
    74 WK_EXPORT void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback);
     75WK_EXPORT void WKCookieManagerGetHTTPCookieAcceptPolicy(WKCookieManagerRef cookieManager, void* context, WKCookieManagerGetHTTPCookieAcceptPolicyFunction callback) WK_C_API_DEPRECATED;
    7576
    76 WK_EXPORT void WKCookieManagerSetStorageAccessAPIEnabled(WKCookieManagerRef cookieManager, bool enabled);
     77WK_EXPORT void WKCookieManagerSetStorageAccessAPIEnabled(WKCookieManagerRef cookieManager, bool enabled) WK_C_API_DEPRECATED_WITH_REPLACEMENT(WKContextSetStorageAccessAPIEnabled);
    7778
    78 WK_EXPORT void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager);
    79 WK_EXPORT void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef cookieManager);
     79WK_EXPORT void WKCookieManagerStartObservingCookieChanges(WKCookieManagerRef cookieManager) WK_C_API_DEPRECATED;
     80WK_EXPORT void WKCookieManagerStopObservingCookieChanges(WKCookieManagerRef cookieManager) WK_C_API_DEPRECATED;
    8081
    8182#ifdef __cplusplus

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.cpp

    r249059 r249589  
    7676}
    7777
     78WKHTTPCookieStoreRef WKWebsiteDataStoreGetHTTPCookieStore(WKWebsiteDataStoreRef dataStoreRef)
     79{
     80    return WebKit::toAPI(&WebKit::toImpl(dataStoreRef)->httpCookieStore());
     81}
     82
    7883void WKWebsiteDataStoreSetResourceLoadStatisticsDebugModeWithCompletionHandler(WKWebsiteDataStoreRef dataStoreRef, bool enable, void* context, WKWebsiteDataStoreStatisticsDebugModeFunction completionHandler)
    7984{

  • TabularUnified trunk/Source/WebKit/UIProcess/API/C/WKWebsiteDataStoreRef.h

    r248734 r249589  
    3737WK_EXPORT WKWebsiteDataStoreRef WKWebsiteDataStoreGetDefaultDataStore();
    3838WK_EXPORT WKWebsiteDataStoreRef WKWebsiteDataStoreCreateNonPersistentDataStore();
     39
     40WK_EXPORT WKHTTPCookieStoreRef WKWebsiteDataStoreGetHTTPCookieStore(WKWebsiteDataStoreRef dataStoreRef);
    3941
    4042WK_EXPORT bool WKWebsiteDataStoreGetResourceLoadStatisticsEnabled(WKWebsiteDataStoreRef dataStoreRef);

  • TabularUnified trunk/Source/WebKit/UIProcess/API/Cocoa/APIHTTPCookieStoreCocoa.mm

    r248902 r249589  
    7171}
    7272
     73void HTTPCookieStore::deleteCookiesInDefaultUIProcessCookieStore()
     74{
     75    [[NSHTTPCookieStorage sharedHTTPCookieStorage] removeCookiesSinceDate:[NSDate distantPast]];
     76}
     77
     78static 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
     94void HTTPCookieStore::setHTTPCookieAcceptPolicyInDefaultUIProcessCookieStore(WebKit::HTTPCookieAcceptPolicy policy)
     95{
     96    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:toNSHTTPCookieAcceptPolicy(policy)];
     97}
     98
    7399} // namespace API

  • TabularUnified trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r249019 r249589  
    545545}
    546546
    547 void WebProcessPool::setStorageAccessAPIEnabled(bool enabled)
    548 {
    549     m_storageAccessAPIEnabled = enabled;
    550     sendToNetworkingProcess(Messages::NetworkProcess::SetStorageAccessAPIEnabled(enabled));
    551 }
    552 
    553547void WebProcessPool::clearPermanentCredentialsForProtectionSpace(WebCore::ProtectionSpace&& protectionSpace)
    554548{

  • TabularUnified trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.cpp

    r246807 r249589  
    269269}
    270270
    271 void WebCookieManagerProxy::setStorageAccessAPIEnabled(bool enabled)
    272 {
    273 #if PLATFORM(COCOA)
    274     processPool()->sendToNetworkingProcess(Messages::NetworkProcess::SetStorageAccessAPIEnabled(enabled));
    275 #else
    276     UNUSED_PARAM(enabled);
    277 #endif
    278 }
    279 
    280271} // namespace WebKit

  • TabularUnified trunk/Source/WebKit/UIProcess/WebCookieManagerProxy.h

    r246807 r249589  
    8181    void getHTTPCookieAcceptPolicy(PAL::SessionID, Function<void (HTTPCookieAcceptPolicy, CallbackBase::Error)>&&);
    8282
    83     void setStorageAccessAPIEnabled(bool);
    84 
    8583    void startObservingCookieChanges(PAL::SessionID);
    8684    void stopObservingCookieChanges(PAL::SessionID);

  • TabularUnified trunk/Source/WebKit/UIProcess/WebProcessPool.cpp

    r249501 r249589  
    409409}
    410410
     411void WebProcessPool::setStorageAccessAPIEnabled(bool enabled)
     412{
     413    m_storageAccessAPIEnabled = enabled;
     414#if PLATFORM(COCOA)
     415    sendToNetworkingProcess(Messages::NetworkProcess::SetStorageAccessAPIEnabled(enabled));
     416#endif
     417}
     418
    411419void WebProcessPool::setCustomWebContentServiceBundleIdentifier(const String& customWebContentServiceBundleIdentifier)
    412420{

  • TabularUnified trunk/Source/WebKit/UIProcess/WebProcessPool.h

    r249501 r249589  
    466466    bool cookieStoragePartitioningEnabled() const { return m_cookieStoragePartitioningEnabled; }
    467467    void setCookieStoragePartitioningEnabled(bool);
     468
     469    void clearPermanentCredentialsForProtectionSpace(WebCore::ProtectionSpace&&);
     470#endif
    468471    bool storageAccessAPIEnabled() const { return m_storageAccessAPIEnabled; }
    469472    void setStorageAccessAPIEnabled(bool);
    470 
    471     void clearPermanentCredentialsForProtectionSpace(WebCore::ProtectionSpace&&);
    472 #endif
    473473
    474474    static uint64_t registerProcessPoolCreationListener(Function<void(WebProcessPool&)>&&);
    … …  
    757757#if PLATFORM(COCOA)
    758758    bool m_cookieStoragePartitioningEnabled { false };
     759#endif
    759760    bool m_storageAccessAPIEnabled { false };
    760 #endif
    761761
    762762    struct Paths {

  • TabularUnified trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r249504 r249589  
    11031103                5C5D238C227A2CDA000B9BDA /* _WKCustomHeaderFields.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5D2389227A1892000B9BDA /* _WKCustomHeaderFields.h */; settings = {ATTRIBUTES = (Private, ); }; };
    11041104                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, ); }; };
    11051106                5C795D70229F373F003FF1C4 /* WKContextMenuElementInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE0C369229F2D4A003695F0 /* WKContextMenuElementInfo.h */; settings = {ATTRIBUTES = (Public, ); }; };
    11061107                5C795D71229F3757003FF1C4 /* WKContextMenuElementInfoPrivate.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE0C36A229F2D4A003695F0 /* WKContextMenuElementInfoPrivate.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    17241725                        filePatterns = "*.h";
    17251726                        fileType = pattern.proxy;
    1726                         inputFiles = (
    1727                         );
    17281727                        isEditable = 1;
    17291728                        outputFiles = (
    … …  
    36373636                5C5D238A227A1D9B000B9BDA /* APICustomHeaderFields.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APICustomHeaderFields.h; sourceTree = "<group>"; };
    36383637                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>"; };
    36393640                5C6CE6D01F59BC460007C6CB /* PageClientImplCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PageClientImplCocoa.mm; sourceTree = "<group>"; };
    36403641                5C6CE6D31F59EA350007C6CB /* PageClientImplCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageClientImplCocoa.h; sourceTree = "<group>"; };
    … …  
    80418042                                B62E730F143047A60069EC35 /* WKHitTestResult.cpp */,
    80428043                                B62E7311143047B00069EC35 /* WKHitTestResult.h */,
     8044                                5C66A4B32320961300EA4D44 /* WKHTTPCookieStoreRef.cpp */,
     8045                                5C66A4B42320961400EA4D44 /* WKHTTPCookieStoreRef.h */,
    80438046                                5110AE0A133C16CB0072717A /* WKIconDatabase.cpp */,
    80448047                                5110AE0B133C16CB0072717A /* WKIconDatabase.h */,
    … …  
    1019710200                                B62E7312143047B00069EC35 /* WKHitTestResult.h in Headers */,
    1019810201                                51D124991E763C01002B2820 /* WKHTTPCookieStore.h in Headers */,
     10202                                5C66A4B52320962400EA4D44 /* WKHTTPCookieStoreRef.h in Headers */,
    1019910203                                5110AE0D133C16CB0072717A /* WKIconDatabase.h in Headers */,
    1020010204                                5123CF1C133D260A0056F800 /* WKIconDatabaseCG.h in Headers */,

  • TabularUnified trunk/Tools/ChangeLog

    r249584 r249589  
     12019-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
    1222019-09-06  Tim Horton  <timothy_horton@apple.com>
    223

  • TabularUnified trunk/Tools/TestWebKitAPI/CMakeLists.txt

    r248029 r249589  
    196196        Tests/WebKit/AboutBlankLoad.cpp
    197197        Tests/WebKit/CanHandleRequest.cpp
    198         Tests/WebKit/CookieManager.cpp
    199198        Tests/WebKit/DOMWindowExtensionBasic.cpp
    200199        Tests/WebKit/DOMWindowExtensionNoCache.cpp

  • TabularUnified trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

    r249584 r249589  
    283283                51CD1C721B38D48400142CA5 /* modal-alerts-in-new-about-blank-window.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 51CD1C711B38D48400142CA5 /* modal-alerts-in-new-about-blank-window.html */; };
    284284                51D124981E763B02002B2820 /* WKHTTPCookieStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D124971E763AF8002B2820 /* WKHTTPCookieStore.mm */; };
    285                 51D1249B1E785425002B2820 /* CookieManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */; };
    286285                51D8C1902267B26D00797E40 /* PDFLinkReferrer.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51D8C18F2267B26700797E40 /* PDFLinkReferrer.mm */; };
    287286                51DB16CE1F085137001FA4C5 /* WebViewIconLoading.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51DB16CD1F085047001FA4C5 /* WebViewIconLoading.mm */; };
    … …  
    25272526                F6B7BE93174691EF008A3445 /* DidAssociateFormControls.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = DidAssociateFormControls.cpp; sourceTree = "<group>"; };
    25282527                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>"; };
    25302528                F6F49C6615545C8D0007F39D /* DOMWindowExtensionNoCache_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowExtensionNoCache_Bundle.cpp; sourceTree = "<group>"; };
    25312529                F6F49C6715545C8D0007F39D /* DOMWindowExtensionNoCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DOMWindowExtensionNoCache.cpp; sourceTree = "<group>"; };
    … …  
    34493447                                1A50AA1C1A2A4E7000F4C345 /* CloseFromWithinCreatePage.cpp */,
    34503448                                7C8DDAA91735DE1D00EA5AC0 /* CloseThenTerminate.cpp */,
    3451                                 F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */,
    34523449                                F6B7BE93174691EF008A3445 /* DidAssociateFormControls.cpp */,
    34533450                                F6B7BE92174691EF008A3445 /* DidAssociateFormControls_Bundle.cpp */,
    … …  
    44204417                                5C3B1D2622A74F6700BCF4D0 /* ContextMenus.mm in Sources */,
    44214418                                5C2936931D5BF70D00DEAB1E /* CookieAcceptPolicy.mm in Sources */,
    4422                                 51D1249B1E785425002B2820 /* CookieManager.cpp in Sources */,
    44234419                                5C19A5241FD0F60100EEA323 /* CookiePrivateBrowsing.mm in Sources */,
    44244420                                9B1F6F781F90558400B55744 /* CopyHTML.mm in Sources */,

  • TabularUnified trunk/Tools/WebKitTestRunner/TestController.cpp

    r249542 r249589  
    3939#include <WebKit/WKContextConfigurationRef.h>
    4040#include <WebKit/WKContextPrivate.h>
    41 #include <WebKit/WKCookieManager.h>
    4241#include <WebKit/WKCredential.h>
    4342#include <WebKit/WKFrameHandleRef.h>
    4443#include <WebKit/WKFrameInfoRef.h>
     44#include <WebKit/WKHTTPCookieStoreRef.h>
    4545#include <WebKit/WKIconDatabase.h>
    4646#include <WebKit/WKMessageListener.h>
    … …  
    872872    WKPreferencesSetDirectoryUploadEnabled(preferences, true);
    873873
    874     WKCookieManagerDeleteAllCookies(WKContextGetCookieManager(m_context.get()));
     874    WKHTTPCookieStoreDeleteAllCookies(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(m_context.get())), nullptr, nullptr);
    875875
    876876    WKPreferencesSetMockCaptureDevicesEnabled(preferences, true);
    … …  
    20992099    auto setHTTPCookieAcceptPolicy = [&] (WKHTTPCookieAcceptPolicy policy, CompletionHandler<void(WKTypeRef)>&& completionHandler) {
    21002100        auto context = new CompletionHandler<void(WKTypeRef)>(WTFMove(completionHandler));
    2101         WKCookieManagerSetHTTPCookieAcceptPolicy(WKContextGetCookieManager(this->context()), policy, context, [] (WKErrorRef error, void* context) {
     2101        WKHTTPCookieStoreSetHTTPCookieAcceptPolicy(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(m_context.get())), policy, context, [] (void* context) {
    21022102            auto completionHandlerPointer = static_cast<CompletionHandler<void(WKTypeRef)>*>(context);
    21032103            (*completionHandlerPointer)(nullptr);

  • TabularUnified trunk/Tools/WebKitTestRunner/TestInvocation.cpp

    r248856 r249589  
    3434#include "WebCoreTestSupport.h"
    3535#include <WebKit/WKContextPrivate.h>
    36 #include <WebKit/WKCookieManager.h>
    3736#include <WebKit/WKData.h>
    3837#include <WebKit/WKDictionary.h>
     38#include <WebKit/WKHTTPCookieStoreRef.h>
    3939#include <WebKit/WKInspector.h>
    4040#include <WebKit/WKPagePrivate.h>
    … …  
    165165    TestController::singleton().setShouldLogHistoryClientCallbacks(shouldLogHistoryClientCallbacks());
    166166
    167     WKCookieManagerSetHTTPCookieAcceptPolicy(WKContextGetCookieManager(TestController::singleton().context()), kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain, nullptr, nullptr);
     167    WKHTTPCookieStoreSetHTTPCookieAcceptPolicy(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(TestController::singleton().context())), kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain, nullptr, nullptr);
    168168
    169169    // FIXME: We should clear out visited links here.
    … …  
    913913    if (WKStringIsEqualToUTF8CString(messageName, "SetStorageAccessAPIEnabled")) {
    914914        WKBooleanRef accept = static_cast<WKBooleanRef>(messageBody);
    915         WKCookieManagerSetStorageAccessAPIEnabled(WKContextGetCookieManager(TestController::singleton().context()), WKBooleanGetValue(accept));
     915        WKContextSetStorageAccessAPIEnabled(TestController::singleton().context(), WKBooleanGetValue(accept));
    916916        return nullptr;
    917917    }

  • TabularUnified trunk/Tools/WebKitTestRunner/cocoa/TestControllerCocoa.mm

    r249542 r249589  
    3737#import <WebKit/WKContextConfigurationRef.h>
    3838#import <WebKit/WKContextPrivate.h>
    39 #import <WebKit/WKCookieManager.h>
    4039#import <WebKit/WKPreferencesRefPrivate.h>
    4140#import <WebKit/WKProcessPoolPrivate.h>
    … …  
    7069    globalWebViewConfiguration._applePayEnabled = YES;
    7170
    72     WKCookieManagerSetStorageAccessAPIEnabled(WKContextGetCookieManager(context), true);
     71    WKContextSetStorageAccessAPIEnabled(context, true);
    7372
    7473    WKWebsiteDataStore* poolWebsiteDataStore = (__bridge WKWebsiteDataStore *)WKContextGetWebsiteDataStore((__bridge WKContextRef)globalWebViewConfiguration.processPool);
Note: See TracChangeset for help on using the changeset viewer.