Changeset 196461 in webkit


Ignore:
Timestamp:
Feb 11, 2016 5:30:45 PM (8 years ago)
Author:
Ryan Haddad
Message:

Unreviewed, rolling out r196453.
​https://bugs.webkit.org/show_bug.cgi?id=154142

This change broke internal iOS builds (Requested by ryanhaddad
on #webkit).

Reverted changeset:

"Move Download authentication code to AuthenticationManager"
​https://bugs.webkit.org/show_bug.cgi?id=154132
​http://trac.webkit.org/changeset/196453

Patch by Commit Queue <​commit-queue@webkit.org> on 2016-02-11

Location:
trunk/Source/WebKit2
Files:
2 deleted
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r196457 r196461  
     12016-02-11  Commit Queue  <commit-queue@webkit.org>
     2
     3        Unreviewed, rolling out r196453.
     4        https://bugs.webkit.org/show_bug.cgi?id=154142
     5
     6        This change broke internal iOS builds (Requested by ryanhaddad
     7        on #webkit).
     8
     9        Reverted changeset:
     10
     11        "Move Download authentication code to AuthenticationManager"
     12        https://bugs.webkit.org/show_bug.cgi?id=154132
     13        http://trac.webkit.org/changeset/196453
     14
    1152016-02-11  Anders Carlsson  <andersca@apple.com>
    216

  • trunk/Source/WebKit2/NetworkProcess/Downloads/Download.h

    r196453 r196461  
    114114#endif
    115115
     116#if !USE(NETWORK_SESSION)
     117    // Authentication
     118    static void receivedCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
     119    static void receivedRequestToContinueWithoutCredential(const WebCore::AuthenticationChallenge&);
     120    static void receivedCancellation(const WebCore::AuthenticationChallenge&);
     121    static void receivedRequestToPerformDefaultHandling(const WebCore::AuthenticationChallenge&);
     122    static void receivedChallengeRejection(const WebCore::AuthenticationChallenge&);
     123
     124    void useCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
     125    void continueWithoutCredential(const WebCore::AuthenticationChallenge&);
     126    void cancelAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
     127#endif
     128
    116129private:
    117130    // IPC::MessageSender

  • trunk/Source/WebKit2/NetworkProcess/Downloads/ios/DownloadIOS.mm

    r196453 r196461  
    158158}
    159159
     160void Download::receivedCredential(const AuthenticationChallenge&, const Credential&)
     161{
     162    notImplemented();
     163}
     164
     165void Download::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
     166{
     167    notImplemented();
     168}
     169
     170void Download::receivedCancellation(const AuthenticationChallenge&)
     171{
     172    notImplemented();
     173}
     174
     175void Download::receivedRequestToPerformDefaultHandling(const WebCore::AuthenticationChallenge&)
     176{
     177    notImplemented();
     178}
     179
     180void Download::receivedChallengeRejection(const WebCore::AuthenticationChallenge&)
     181{
     182    notImplemented();
     183}
     184
    160185} // namespace WebKit
    161186

  • trunk/Source/WebKit2/NetworkProcess/Downloads/mac/DownloadMac.mm

    r196453 r196461  
    132132}
    133133
     134void Download::receivedCredential(const AuthenticationChallenge& authenticationChallenge, const Credential& credential)
     135{
     136    [authenticationChallenge.sender() useCredential:credential.nsCredential() forAuthenticationChallenge:authenticationChallenge.nsURLAuthenticationChallenge()];
     137}
     138
     139void Download::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge& authenticationChallenge)
     140{
     141    [authenticationChallenge.sender() continueWithoutCredentialForAuthenticationChallenge:authenticationChallenge.nsURLAuthenticationChallenge()];
     142}
     143
     144void Download::receivedCancellation(const AuthenticationChallenge& authenticationChallenge)
     145{
     146    [authenticationChallenge.sender() cancelAuthenticationChallenge:authenticationChallenge.nsURLAuthenticationChallenge()];
     147}
     148
     149void Download::receivedRequestToPerformDefaultHandling(const AuthenticationChallenge& authenticationChallenge)
     150{
     151    [authenticationChallenge.sender() performDefaultHandlingForAuthenticationChallenge:authenticationChallenge.nsURLAuthenticationChallenge()];
     152}
     153
     154void Download::receivedChallengeRejection(const AuthenticationChallenge& authenticationChallenge)
     155{
     156    [authenticationChallenge.sender() rejectProtectionSpaceAndContinueWithChallenge:authenticationChallenge.nsURLAuthenticationChallenge()];
     157}
     158
    134159} // namespace WebKit
    135160

  • trunk/Source/WebKit2/NetworkProcess/Downloads/soup/DownloadSoup.cpp

    r196453 r196461  
    270270}
    271271
     272void Download::receivedCredential(const AuthenticationChallenge&, const Credential&)
     273{
     274    notImplemented();
     275}
     276
     277void Download::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge&)
     278{
     279    notImplemented();
     280}
     281
     282void Download::receivedCancellation(const AuthenticationChallenge&)
     283{
     284    notImplemented();
     285}
     286
     287void Download::continueWithoutCredential(const AuthenticationChallenge &)
     288{
     289    notImplemented();
     290}
     291
     292void Download::useCredential(const AuthenticationChallenge&, const Credential&)
     293{
     294    notImplemented();
     295}
     296
     297void Download::cancelAuthenticationChallenge(const AuthenticationChallenge&)
     298{
     299    notImplemented();
     300}
     301
     302void Download::receivedRequestToPerformDefaultHandling(const AuthenticationChallenge&)
     303{
     304    notImplemented();
     305}
     306
     307void Download::receivedChallengeRejection(const AuthenticationChallenge&)
     308{
     309    notImplemented();
     310}
     311
    272312} // namespace WebKit

  • trunk/Source/WebKit2/PlatformEfl.cmake

    r196453 r196461  
    2929
    3030    Shared/API/c/efl/WKArrayEfl.cpp
    31 
    32     Shared/Authentication/soup/AuthenticationManagerSoup.cpp
    3331
    3432    Shared/CoordinatedGraphics/CoordinatedBackingStore.cpp

  • trunk/Source/WebKit2/PlatformGTK.cmake

    r196453 r196461  
    5757
    5858    Shared/API/c/cairo/WKImageCairo.cpp
    59 
    60     Shared/Authentication/soup/AuthenticationManagerSoup.cpp
    6159
    6260    Shared/Plugins/Netscape/x11/NetscapePluginModuleX11.cpp

  • trunk/Source/WebKit2/PlatformMac.cmake

    r196453 r196461  
    5454    Shared/APIWebArchive.mm
    5555    Shared/APIWebArchiveResource.mm
    56 
    57     Shared/Authentication/cocoa/AuthenticationManagerCocoa.mm
    5856
    5957    Shared/API/Cocoa/RemoteObjectInvocation.mm

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.cpp

    r196453 r196461  
    117117    uint64_t challengeID = addChallengeToChallengeMap({pageID, authenticationChallenge
    118118#if USE(NETWORK_SESSION)
    119         , { }
     119        , ChallengeCompletionHandler()
    120120#endif
    121121    });
    … …  
    162162    uint64_t challengeID = addChallengeToChallengeMap({pageID, authenticationChallenge
    163163#if USE(NETWORK_SESSION)
    164         , { }
     164        , ChallengeCompletionHandler()
    165165#endif
    166166    });
    … …  
    220220        return;
    221221    }
    222 #endif
    223 
    224     if (coreClient)
    225         coreClient->receivedCredential(challenge.challenge, credential);
    226     else
    227         receivedCredential(challenge.challenge, credential);
     222#else
     223    if (!coreClient) {
     224        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
     225        // We should not call Download::receivedCredential in the latter case.
     226        Download::receivedCredential(challenge.challenge, credential);
     227        return;
     228    }
     229#endif
     230
     231    ASSERT(coreClient);
     232    coreClient->receivedCredential(challenge.challenge, credential);
    228233}
    229234
    … …  
    248253        return;
    249254    }
    250 #endif
    251 
    252     if (coreClient)
    253         coreClient->receivedRequestToContinueWithoutCredential(challenge.challenge);
    254     else
    255         receivedRequestToContinueWithoutCredential(challenge.challenge);
     255#else
     256    if (!coreClient) {
     257        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
     258        // We should not call Download::receivedCredential in the latter case.
     259        Download::receivedRequestToContinueWithoutCredential(challenge.challenge);
     260        return;
     261    }
     262#endif
     263
     264    ASSERT(coreClient);
     265    coreClient->receivedRequestToContinueWithoutCredential(challenge.challenge);
    256266}
    257267
    … …  
    276286        return;
    277287    }
    278 #endif
    279 
    280     if (coreClient)
    281         coreClient->receivedCancellation(challenge.challenge);
    282     else
    283         receivedCancellation(challenge.challenge);
     288#else
     289    if (!coreClient) {
     290        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
     291        // We should not call Download::receivedCredential in the latter case.
     292        Download::receivedCancellation(challenge.challenge);
     293        return;
     294    }
     295#endif
     296
     297    ASSERT(coreClient);
     298    coreClient->receivedCancellation(challenge.challenge);
    284299}
    285300
    … …  
    304319        return;
    305320    }
    306 #endif
    307 
    308     if (coreClient)
    309         coreClient->receivedRequestToPerformDefaultHandling(challenge.challenge);
    310     else
    311         receivedRequestToPerformDefaultHandling(challenge.challenge);
     321#else
     322    if (!coreClient) {
     323        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
     324        // We should not call Download::receivedCredential in the latter case.
     325        Download::receivedRequestToPerformDefaultHandling(challenge.challenge);
     326        return;
     327    }
     328#endif
     329
     330    ASSERT(coreClient);
     331    coreClient->receivedRequestToPerformDefaultHandling(challenge.challenge);
    312332}
    313333
    … …  
    332352        return;
    333353    }
    334 #endif
    335 
    336     if (coreClient)
    337         coreClient->receivedChallengeRejection(challenge.challenge);
    338     else
    339         receivedChallengeRejection(challenge.challenge);
     354#else
     355    if (!coreClient) {
     356        // FIXME: The authentication client is null for downloads, but it can also be null for canceled loads.
     357        // We should not call Download::receivedCredential in the latter case.
     358        Download::receivedChallengeRejection(challenge.challenge);
     359        return;
     360    }
     361#endif
     362
     363    ASSERT(coreClient);
     364    coreClient->receivedChallengeRejection(challenge.challenge);
    340365}
    341366

  • trunk/Source/WebKit2/Shared/Authentication/AuthenticationManager.h

    r196453 r196461  
    7777    uint64_t outstandingAuthenticationChallengeCount() const { return m_challenges.size(); }
    7878
    79     static void receivedCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
    80     static void receivedRequestToContinueWithoutCredential(const WebCore::AuthenticationChallenge&);
    81     static void receivedCancellation(const WebCore::AuthenticationChallenge&);
    82     static void receivedRequestToPerformDefaultHandling(const WebCore::AuthenticationChallenge&);
    83     static void receivedChallengeRejection(const WebCore::AuthenticationChallenge&);
    84 
    8579private:
    8680    struct Challenge {

  • trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

    r196453 r196461  
    10401040                52D5A1B11C57496200DE34A3 /* WebVideoFullscreenManagerProxy.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1AC1C57494E00DE34A3 /* WebVideoFullscreenManagerProxy.mm */; };
    10411041                52D5A1B71C574A0200DE34A3 /* WebVideoFullscreenManager.mm in Sources */ = {isa = PBXBuildFile; fileRef = 52D5A1B41C5749F200DE34A3 /* WebVideoFullscreenManager.mm */; };
    1042                 5C052F261C6D3BD30076E919 /* AuthenticationManagerCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 5C052F241C6D3AB60076E919 /* AuthenticationManagerCocoa.mm */; };
    10431042                5C1426EC1C23F80900D41183 /* NetworkProcessCreationParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */; };
    10441043                5C1426ED1C23F80900D41183 /* NetworkProcessCreationParameters.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */; };
    … …  
    31323131                52D5A1B31C5749F200DE34A3 /* WebVideoFullscreenManager.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebVideoFullscreenManager.messages.in; sourceTree = "<group>"; };
    31333132                52D5A1B41C5749F200DE34A3 /* WebVideoFullscreenManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVideoFullscreenManager.mm; sourceTree = "<group>"; };
    3134                 5C052F241C6D3AB60076E919 /* AuthenticationManagerCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AuthenticationManagerCocoa.mm; path = Authentication/cocoa/AuthenticationManagerCocoa.mm; sourceTree = "<group>"; };
    31353133                5C1426E21C23F80500D41183 /* NetworkProcessCreationParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkProcessCreationParameters.cpp; path = NetworkProcess/NetworkProcessCreationParameters.cpp; sourceTree = "<group>"; };
    31363134                5C1426E31C23F80500D41183 /* NetworkProcessCreationParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkProcessCreationParameters.h; path = NetworkProcess/NetworkProcessCreationParameters.h; sourceTree = "<group>"; };
    … …  
    55345532                        isa = PBXGroup;
    55355533                        children = (
    5536                                 5C052F231C6D3AA10076E919 /* cocoa */,
    55375534                                518E8EF616B2091C00E91429 /* mac */,
    55385535                                518E8EF316B2091C00E91429 /* AuthenticationManager.cpp */,
    … …  
    56515648                        );
    56525649                        name = IconDatabase;
    5653                         sourceTree = "<group>";
    5654                 };
    5655                 5C052F231C6D3AA10076E919 /* cocoa */ = {
    5656                         isa = PBXGroup;
    5657                         children = (
    5658                                 5C052F241C6D3AB60076E919 /* AuthenticationManagerCocoa.mm */,
    5659                         );
    5660                         name = cocoa;
    56615650                        sourceTree = "<group>";
    56625651                };
    … …  
    92529241                                BCCF673312C7F15C008F9C35 /* OriginAndDatabases.cpp in Sources */,
    92539242                                7C387434172F5615001BD88A /* PageBanner.cpp in Sources */,
    9254                                 5C052F261C6D3BD30076E919 /* AuthenticationManagerCocoa.mm in Sources */,
    92559243                                7C6D37FC172F555F009D2847 /* PageBannerMac.mm in Sources */,
    92569244                                0FCB4E6318BBE3D9000FCFC9 /* PageClientImpl.mm in Sources */,
Note: See TracChangeset for help on using the changeset viewer.