Changeset 252819 in webkit


Ignore:
Timestamp:
Nov 22, 2019 5:13:18 PM (4 years ago)
Author:
achristensen@apple.com
Message:

Unreviewed, rolling out r252796.

Turns out my reverting earlier today wasn't so necessary after all.
This is effectively re-landing r250422.

Reverted changeset:

"Revert r250422"
​https://bugs.webkit.org/show_bug.cgi?id=202285
​https://trac.webkit.org/changeset/252796

Location:
trunk/Source/WebKit
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r252818 r252819  
     12019-11-22  Alex Christensen  <achristensen@webkit.org>
     2
     3        Unreviewed, rolling out r252796.
     4
     5        Turns out my reverting earlier today wasn't so necessary after all.
     6        This is effectively re-landing r250422.
     7
     8        Reverted changeset:
     9
     10        "Revert r250422"
     11        https://bugs.webkit.org/show_bug.cgi?id=202285
     12        https://trac.webkit.org/changeset/252796
     13
    1142019-11-22  Alex Christensen  <achristensen@webkit.org>
    215

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

    r252805 r252819  
    307307    setCacheModel(parameters.cacheModel, parameters.defaultDataStoreParameters.networkSessionParameters.networkCacheDirectory);
    308308
    309     setCanHandleHTTPSServerTrustEvaluation(parameters.canHandleHTTPSServerTrustEvaluation);
    310 
    311309#if ENABLE(RESOURCE_LOAD_STATISTICS)
    312310    m_isITPDatabaseEnabled = parameters.shouldEnableITPDatabase;
    … …  
    22022200}
    22032201
    2204 void NetworkProcess::setCanHandleHTTPSServerTrustEvaluation(bool value)
    2205 {
    2206     m_canHandleHTTPSServerTrustEvaluation = value;
    2207 }
    2208 
    22092202void NetworkProcess::didSyncAllCookies()
    22102203{

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

    r252805 r252819  
    174174    void ensureSession(const PAL::SessionID&, bool shouldUseTestingNetworkSession, const String& identifier);
    175175#endif
    176 
    177     bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
    178176
    179177    void processWillSuspendImminentlyForTestingSync(CompletionHandler<void()>&&);
    … …  
    413411    void setCacheModelSynchronouslyForTesting(CacheModel, CompletionHandler<void()>&&);
    414412    void allowSpecificHTTPSCertificateForHost(const WebCore::CertificateInfo&, const String& host);
    415     void setCanHandleHTTPSServerTrustEvaluation(bool);
    416413    void clearCacheForAllOrigins(uint32_t cachesToClear);
    417414    void setAllowsAnySSLCertificateForWebSocket(bool, CompletionHandler<void()>&&);
    … …  
    512509    CacheModel m_cacheModel { CacheModel::DocumentViewer };
    513510    bool m_suppressMemoryPressureHandler { false };
    514     bool m_canHandleHTTPSServerTrustEvaluation { true };
    515511    String m_uiProcessBundleIdentifier;
    516512    DownloadManager m_downloadManager;

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

    r252805 r252819  
    6868
    6969    AllowSpecificHTTPSCertificateForHost(WebCore::CertificateInfo certificate, String host)
    70     SetCanHandleHTTPSServerTrustEvaluation(bool value)
    7170   
    7271    ClearCacheForAllOrigins(uint32_t cachesToClear)

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

    r252818 r252819  
    4141{
    4242    encoder.encodeEnum(cacheModel);
    43     encoder << canHandleHTTPSServerTrustEvaluation;
    4443#if PLATFORM(MAC)
    4544    encoder << uiProcessCookieStorageIdentifier;
    … …  
    8887{
    8988    if (!decoder.decodeEnum(result.cacheModel))
    90         return false;
    91 
    92     if (!decoder.decode(result.canHandleHTTPSServerTrustEvaluation))
    9389        return false;
    9490

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

    r252818 r252819  
    5353
    5454    CacheModel cacheModel { CacheModel::DocumentViewer };
    55     bool canHandleHTTPSServerTrustEvaluation { true };
    5655
    5756#if PLATFORM(MAC)

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

    r252796 r252819  
    643643
    644644        // Handle server trust evaluation at platform-level if requested, for performance reasons and to use ATS defaults.
    645         if (!_session->networkProcess().canHandleHTTPSServerTrustEvaluation() || sessionCocoa->fastServerTrustEvaluationEnabled()) {
     645        if (sessionCocoa->fastServerTrustEvaluationEnabled()) {
    646646#if HAVE(CFNETWORK_NSURLSESSION_STRICTRUSTEVALUATE)
    647647            auto* networkDataTask = [self existingTask:task];

  • trunk/Source/WebKit/UIProcess/API/C/WKContext.cpp

    r252818 r252819  
    382382void WKContextSetCanHandleHTTPSServerTrustEvaluation(WKContextRef contextRef, bool value)
    383383{
    384     WebKit::toImpl(contextRef)->setCanHandleHTTPSServerTrustEvaluation(value);
    385384}
    386385

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

    r252796 r252819  
    199199- (void)_setCanHandleHTTPSServerTrustEvaluation:(BOOL)value
    200200{
    201     _processPool->setCanHandleHTTPSServerTrustEvaluation(value);
    202201}
    203202

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

    r252818 r252819  
    494494
    495495    parameters.cacheModel = LegacyGlobalSettings::singleton().cacheModel();
    496     parameters.canHandleHTTPSServerTrustEvaluation = m_canHandleHTTPSServerTrustEvaluation;
    497496
    498497    for (auto& scheme : globalURLSchemesWithCustomProtocolHandlers())
    … …  
    14931492}
    14941493
    1495 void WebProcessPool::setCanHandleHTTPSServerTrustEvaluation(bool value)
    1496 {
    1497     m_canHandleHTTPSServerTrustEvaluation = value;
    1498     if (m_networkProcess) {
    1499         m_networkProcess->send(Messages::NetworkProcess::SetCanHandleHTTPSServerTrustEvaluation(value), 0);
    1500         return;
    1501     }
    1502 }
    1503 
    15041494void WebProcessPool::registerURLSchemeAsLocal(const String& urlScheme)
    15051495{

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

    r252796 r252819  
    270270    void setShouldUseFontSmoothing(bool);
    271271   
    272     void setCanHandleHTTPSServerTrustEvaluation(bool);
    273272    void registerURLSchemeAsEmptyDocument(const String&);
    274273    void registerURLSchemeAsSecure(const String&);
    … …  
    793792#endif
    794793    bool m_useSeparateServiceWorkerProcess { false };
    795     bool m_canHandleHTTPSServerTrustEvaluation { true };
    796794};
    797795
Note: See TracChangeset for help on using the changeset viewer.