Changeset 140921 in webkit


Ignore:
Timestamp:
Jan 26, 2013 5:01:08 PM (11 years ago)
Author:
ap@apple.com
Message:

Remove code for handling NetworkProcess authentication challenges in WebProcess
​https://bugs.webkit.org/show_bug.cgi?id=108003

Reviewed by Sam Weinig.

Location:
trunk/Source
Files:
1 deleted
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r140918 r140921  
     12013-01-26  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Remove code for handling NetworkProcess authentication challenges in WebProcess
     4        https://bugs.webkit.org/show_bug.cgi?id=108003
     5
     6        Reviewed by Sam Weinig.
     7
     8        * loader/ResourceLoader.cpp:
     9        (WebCore::ResourceLoader::didReceiveAuthenticationChallenge):
     10        Once again, there can be no authentication without an in-process network request.
     11
     12        * WebCore.exp.in:
     13        * platform/network/AuthenticationChallengeBase.cpp:
     14        (WebCore::AuthenticationChallengeBase::AuthenticationChallengeBase):
     15        * platform/network/AuthenticationChallengeBase.h:
     16        (AuthenticationChallengeBase):
     17        * platform/network/cf/AuthenticationCF.cpp:
     18        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
     19        * platform/network/cf/AuthenticationChallenge.h:
     20        (AuthenticationChallenge):
     21        * platform/network/curl/AuthenticationChallenge.h:
     22        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
     23        * platform/network/mac/AuthenticationMac.mm:
     24        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
     25        * platform/network/qt/AuthenticationChallenge.h:
     26        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
     27        * platform/network/soup/AuthenticationChallenge.h:
     28        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
     29        * platform/network/win/AuthenticationChallenge.h:
     30        (WebCore::AuthenticationChallenge::AuthenticationChallenge):
     31        Removed everything related to AuthenticationChallengeBase::m_identifier.
     32        The identifier is now tracked for IPC only, which is the right thing, because
     33        nothing can guarantee identifier uniqueness across processes.
     34
    1352013-01-26  Laszlo Gombos  <l.gombos@samsung.com>
    236

  • trunk/Source/WebCore/WebCore.exp.in

    r140875 r140921  
    650650__ZN7WebCore23ApplicationCacheStorage5emptyEv
    651651__ZN7WebCore23AuthenticationChallenge23setAuthenticationClientEPNS_20AuthenticationClientE
    652 __ZN7WebCore23AuthenticationChallengeC1ERKNS_15ProtectionSpaceERKNS_10CredentialEjRKNS_16ResourceResponseERKNS_13ResourceErrorEy
     652__ZN7WebCore23AuthenticationChallengeC1ERKNS_15ProtectionSpaceERKNS_10CredentialEjRKNS_16ResourceResponseERKNS_13ResourceErrorE
    653653__ZN7WebCore23createFragmentFromNodesEPNS_8DocumentERKN3WTF6VectorIPNS_4NodeELm0EEE
    654654__ZN7WebCore23dataForURLComponentTypeEP5NSURLl

  • trunk/Source/WebCore/loader/ResourceLoader.cpp

    r140218 r140921  
    486486void ResourceLoader::didReceiveAuthenticationChallenge(const AuthenticationChallenge& challenge)
    487487{
    488     ASSERT(!handle() || handle()->hasAuthenticationChallenge());
     488    ASSERT(handle()->hasAuthenticationChallenge());
    489489
    490490    // Protect this in this delegate method since the additional processing can do

  • trunk/Source/WebCore/platform/network/AuthenticationChallengeBase.cpp

    r135055 r140921  
    3333    : m_isNull(true)
    3434    , m_previousFailureCount(0)
    35     , m_identifier(0)
    3635{
    3736}
    … …  
    4847    , m_failureResponse(response)
    4948    , m_error(error)
    50     , m_identifier(0)
    5149{
    5250}

  • trunk/Source/WebCore/platform/network/AuthenticationChallengeBase.h

    r135055 r140921  
    4949    void nullify();
    5050   
    51     uint64_t identifier() const { return m_identifier; }
    52 
    5351    static bool compare(const AuthenticationChallenge& a, const AuthenticationChallenge& b);
    5452
    … …  
    6361    ResourceResponse m_failureResponse;
    6462    ResourceError m_error;
    65     uint64_t m_identifier;
    6663};
    6764

  • trunk/Source/WebCore/platform/network/cf/AuthenticationCF.cpp

    r140037 r140921  
    4444namespace WebCore {
    4545
    46 static uint64_t generateUniqueIdentifier()
    47 {
    48     static uint64_t uniqueIdentifier;
    49     return ++uniqueIdentifier;
    50 }
    51 
    5246AuthenticationChallenge::AuthenticationChallenge(const ProtectionSpace& protectionSpace,
    5347                                                 const Credential& proposedCredential,
    5448                                                 unsigned previousFailureCount,
    5549                                                 const ResourceResponse& response,
    56                                                  const ResourceError& error,
    57                                                  uint64_t identifier)
     50                                                 const ResourceError& error)
    5851    : AuthenticationChallengeBase(protectionSpace,
    5952                                  proposedCredential,
    … …  
    6255                                  error)
    6356{
    64     m_identifier = identifier;
    6557}
    6658
    … …  
    7567    , m_cfChallenge(cfChallenge)
    7668{
    77     m_identifier = generateUniqueIdentifier();
    7869}
    7970

  • trunk/Source/WebCore/platform/network/cf/AuthenticationChallenge.h

    r140037 r140921  
    5050public:
    5151    AuthenticationChallenge() {}
    52     AuthenticationChallenge(const ProtectionSpace&, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse&, const ResourceError&, uint64_t identifier);
     52    AuthenticationChallenge(const ProtectionSpace&, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse&, const ResourceError&);
    5353#if USE(CFNETWORK)
    5454    AuthenticationChallenge(CFURLAuthChallengeRef, AuthenticationClient*);

  • trunk/Source/WebCore/platform/network/curl/AuthenticationChallenge.h

    r135317 r140921  
    3838    }
    3939
    40     AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error, uint64_t identifier)
     40    AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error)
    4141        : AuthenticationChallengeBase(protectionSpace, proposedCredential, previousFailureCount, response, error)
    4242    {
    43         m_identifier = identifier;
    4443    }
    4544

  • trunk/Source/WebCore/platform/network/mac/AuthenticationMac.mm

    r140037 r140921  
    171171#endif
    172172
    173 static uint64_t generateUniqueIdentifier()
    174 {
    175     static uint64_t uniqueIdentifier;
    176     return ++uniqueIdentifier;
    177 }
    178 
    179173AuthenticationChallenge::AuthenticationChallenge(const ProtectionSpace& protectionSpace,
    180174                                                 const Credential& proposedCredential,
    181175                                                 unsigned previousFailureCount,
    182176                                                 const ResourceResponse& response,
    183                                                  const ResourceError& error,
    184                                                  uint64_t identifier)
     177                                                 const ResourceError& error)
    185178    : AuthenticationChallengeBase(protectionSpace,
    186179                                  proposedCredential,
    … …  
    189182                                  error)
    190183{
    191     m_identifier = identifier;
    192184}
    193185
    … …  
    201193    , m_nsChallenge(challenge)
    202194{
    203     m_identifier = generateUniqueIdentifier();
    204195}
    205196

  • trunk/Source/WebCore/platform/network/qt/AuthenticationChallenge.h

    r135055 r140921  
    3838    }
    3939
    40     AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error, uint64_t identifier)
     40    AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error)
    4141        : AuthenticationChallengeBase(protectionSpace, proposedCredential, previousFailureCount, response, error)
    4242    {
    43         m_identifier = identifier;
    4443    }
    4544

  • trunk/Source/WebCore/platform/network/soup/AuthenticationChallenge.h

    r135055 r140921  
    4040    }
    4141
    42     AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error, uint64_t identifier)
     42    AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error)
    4343        : AuthenticationChallengeBase(protectionSpace, proposedCredential, previousFailureCount, response, error)
    4444    {
    45         m_identifier = identifier;
    4645    }
    4746

  • trunk/Source/WebCore/platform/network/win/AuthenticationChallenge.h

    r135055 r140921  
    3636    }
    3737
    38     AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error, uint64_t identifier)
     38    AuthenticationChallenge(const ProtectionSpace& protectionSpace, const Credential& proposedCredential, unsigned previousFailureCount, const ResourceResponse& response, const ResourceError& error)
    3939        : AuthenticationChallengeBase(protectionSpace, proposedCredential, previousFailureCount, response, error)
    4040    {
    41         m_identifier = identifier;
    4241    }
    4342};

  • trunk/Source/WebKit/win/ChangeLog

    r140718 r140921  
     12013-01-26  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Remove code for handling NetworkProcess authentication challenges in WebProcess
     4        https://bugs.webkit.org/show_bug.cgi?id=108003
     5
     6        Reviewed by Sam Weinig.
     7
     8        * WebURLAuthenticationChallenge.cpp:
     9        (WebURLAuthenticationChallenge::initWithProtectionSpace):
     10        Adapted for new AuthenticationChallenge constructor signature.
     11
    1122013-01-24  Mark Hahnenberg  <mhahnenberg@apple.com>
    213

  • trunk/Source/WebKit/win/WebURLAuthenticationChallenge.cpp

    r135055 r140921  
    149149#if USE(CFNETWORK)
    150150    m_authenticationChallenge = AuthenticationChallenge(webSpace->protectionSpace(), webCredential->credential(),
    151                                     previousFailureCount, webResponse->resourceResponse(), webError->resourceError(), 0);
     151                                    previousFailureCount, webResponse->resourceResponse(), webError->resourceError());
    152152#endif
    153153    return S_OK;

  • trunk/Source/WebKit2/ChangeLog

    r140920 r140921  
     12013-01-26  Alexey Proskuryakov  <ap@apple.com>
     2
     3        Remove code for handling NetworkProcess authentication challenges in WebProcess
     4        https://bugs.webkit.org/show_bug.cgi?id=108003
     5
     6        Reviewed by Sam Weinig.
     7
     8        * DerivedSources.make:
     9        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     10        (WebKit::NetworkConnectionToWebProcess::didReceiveMessage):
     11        * WebKit2.xcodeproj/project.pbxproj:
     12        * NetworkProcess/NetworkResourceLoader.messages.in: Removed. We no longer have
     13        an messages to NetworkResourceLoader.
     14
     15        * Shared/WebCoreArgumentCoders.cpp:
     16        (CoreIPC::::encode):
     17        (CoreIPC::::decode):
     18        There is no longer an identifier inside AuthenticationChallenge.
     19
     20        * NetworkProcess/NetworkResourceLoader.cpp:
     21        (WebKit::NetworkResourceLoader::didReceiveAuthenticationChallenge):
     22        (WebKit::NetworkResourceLoader::didCancelAuthenticationChallenge):
     23        * NetworkProcess/NetworkResourceLoader.h:
     24        Removed code for receiving authentication responses from WebProcess. Removed
     25        m_currentAuthenticationChallenge - AuthenticationMAnager now keeps track of that.
     26
     27        * WebProcess/Network/WebResourceLoader.cpp:
     28        * WebProcess/Network/WebResourceLoader.h:
     29        * WebProcess/Network/WebResourceLoader.messages.in:
     30        Removed code for handling authentication challenges. They are now sent directly to
     31        UI Process. The only thing WebProcess still does is decide whether is can authenticate
     32        against a particular authentication space.
     33
    1342013-01-26  Sam Weinig  <sam@webkit.org>
    235

  • trunk/Source/WebKit2/DerivedSources.make

    r140762 r140921  
    8181    WebConnection \
    8282    NetworkConnectionToWebProcess \
    83     NetworkResourceLoader \
    8483    RemoteLayerTreeHost \
    8584    SecItemShim \

  • trunk/Source/WebKit2/NetworkProcess/NetworkConnectionToWebProcess.cpp

    r140852 r140921  
    6767    }
    6868   
    69     if (messageID.is<CoreIPC::MessageClassNetworkResourceLoader>()) {
    70         NetworkResourceLoader* loader = m_networkResourceLoaders.get(decoder.destinationID()).get();
    71         if (loader)
    72             loader->didReceiveNetworkResourceLoaderMessage(connection, messageID, decoder);
    73         return;
    74     }
    7569    ASSERT_NOT_REACHED();
    7670}

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

    r140874 r140921  
    229229void NetworkResourceLoader::didReceiveAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge)
    230230{
    231     ASSERT(!m_currentAuthenticationChallenge);
    232     m_currentAuthenticationChallenge = adoptPtr(new AuthenticationChallenge(challenge));
    233 
    234     NetworkProcess::shared().authenticationManager().didReceiveAuthenticationChallenge(webPageID(), webFrameID(), *m_currentAuthenticationChallenge);
     231    NetworkProcess::shared().authenticationManager().didReceiveAuthenticationChallenge(webPageID(), webFrameID(), challenge);
    235232}
    236233
    237234void NetworkResourceLoader::didCancelAuthenticationChallenge(ResourceHandle*, const AuthenticationChallenge& challenge)
    238235{
    239     ASSERT(m_currentAuthenticationChallenge);
    240     ASSERT(m_currentAuthenticationChallenge->identifier() == challenge.identifier());
    241 
    242     send(Messages::WebResourceLoader::DidCancelAuthenticationChallenge(*m_currentAuthenticationChallenge));
    243 
    244     m_currentAuthenticationChallenge.clear();
    245 }
    246 
    247 void NetworkResourceLoader::receivedCancellation(ResourceHandle*, const AuthenticationChallenge& challenge)
    248 {
    249     receivedAuthenticationCancellation(challenge);
    250 }
    251 
    252 void NetworkResourceLoader::receivedAuthenticationCredential(const AuthenticationChallenge& challenge, const Credential& credential)
    253 {
    254     ASSERT(m_currentAuthenticationChallenge);
    255     ASSERT(m_currentAuthenticationChallenge->authenticationClient());
    256 
    257     if (m_currentAuthenticationChallenge->identifier() != challenge.identifier())
    258         return;
    259    
    260     m_currentAuthenticationChallenge->authenticationClient()->receivedCredential(*m_currentAuthenticationChallenge, credential);
    261     m_currentAuthenticationChallenge.clear();
    262 }
    263 
    264 void NetworkResourceLoader::receivedRequestToContinueWithoutAuthenticationCredential(const AuthenticationChallenge& challenge)
    265 {
    266     ASSERT(m_currentAuthenticationChallenge);
    267     ASSERT(m_currentAuthenticationChallenge->authenticationClient());
    268 
    269     if (m_currentAuthenticationChallenge->identifier() != challenge.identifier())
    270         return;
    271 
    272     m_currentAuthenticationChallenge->authenticationClient()->receivedRequestToContinueWithoutCredential(*m_currentAuthenticationChallenge);
    273     m_currentAuthenticationChallenge.clear();
    274 }
    275 
    276 void NetworkResourceLoader::receivedAuthenticationCancellation(const AuthenticationChallenge& challenge)
    277 {
    278     ASSERT(m_currentAuthenticationChallenge);
    279     ASSERT(m_currentAuthenticationChallenge->authenticationClient());
    280 
    281     if (m_currentAuthenticationChallenge->identifier() != challenge.identifier())
    282         return;
    283 
    284     m_handle->cancel();
    285     m_currentAuthenticationChallenge.clear();
    286 
    287     send(Messages::WebResourceLoader::CancelResourceLoader());
    288     scheduleStopOnMainThread();
     236    // FIXME (NetworkProcess): Tell AuthenticationManager.
    289237}
    290238

  • trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.h

    r140572 r140921  
    3232#include "NetworkConnectionToWebProcess.h"
    3333#include "SchedulableLoader.h"
    34 #include <WebCore/AuthenticationChallenge.h>
    3534#include <WebCore/ResourceHandleClient.h>
    3635#include <WebCore/ResourceLoaderOptions.h>
    … …  
    5958    uint64_t destinationID() const;
    6059   
    61     void didReceiveNetworkResourceLoaderMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    62 
    6360    virtual void start();
    6461       
    … …  
    7673    virtual void didReceiveAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
    7774    virtual void didCancelAuthenticationChallenge(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
    78     virtual void receivedCancellation(WebCore::ResourceHandle*, const WebCore::AuthenticationChallenge&) OVERRIDE;
    7975
    8076#if USE(PROTECTION_SPACE_AUTH_CALLBACK)
    … …  
    10399    NetworkResourceLoader(const NetworkResourceLoadParameters&, NetworkConnectionToWebProcess*);
    104100
    105     void receivedAuthenticationCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
    106     void receivedRequestToContinueWithoutAuthenticationCredential(const WebCore::AuthenticationChallenge&);
    107     void receivedAuthenticationCancellation(const WebCore::AuthenticationChallenge&);
    108    
    109101    void scheduleStopOnMainThread();
    110102    static void performStops(void*);
    … …  
    114106    RefPtr<RemoteNetworkingContext> m_networkingContext;
    115107    RefPtr<WebCore::ResourceHandle> m_handle;   
    116    
    117     OwnPtr<WebCore::AuthenticationChallenge> m_currentAuthenticationChallenge;
    118108};
    119109

  • trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.cpp

    r137825 r140921  
    197197void ArgumentCoder<AuthenticationChallenge>::encode(ArgumentEncoder& encoder, const AuthenticationChallenge& challenge)
    198198{
    199     encoder << challenge.protectionSpace() << challenge.proposedCredential() << challenge.previousFailureCount() << challenge.failureResponse() << challenge.error() << challenge.identifier();
     199    encoder << challenge.protectionSpace() << challenge.proposedCredential() << challenge.previousFailureCount() << challenge.failureResponse() << challenge.error();
    200200}
    201201
    … …  
    222222        return false;
    223223   
    224     uint64_t identifier;
    225     if (!decoder->decode(identifier))
    226         return false;
    227    
    228     challenge = AuthenticationChallenge(protectionSpace, proposedCredential, previousFailureCount, failureResponse, error, identifier);
     224    challenge = AuthenticationChallenge(protectionSpace, proposedCredential, previousFailureCount, failureResponse, error);
    229225    return true;
    230226}

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

    r140919 r140921  
    449449                5163199516289A6300E22F00 /* NetworkProcessMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 51ACC9351628064800342550 /* NetworkProcessMessages.h */; };
    450450                516A4A5D120A2CCD00C05B7F /* WebError.h in Headers */ = {isa = PBXBuildFile; fileRef = 516A4A5B120A2CCD00C05B7F /* WebError.h */; };
    451                 5175944A1657080400DD771D /* NetworkResourceLoaderMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 517594481657080400DD771D /* NetworkResourceLoaderMessageReceiver.cpp */; };
    452                 5175944B1657080400DD771D /* NetworkResourceLoaderMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 517594491657080400DD771D /* NetworkResourceLoaderMessages.h */; };
    453451                51795567162876CB00FA43B6 /* NetworkProcessMac.mm in Sources */ = {isa = PBXBuildFile; fileRef = 51A8A6151627F3F9000D90E9 /* NetworkProcessMac.mm */; };
    454452                51795568162876CF00FA43B6 /* NetworkProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 510CC7DF16138E2900D03ED3 /* NetworkProcess.cpp */; };
    … …  
    17151713                5153569A1291B1D2000749DC /* WebPageContextMenuClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPageContextMenuClient.cpp; sourceTree = "<group>"; };
    17161714                5153569B1291B1D2000749DC /* WebPageContextMenuClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPageContextMenuClient.h; sourceTree = "<group>"; };
    1717                 515705521657018C00101A90 /* NetworkResourceLoader.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = NetworkResourceLoader.messages.in; path = NetworkProcess/NetworkResourceLoader.messages.in; sourceTree = "<group>"; };
    17181715                51578B821209ECEF00A37C4A /* WebData.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebData.h; sourceTree = "<group>"; };
    17191716                5160BFE013381DF900918999 /* Logging.mac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = Logging.mac.mm; sourceTree = "<group>"; };
    17201717                516319911628980A00E22F00 /* NetworkProcessProxyMac.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = NetworkProcessProxyMac.mm; path = mac/NetworkProcessProxyMac.mm; sourceTree = "<group>"; };
    17211718                516A4A5B120A2CCD00C05B7F /* WebError.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebError.h; sourceTree = "<group>"; };
    1722                 517594481657080400DD771D /* NetworkResourceLoaderMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkResourceLoaderMessageReceiver.cpp; sourceTree = "<group>"; };
    1723                 517594491657080400DD771D /* NetworkResourceLoaderMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkResourceLoaderMessages.h; sourceTree = "<group>"; };
    17241719                517A33B3130B308C00F80CB5 /* WKApplicationCacheManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WKApplicationCacheManager.cpp; sourceTree = "<group>"; };
    17251720                517A33B4130B308C00F80CB5 /* WKApplicationCacheManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKApplicationCacheManager.h; sourceTree = "<group>"; };
    … …  
    31763171                                51FD18B31651FBAD00DBE1CE /* NetworkResourceLoader.cpp */,
    31773172                                51FD18B41651FBAD00DBE1CE /* NetworkResourceLoader.h */,
    3178                                 515705521657018C00101A90 /* NetworkResourceLoader.messages.in */,
    31793173                                51829DA31637C70C000953D6 /* NetworkResourceLoadScheduler.cpp */,
    31803174                                51829DA41637C70C000953D6 /* NetworkResourceLoadScheduler.h */,
    … …  
    43914385                                513A163A163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp */,
    43924386                                513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */,
    4393                                 517594481657080400DD771D /* NetworkResourceLoaderMessageReceiver.cpp */,
    4394                                 517594491657080400DD771D /* NetworkResourceLoaderMessages.h */,
    43954387                                1A2D8437127F65D5001EB962 /* NPObjectMessageReceiverMessageReceiver.cpp */,
    43964388                                1A2D8438127F65D5001EB962 /* NPObjectMessageReceiverMessages.h */,
    … …  
    47304722                                BCF4DE23168E4BD500C94AFC /* NetworkProcessSupplement.h in Headers */,
    47314723                                51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */,
    4732                                 5175944B1657080400DD771D /* NetworkResourceLoaderMessages.h in Headers */,
    47334724                                51CBBA10165219B6005BE8FD /* NetworkResourceLoadParameters.h in Headers */,
    47344725                                51829DA61637C70C000953D6 /* NetworkResourceLoadScheduler.h in Headers */,
    … …  
    57105701                                513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
    57115702                                51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
    5712                                 5175944A1657080400DD771D /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
    57135703                                51CBBA0F165219B6005BE8FD /* NetworkResourceLoadParameters.cpp in Sources */,
    57145704                                51829DA51637C70C000953D6 /* NetworkResourceLoadScheduler.cpp in Sources */,

  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.cpp

    r140572 r140921  
    3131#include "DataReference.h"
    3232#include "Logging.h"
    33 #include "NetworkConnectionToWebProcessMessages.h"
    3433#include "NetworkProcessConnection.h"
    35 #include "NetworkResourceLoaderMessages.h"
    3634#include "PlatformCertificateInfo.h"
    3735#include "WebCoreArgumentCoders.h"
    3836#include "WebErrors.h"
    3937#include "WebProcess.h"
    40 #include <WebCore/AuthenticationChallenge.h>
     38#include <WebCore/ResourceError.h>
    4139#include <WebCore/ResourceLoader.h>
    4240
    … …  
    131129}
    132130
    133 void WebResourceLoader::didReceiveAuthenticationChallenge(const AuthenticationChallenge& challenge)
    134 {
    135     LOG(Network, "(WebProcess) WebResourceLoader::didReceiveAuthenticationChallenge for '%s'", m_coreLoader->url().string().utf8().data());
    136 
    137     m_currentAuthenticationChallenge = adoptPtr(new AuthenticationChallenge(challenge));
    138     m_currentAuthenticationChallenge->setAuthenticationClient(this);
    139 
    140     m_coreLoader->didReceiveAuthenticationChallenge(*m_currentAuthenticationChallenge);
    141 }
    142 
    143 void WebResourceLoader::didCancelAuthenticationChallenge(const AuthenticationChallenge& challenge)
    144 {
    145     if (m_currentAuthenticationChallenge->identifier() != challenge.identifier())
    146         return;
    147 
    148     LOG(Network, "(WebProcess) WebResourceLoader::didCancelAuthenticationChallenge for '%s'", m_coreLoader->url().string().utf8().data());
    149 
    150     m_coreLoader->didCancelAuthenticationChallenge(*m_currentAuthenticationChallenge);
    151     m_currentAuthenticationChallenge.clear();
    152 }
    153 
    154 // WebCore::AuthenticationClient
    155 void WebResourceLoader::receivedCredential(const AuthenticationChallenge& challenge, const Credential& credential)
    156 {
    157     ASSERT(m_currentAuthenticationChallenge && challenge == *m_currentAuthenticationChallenge);
    158     send(Messages::NetworkResourceLoader::ReceivedAuthenticationCredential(challenge, credential));
    159 
    160     m_currentAuthenticationChallenge.clear();
    161 }
    162 
    163 void WebResourceLoader::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge& challenge)
    164 {
    165     ASSERT(m_currentAuthenticationChallenge && challenge == *m_currentAuthenticationChallenge);
    166     send(Messages::NetworkResourceLoader::ReceivedRequestToContinueWithoutAuthenticationCredential(challenge));
    167 
    168     m_currentAuthenticationChallenge.clear();
    169 }
    170 
    171 void WebResourceLoader::receivedCancellation(const AuthenticationChallenge& challenge)
    172 {
    173     ASSERT(m_currentAuthenticationChallenge && challenge == *m_currentAuthenticationChallenge);
    174     send(Messages::NetworkResourceLoader::ReceivedAuthenticationCancellation(challenge));
    175 
    176     m_currentAuthenticationChallenge.clear();
    177 }
    178 
    179131void WebResourceLoader::networkProcessCrashed()
    180132{

  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.h

    r140572 r140921  
    3232#include "MessageSender.h"
    3333#include "ShareableResource.h"
    34 #include <WebCore/AuthenticationClient.h>
    3534#include <wtf/PassRefPtr.h>
    3635#include <wtf/RefCounted.h>
    … …  
    4241
    4342namespace WebCore {
    44 class AuthenticationChallenge;
    4543class ProtectionSpace;
    4644class ResourceBuffer;
    … …  
    5654typedef uint64_t ResourceLoadIdentifier;
    5755
    58 class WebResourceLoader : public RefCounted<WebResourceLoader>, public CoreIPC::MessageSender<WebResourceLoader>, public WebCore::AuthenticationClient {
     56class WebResourceLoader : public RefCounted<WebResourceLoader>, public CoreIPC::MessageSender<WebResourceLoader> {
    5957public:
    6058    static PassRefPtr<WebResourceLoader> create(PassRefPtr<WebCore::ResourceLoader>);
    … …  
    6866    void didReceiveWebResourceLoaderMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&);
    6967    void didReceiveSyncWebResourceLoaderMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::MessageDecoder&, OwnPtr<CoreIPC::MessageEncoder>&);
    70 
    71     using RefCounted<WebResourceLoader>::ref;
    72     using RefCounted<WebResourceLoader>::deref;
    73 
    74     virtual void receivedCredential(const WebCore::AuthenticationChallenge&, const WebCore::Credential&);
    75     virtual void receivedRequestToContinueWithoutCredential(const WebCore::AuthenticationChallenge&);
    76     virtual void receivedCancellation(const WebCore::AuthenticationChallenge&);
    7768
    7869    void networkProcessCrashed();
    … …  
    9182
    9283    void canAuthenticateAgainstProtectionSpace(const WebCore::ProtectionSpace&, bool& result);
    93     void didReceiveAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
    94     void didCancelAuthenticationChallenge(const WebCore::AuthenticationChallenge&);
    95 
    96     virtual void refAuthenticationClient() { ref(); }
    97     virtual void derefAuthenticationClient() { deref(); }
    9884
    9985    RefPtr<WebCore::ResourceLoader> m_coreLoader;
    100     OwnPtr<WebCore::AuthenticationChallenge> m_currentAuthenticationChallenge;
    10186};
    10287

  • trunk/Source/WebKit2/WebProcess/Network/WebResourceLoader.messages.in

    r140605 r140921  
    3333   
    3434    CanAuthenticateAgainstProtectionSpace(WebCore::ProtectionSpace protectionSpace) -> (bool response)
    35     DidReceiveAuthenticationChallenge(WebCore::AuthenticationChallenge challenge)
    36     DidCancelAuthenticationChallenge(WebCore::AuthenticationChallenge challenge)
    3735
    3836    // DidReceiveResource is for when we have the entire resource data available at once, such as when the resource is cached in memory
Note: See TracChangeset for help on using the changeset viewer.