Changeset 245149 in webkit


Ignore:
Timestamp:
May 9, 2019 12:35:06 PM (5 years ago)
Author:
achristensen@apple.com
Message:

Remove unnecessary test SPI after r244883
​https://bugs.webkit.org/show_bug.cgi?id=197575

Reviewed by Tim Horton.

Source/WebKit:

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:

Tools:

  • TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:

(TEST):

  • TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm:

(TestWebKitAPI::TEST):

Location:
trunk
Files:
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r245148 r245149  
     12019-05-09  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove unnecessary test SPI after r244883
     4        https://bugs.webkit.org/show_bug.cgi?id=197575
     5
     6        Reviewed by Tim Horton.
     7
     8        We now have two ways of doing the same thing.  Let's remove the one that's only for testing,
     9        and make the tests clean up like an application would.
     10
     11        * NetworkProcess/NetworkProcess.cpp:
     12        (WebKit::NetworkProcess::removeCredential): Deleted.
     13        * NetworkProcess/NetworkProcess.h:
     14        * NetworkProcess/NetworkProcess.messages.in:
     15        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     16        (WebKit::NetworkProcess::removeCredential): Deleted.
     17        * UIProcess/API/Cocoa/WKProcessPool.mm:
     18        (-[WKProcessPool _removeCredential:forProtectionSpace:completionHandler:]): Deleted.
     19        * UIProcess/API/Cocoa/WKProcessPoolPrivate.h:
     20        * UIProcess/WebProcessPool.cpp:
     21        (WebKit::WebProcessPool::removeCredential): Deleted.
     22        * UIProcess/WebProcessPool.h:
     23
    1242019-05-09  Daniel Bates  <dabates@apple.com>
    225

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.cpp

    r245069 r245149  
    24362436
    24372437#if !PLATFORM(COCOA)
    2438 void NetworkProcess::removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&& completionHandler)
    2439 {
    2440     completionHandler();
    2441 }
    2442 
    24432438void NetworkProcess::originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&& completionHandler)
    24442439{

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

    r245025 r245149  
    429429    void platformSyncAllCookies(CompletionHandler<void()>&&);
    430430
    431     void removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&&);
    432 
    433431    void originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&&);
    434432    void removeCredentialsWithOrigins(const Vector<WebCore::SecurityOriginData>& origins, CompletionHandler<void()>&&);

  • trunk/Source/WebKit/NetworkProcess/NetworkProcess.messages.in

    r245025 r245149  
    168168    SetAdClickAttributionConversionURLForTesting(PAL::SessionID sessionID, URL url) -> () Async
    169169    MarkAdClickAttributionsAsExpiredForTesting(PAL::SessionID sessionID) -> () Async
    170     RemoveCredential(WebCore::Credential credential, WebCore::ProtectionSpace protectionSpace) -> () Async
    171170    OriginsWithPersistentCredentials() -> (Vector<WebCore::SecurityOriginData> origins) Async
    172171    RemoveCredentialsWithOrigins(Vector<WebCore::SecurityOriginData> origins) -> () Async

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r245075 r245149  
    213213}
    214214
    215 void NetworkProcess::removeCredential(WebCore::Credential&& credential, WebCore::ProtectionSpace&& protectionSpace, CompletionHandler<void()>&& completionHandler)
    216 {
    217     NSURLProtectionSpace *nsSpace = protectionSpace.nsSpace();
    218     NSURLCredential *nsCredential = [[[NSURLCredentialStorage sharedCredentialStorage] credentialsForProtectionSpace:nsSpace] objectForKey:credential.user()];
    219     RELEASE_ASSERT(nsCredential);
    220     RELEASE_ASSERT([nsCredential.user isEqualToString:credential.user()]);
    221     RELEASE_ASSERT([nsCredential.password isEqualToString:credential.password()]);
    222     [[NSURLCredentialStorage sharedCredentialStorage] removeCredential:nsCredential forProtectionSpace:nsSpace];
    223     RELEASE_ASSERT(![[[NSURLCredentialStorage sharedCredentialStorage] credentialsForProtectionSpace:nsSpace] objectForKey:credential.user()]);
    224     completionHandler();
    225 }
    226 
    227215void NetworkProcess::originsWithPersistentCredentials(CompletionHandler<void(Vector<WebCore::SecurityOriginData>)>&& completionHandler)
    228216{

  • trunk/Source/WebKit/Shared/mac/SecItemShim.cpp

    r240683 r245149  
    7979static Optional<SecItemResponseData> sendSecItemRequest(SecItemRequestData::Type requestType, CFDictionaryRef query, CFDictionaryRef attributesToMatch = 0)
    8080{
     81    WTFLogAlways("sendSecItemRequest CALLED BY ALEX");
    8182    if (!globalNetworkProcess())
    8283        return WTF::nullopt;

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPool.mm

    r244521 r245149  
    520520}
    521521
    522 - (void)_removeCredential:(NSURLCredential *)credential forProtectionSpace:(NSURLProtectionSpace *)protectionSpace completionHandler:(void(^)())completionHandler
    523 {
    524     _processPool->removeCredential(WebCore::Credential(credential), WebCore::ProtectionSpace(protectionSpace), [completionHandler = makeBlockPtr(completionHandler)] {
    525         completionHandler();
    526     });
    527 }
    528 
    529522- (size_t)_pluginProcessCount
    530523{

  • trunk/Source/WebKit/UIProcess/API/Cocoa/WKProcessPoolPrivate.h

    r244521 r245149  
    117117
    118118// Test only.
    119 - (void)_removeCredential:(NSURLCredential *)credential forProtectionSpace:(NSURLProtectionSpace *)protectionSpace completionHandler:(void(^)(void))completionHandler WK_API_AVAILABLE(macos(WK_MAC_TBA), ios(WK_IOS_TBA));
    120 
    121 // Test only.
    122119- (void)_setAllowsAnySSLCertificateForServiceWorker:(BOOL)allows WK_API_AVAILABLE(macos(10.13.4), ios(11.3));
    123120- (void)_registerURLSchemeServiceWorkersCanHandle:(NSString *)scheme WK_API_AVAILABLE(macos(10.13.4), ios(11.3));

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

    r245075 r245149  
    17271727}
    17281728
    1729 void WebProcessPool::removeCredential(WebCore::Credential&& credential, WebCore::ProtectionSpace&& protectionSpace, CompletionHandler<void()>&& completionHandler)
    1730 {
    1731     m_networkProcess->sendWithAsyncReply(Messages::NetworkProcess::RemoveCredential(credential, protectionSpace), WTFMove(completionHandler));
    1732 }
    1733 
    17341729template<typename T, typename U>
    17351730void WebProcessPool::sendSyncToNetworkingProcess(T&& message, U&& reply)

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

    r244521 r245149  
    508508    void disableDelayedWebProcessLaunch() { m_isDelayedWebProcessLaunchDisabled = true; }
    509509
    510     void removeCredential(WebCore::Credential&&, WebCore::ProtectionSpace&&, CompletionHandler<void()>&&);
    511    
    512510private:
    513511    void platformInitialize();

  • trunk/Tools/ChangeLog

    r245143 r245149  
     12019-05-09  Alex Christensen  <achristensen@webkit.org>
     2
     3        Remove unnecessary test SPI after r244883
     4        https://bugs.webkit.org/show_bug.cgi?id=197575
     5
     6        Reviewed by Tim Horton.
     7
     8        * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
     9        (TEST):
     10        * TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm:
     11        (TestWebKitAPI::TEST):
     12
    1132019-05-09  Aakash Jain  <aakash_jain@apple.com>
    214

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm

    r244874 r245149  
    3232#import "WKWebViewConfigurationExtras.h"
    3333#import <WebKit/WKProcessPoolPrivate.h>
     34#import <WebKit/WKWebsiteDataRecordPrivate.h>
    3435#import <wtf/RetainPtr.h>
    3536
    … …  
    303304    EXPECT_TRUE(receivedSecondChallenge);
    304305   
    305     NSURLProtectionSpace *protectionSpace = [[[NSURLProtectionSpace alloc] initWithHost:@"127.0.0.1" port:server.port() protocol:NSURLProtectionSpaceHTTP realm:@"testrealm" authenticationMethod:NSURLAuthenticationMethodHTTPBasic] autorelease];
    306306    __block bool removedCredential = false;
    307     [[webView configuration].processPool _removeCredential:persistentCredential.get() forProtectionSpace:protectionSpace completionHandler:^{
    308         removedCredential = true;
     307    WKWebsiteDataStore *websiteDataStore = [webView configuration].websiteDataStore;
     308    [websiteDataStore fetchDataRecordsOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
     309        [websiteDataStore removeDataOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] forDataRecords:dataRecords completionHandler:^(void) {
     310            removedCredential = true;
     311        }];
    309312    }];
    310313    Util::run(&removedCredential);

  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebsiteDatastore.mm

    r244988 r245149  
    193193   
    194194    __block bool removedCredential = false;
    195     [[[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:^{
    196         removedCredential = true;
     195    [websiteDataStore fetchDataRecordsOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] completionHandler:^(NSArray<WKWebsiteDataRecord *> *dataRecords) {
     196        [websiteDataStore removeDataOfTypes:[NSSet setWithObject:_WKWebsiteDataTypeCredentials] forDataRecords:dataRecords completionHandler:^(void) {
     197            removedCredential = true;
     198        }];
    197199    }];
    198200    TestWebKitAPI::Util::run(&removedCredential);
Note: See TracChangeset for help on using the changeset viewer.