Attachment 368980 Details for Bug 197575 – Patch

[patch] Patch

bug-197575-20190503135400.patch (text/plain), 11.64 KB, created by Alex Christensen on 2019-05-03 13:54:01 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-05-03 13:54:01 PDT

Size: 11.64 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 244917)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,26 @@
>+2019-05-03  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unnecessary test SPI after r244883
>+        https://bugs.webkit.org/show_bug.cgi?id=197575
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        We now have two ways of doing the same thing.  Let's remove the one that's only for testing,
>+        and make the tests clean up like an application would.
>+
>+        * NetworkProcess/NetworkProcess.cpp:
>+        (WebKit::NetworkProcess::removeCredential): Deleted.
>+        * NetworkProcess/NetworkProcess.h:
>+        * NetworkProcess/NetworkProcess.messages.in:
>+        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
>+        (WebKit::NetworkProcess::removeCredential): Deleted.
>+        * UIProcess/API/Cocoa/WKProcessPool.mm:
>+        (-[WKProcessPool _removeCredential:forProtectionSpace:completionHandler:]): Deleted.
>+        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
>+        * UIProcess/WebProcessPool.cpp:
>+        (WebKit::WebProcessPool::removeCredential): Deleted.
>+        * UIProcess/WebProcessPool.h:
>+
> 2019-05-03  Brent Fulgham  <bfulgham@apple.com>
> 
>         Use more efficient path resolution logic
>Index: Source/WebKit/NetworkProcess/NetworkProcess.cpp
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcess.cpp	(revision 244917)
>+++ Source/WebKit/NetworkProcess/NetworkProcess.cpp	(working copy)
>@@ -2497,11 +2497,6 @@ StorageQuotaManager& NetworkProcess::sto
> }
> 
> #if !PLATFORM(COCOA)
>-void NetworkProcess::removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&& completionHandler)
>-{
>-    completionHandler();
>-}
>-
> void NetworkProcess::originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&& completionHandler)
> {
>     completionHandler(Vector<WebCore::SecurityOriginData>());
>Index: Source/WebKit/NetworkProcess/NetworkProcess.h
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcess.h	(revision 244917)
>+++ Source/WebKit/NetworkProcess/NetworkProcess.h	(working copy)
>@@ -432,8 +432,6 @@ private:
> 
>     void platformSyncAllCookies(CompletionHandler<void()>&&);
> 
>-    void removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&&);
>-
>     void originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&&);
>     void removeCredentialsWithOrigins(const Vector<WebCore::SecurityOriginData>& origins, CompletionHandler<void()>&&);
>     
>Index: Source/WebKit/NetworkProcess/NetworkProcess.messages.in
>===================================================================
>--- Source/WebKit/NetworkProcess/NetworkProcess.messages.in	(revision 244917)
>+++ Source/WebKit/NetworkProcess/NetworkProcess.messages.in	(working copy)
>@@ -172,7 +172,6 @@ messages -> NetworkProcess LegacyReceive
>     SetAdClickAttributionOverrideTimerForTesting(PAL::SessionID sessionID, bool value) -> () Async
>     SetAdClickAttributionConversionURLForTesting(PAL::SessionID sessionID, URL url) -> () Async
>     MarkAdClickAttributionsAsExpiredForTesting(PAL::SessionID sessionID) -> () Async
>-    RemoveCredential(WebCore::Credential credential, WebCore::ProtectionSpace protectionSpace) -> () Async
>     OriginsWithPersistentCredentials() -> (Vector<WebCore::SecurityOriginData> origins) Async
>     RemoveCredentialsWithOrigins(Vector<WebCore::SecurityOriginData> origins) -> () Async
> }
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	(revision 244917)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm	(working copy)
>@@ -205,18 +205,6 @@ void NetworkProcess::clearDiskCache(Wall
>     }).get());
> }
> 
>-void NetworkProcess::removeCredential(WebCore::Credential&& credential, WebCore::ProtectionSpace&& protectionSpace, CompletionHandler<void()>&& completionHandler)
>-{
>-    NSURLProtectionSpace *nsSpace = protectionSpace.nsSpace();
>-    NSURLCredential *nsCredential = [[[NSURLCredentialStorage sharedCredentialStorage] credentialsForProtectionSpace:nsSpace] objectForKey:credential.user()];
>-    RELEASE_ASSERT(nsCredential);
>-    RELEASE_ASSERT([nsCredential.user isEqualToString:credential.user()]);
>-    RELEASE_ASSERT([nsCredential.password isEqualToString:credential.password()]);
>-    [[NSURLCredentialStorage sharedCredentialStorage] removeCredential:nsCredential forProtectionSpace:nsSpace];
>-    RELEASE_ASSERT(![[[NSURLCredentialStorage sharedCredentialStorage] credentialsForProtectionSpace:nsSpace] objectForKey:credential.user()]);
>-    completionHandler();
>-}
>-
> void NetworkProcess::originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&& completionHandler)
> {
>     completionHandler(WebCore::CredentialStorage::originsWithPersistentCredentials());
>Index: Source/WebKit/UIProcess/WebProcessPool.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebProcessPool.cpp	(revision 244917)
>+++ Source/WebKit/UIProcess/WebProcessPool.cpp	(working copy)
>@@ -1722,11 +1722,6 @@ void WebProcessPool::useTestingNetworkSe
>     m_shouldUseTestingNetworkSession = true;
> }
> 
>-void WebProcessPool::removeCredential(WebCore::Credential&& credential, WebCore::ProtectionSpace&& protectionSpace, CompletionHandler<void()>&& completionHandler)
>-{
>-    m_networkProcess->sendWithAsyncReply(Messages::NetworkProcess::RemoveCredential(credential, protectionSpace), WTFMove(completionHandler));
>-}
>-
> template<typename T, typename U>
> void WebProcessPool::sendSyncToNetworkingProcess(T&& message, U&& reply)
> {
>Index: Source/WebKit/UIProcess/WebProcessPool.h
>===================================================================
>--- Source/WebKit/UIProcess/WebProcessPool.h	(revision 244917)
>+++ Source/WebKit/UIProcess/WebProcessPool.h	(working copy)
>@@ -507,8 +507,6 @@ public:
> 
>     void disableDelayedWebProcessLaunch() { m_isDelayedWebProcessLaunchDisabled = true; }
> 
>-    void removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&&);
>-    
> private:
>     void platformInitialize();
> 
>Index: Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm	(revision 244917)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm	(working copy)
>@@ -519,13 +519,6 @@ - (void)_preconnectToServer:(NSURL *)ser
>     _processPool->preconnectToServer(serverURL);
> }
> 
>-- (void)_removeCredential:(NSURLCredential *)credential forProtectionSpace:(NSURLProtectionSpace *)protectionSpace completionHandler:(void(^)())completionHandler
>-{
>-    _processPool->removeCredential(WebCore::Credential(credential), WebCore::ProtectionSpace(protectionSpace), [completionHandler = makeBlockPtr(completionHandler)] {
>-        completionHandler();
>-    });
>-}
>-
> - (size_t)_pluginProcessCount
> {
> #if !PLATFORM(IOS_FAMILY)
>Index: Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h
>===================================================================
>--- Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h	(revision 244917)
>+++ Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h	(working copy)
>@@ -116,9 +116,6 @@
> - (void)_preconnectToServer:(NSURL *)serverURL WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
> 
> // Test only.
>-- (void)_removeCredential:(NSURLCredential *)credential forProtectionSpace:(NSURLProtectionSpace *)protectionSpace completionHandler:(void(^)(void))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
>-
>-// Test only.
> - (void)_setAllowsAnySSLCertificateForServiceWorker:(BOOL)allows WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
> - (void)_registerURLSchemeServiceWorkersCanHandle:(NSString *)scheme WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
> - (void)_getActivePagesOriginsInWebProcessForTesting:(pid_t)pid completionHandler:(void(^)(NSArray<NSString *> *))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 244918)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-05-03  Alex Christensen  <achristensen@webkit.org>
>+
>+        Remove unnecessary test SPI after r244883
>+        https://bugs.webkit.org/show_bug.cgi?id=197575
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
>+        (TEST):
>+        * TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm:
>+        (TestWebKitAPI::TEST):
>+
> 2019-05-03  Yusuke Suzuki  <ysuzuki@apple.com>
> 
>         [JSC] Generator CodeBlock generation should be idempotent
>Index: Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm	(revision 244917)
>+++ Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm	(working copy)
>@@ -31,6 +31,7 @@
> #import "TestWKWebView.h"
> #import "WKWebViewConfigurationExtras.h"
> #import <WebKit/WKProcessPoolPrivate.h>
>+#import <WebKit/WKWebsiteDataRecordPrivate.h>
> #import <wtf/RetainPtr.h>
> 
> static bool navigationFinished;
>@@ -302,10 +303,12 @@ TEST(Challenge, BasicProposedCredential)
>     Util::run(&navigationFinished);
>     EXPECT_TRUE(receivedSecondChallenge);
>     
>-    NSURLProtectionSpace *protectionSpace = [[[NSURLProtectionSpace alloc] initWithHost:@"127.0.0.1" port:server.port() protocol:NSURLProtectionSpaceHTTP realm:@"testrealm" authenticationMethod:NSURLAuthenticationMethodHTTPBasic] autorelease];
>     __block bool removedCredential = false;
>-    [[webView configuration].processPool _removeCredential:persistentCredential.get() forProtectionSpace:protectionSpace completionHandler:^{
>-        removedCredential = true;
>+    WKWebsiteDataStore *websiteDataStore = [webView configuration].websiteDataStore;
>+    [websiteDataStore fetchDataRecordsOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
>+        [websiteDataStore removeDataOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] forDataRecords:dataRecords completionHandler:^(void) {
>+            removedCredential = true;
>+        }];
>     }];
>     Util::run(&removedCredential);
> }
>Index: Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm	(revision 244917)
>+++ Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm	(working copy)
>@@ -191,8 +191,10 @@ TEST(WKWebsiteDataStore, FetchPersistent
>     TestWebKitAPI::Util::run(&done);
>     
>     __block bool removedCredential = false;
>-    [[[webView configuration] processPool] _removeCredential:persistentCredential.get() forProtectionSpace:[[[NSURLProtectionSpace alloc] initWithHost:@"127.0.0.1" port:server.port() protocol:NSURLProtectionSpaceHTTP realm:@"testrealm" authenticationMethod:NSURLAuthenticationMethodHTTPBasic] autorelease] completionHandler:^{
>-        removedCredential = true;
>+    [websiteDataStore fetchDataRecordsOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
>+        [websiteDataStore removeDataOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] forDataRecords:dataRecords completionHandler:^(void) {
>+            removedCredential = true;
>+        }];
>     }];
>     TestWebKitAPI::Util::run(&removedCredential);
> }

Flags:

thorton: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 197575: 368980