Changeset 249619 in webkit

Timestamp:

Sep 7, 2019 3:54:22 PM (5 years ago)

Author:

achristensen@apple.com

Message:

Remove calls to WKContextGetWebsiteDataStore missed in r249614
​https://bugs.webkit.org/show_bug.cgi?id=200050

Source/WebKit:

It turns out I didn't need to introduce another way of clearing all cookies between tests.
I just needed to make the call to WKHTTPCookieStoreDeleteAllCookies use the right WebsiteDataStore.

• NetworkProcess/NetworkProcess.cpp:

(WebKit::NetworkProcess::clearCachedCredentials):

• NetworkProcess/NetworkSession.h:

(WebKit::NetworkSession::clearCredentials):
(WebKit::NetworkSession::clearCookies): Deleted.

• NetworkProcess/cocoa/NetworkSessionCocoa.h:
• NetworkProcess/cocoa/NetworkSessionCocoa.mm:

(WebKit::NetworkSessionCocoa::clearCookies): Deleted.

Tools:

• WebKitTestRunner/TestController.cpp:

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

• WebKitTestRunner/TestInvocation.cpp:

(WTR::TestInvocation::invoke):

Location:

trunk

Files:

• Source/WebKit/ChangeLog (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkProcess.cpp (modified) (1 diff)
• Source/WebKit/NetworkProcess/NetworkSession.h (modified) (1 diff)
• Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h (modified) (1 diff)
• Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/TestController.cpp (modified) (2 diffs)
• Tools/WebKitTestRunner/TestInvocation.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-09-07  Alex Christensen  <achristensen@webkit.org>
+
+        Remove calls to WKContextGetWebsiteDataStore missed in r249614
+        https://bugs.webkit.org/show_bug.cgi?id=200050
+
+        It turns out I didn't need to introduce another way of clearing all cookies between tests.
+        I just needed to make the call to WKHTTPCookieStoreDeleteAllCookies use the right WebsiteDataStore.
+
+        * NetworkProcess/NetworkProcess.cpp:
+        (WebKit::NetworkProcess::clearCachedCredentials):
+        * NetworkProcess/NetworkSession.h:
+        (WebKit::NetworkSession::clearCredentials):
+        (WebKit::NetworkSession::clearCookies): Deleted.
+        * NetworkProcess/cocoa/NetworkSessionCocoa.h:
+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
+        (WebKit::NetworkSessionCocoa::clearCookies): Deleted.
+
 2019-09-07  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

@@ -468 +468 @@
             storageSession->credentialStorage().clearCredentials();
         networkSession.clearCredentials();
-        networkSession.clearCookies();
     });
 }

trunk/Source/WebKit/NetworkProcess/NetworkSession.h

@@ -72 +72 @@
     virtual void invalidateAndCancel();
     virtual void clearCredentials() { };
-    virtual void clearCookies() { };
     virtual bool shouldLogCookieInformation() const { return false; }
     virtual Seconds loadThrottleLatency() const { return { }; }

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.h

@@ -94 +94 @@
     void invalidateAndCancel() override;
     void clearCredentials() override;
-    void clearCookies() override;
     bool shouldLogCookieInformation() const override { return m_shouldLogCookieInformation; }
     Seconds loadThrottleLatency() const override { return m_loadThrottleLatency; }

trunk/Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm

@@ -1173 +1173 @@
 }
 
-void NetworkSessionCocoa::clearCookies()
-{
-    if (auto storageSession = networkStorageSession()) {
-        NSHTTPCookieStorage *cookieStorage = storageSession->nsCookieStorage();
-        for (NSHTTPCookie *cookie in cookieStorage.cookies)
-            [cookieStorage deleteCookie:cookie];
-    }
-}
-
 NetworkDataTaskCocoa* NetworkSessionCocoa::dataTaskForIdentifier(NetworkDataTaskCocoa::TaskIdentifier taskIdentifier, WebCore::StoredCredentialsPolicy storedCredentialsPolicy)
 {

trunk/Tools/ChangeLog

@@ +1 @@
+2019-09-07  Alex Christensen  <achristensen@webkit.org>
+
+        Remove calls to WKContextGetWebsiteDataStore missed in r249614
+        https://bugs.webkit.org/show_bug.cgi?id=200050
+
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::resetPreferencesToConsistentValues):
+        (WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::TestInvocation::invoke):
+
 2019-09-07  Alex Christensen  <achristensen@webkit.org>
 

trunk/Tools/WebKitTestRunner/TestController.cpp

@@ -882 +882 @@
     WKPreferencesSetDirectoryUploadEnabled(preferences, true);
 
-    WKHTTPCookieStoreDeleteAllCookies(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(m_context.get())), nullptr, nullptr);
+    WKHTTPCookieStoreDeleteAllCookies(WKWebsiteDataStoreGetHTTPCookieStore(TestController::websiteDataStore()), nullptr, nullptr);
 
     WKPreferencesSetMockCaptureDevicesEnabled(preferences, true);
@@ -2108 +2108 @@
     auto setHTTPCookieAcceptPolicy = [&] (WKHTTPCookieAcceptPolicy policy, CompletionHandler<void(WKTypeRef)>&& completionHandler) {
         auto context = new CompletionHandler<void(WKTypeRef)>(WTFMove(completionHandler));
-        WKHTTPCookieStoreSetHTTPCookieAcceptPolicy(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(m_context.get())), policy, context, [] (void* context) {
+        WKHTTPCookieStoreSetHTTPCookieAcceptPolicy(WKWebsiteDataStoreGetHTTPCookieStore(TestController::websiteDataStore()), policy, context, [] (void* context) {
             auto completionHandlerPointer = static_cast<CompletionHandler<void(WKTypeRef)>*>(context);
             (*completionHandlerPointer)(nullptr);

trunk/Tools/WebKitTestRunner/TestInvocation.cpp

@@ -165 +165 @@
     TestController::singleton().setShouldLogHistoryClientCallbacks(shouldLogHistoryClientCallbacks());
 
-    WKHTTPCookieStoreSetHTTPCookieAcceptPolicy(WKWebsiteDataStoreGetHTTPCookieStore(WKContextGetWebsiteDataStore(TestController::singleton().context())), kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain, nullptr, nullptr);
+    WKHTTPCookieStoreSetHTTPCookieAcceptPolicy(WKWebsiteDataStoreGetHTTPCookieStore(TestController::websiteDataStore()), kWKHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain, nullptr, nullptr);
 
     // FIXME: We should clear out visited links here.