ChangeLog

112016-06-14 Chris Dumez <cdumez@apple.com>

22

        Avoid constructing a AuthenticationChallenge unnecessarily in the NetworkLoad constructor

        https://bugs.webkit.org/show_bug.cgi?id=158746

        Reviewed by NOBODY (OOPS!).

        Avoid constructing a AuthenticationChallenge unnecessarily in the

        NetworkLoad constructor by using WTF::Optional<> for this data

        member.

        * NetworkProcess/NetworkLoad.cpp:

        (WebKit::NetworkLoad::continueCanAuthenticateAgainstProtectionSpace):

        * NetworkProcess/NetworkLoad.h:

2016-06-14  Chris Dumez  <cdumez@apple.com>

        Reduce copying of NetworkLoadParameters

        https://bugs.webkit.org/show_bug.cgi?id=158744

Source/WebKit2/NetworkProcess/NetworkLoad.cpp

@@void NetworkLoad::continueCanAuthenticateAgainstProtectionSpace(bool result)

    ASSERT(m_challengeCompletionHandler);

    auto completionHandler = std::exchange(m_challengeCompletionHandler, nullptr);

    if (!result) {

362 if (m_task && m_task->allowsSpecificHTTPSCertificateForHost(m_challenge))

363 completionHandler(AuthenticationChallengeDisposition::UseCredential, serverTrustCredential(m_challenge));

362 if (m_task && m_task->allowsSpecificHTTPSCertificateForHost(*m_challenge))

363 completionHandler(AuthenticationChallengeDisposition::UseCredential, serverTrustCredential(*m_challenge));

        else

            completionHandler(AuthenticationChallengeDisposition::RejectProtectionSpace, { });

        return;

    }

369 if (m_challenge.protectionSpace().authenticationScheme() == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {

370 completionHandler(AuthenticationChallengeDisposition::UseCredential, serverTrustCredential(m_challenge));

369 if (m_challenge->protectionSpace().authenticationScheme() == ProtectionSpaceAuthenticationSchemeServerTrustEvaluationRequested) {

370 completionHandler(AuthenticationChallengeDisposition::UseCredential, serverTrustCredential(*m_challenge));

        return;

    }

@@void NetworkLoad::continueCanAuthenticateAgainstProtectionSpace(bool result)

    
    if (m_task) {

        if (auto* pendingDownload = m_task->pendingDownload())

381 NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, m_challenge, completionHandler);

381 NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(*pendingDownload, *m_challenge, completionHandler);

382382 else

383 NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, m_challenge, completionHandler);

383 NetworkProcess::singleton().authenticationManager().didReceiveAuthenticationChallenge(m_parameters.webPageID, m_parameters.webFrameID, *m_challenge, completionHandler);

    }

#endif

    if (m_handle)

Source/WebKit2/NetworkProcess/NetworkLoad.h

#include "NetworkLoadParameters.h"

#include "RemoteNetworkingContext.h"

#include <WebCore/ResourceHandleClient.h>

33#include <wtf/Optional.h>

#if USE(NETWORK_SESSION)

#include "DownloadID.h"

@@private:

    const NetworkLoadParameters m_parameters;

#if USE(NETWORK_SESSION)

    RefPtr<NetworkDataTask> m_task;

126 WebCore::AuthenticationChallenge m_challenge;

127 Optional<WebCore::AuthenticationChallenge> m_challenge;

    ChallengeCompletionHandler m_challengeCompletionHandler;

    ResponseCompletionHandler m_responseCompletionHandler;

    RedirectCompletionHandler m_redirectCompletionHandler;