Changeset 252818 in webkit


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

Unreviewed, rolling out r252798.

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

Reverted changeset:

"Revert r250421"
​https://bugs.webkit.org/show_bug.cgi?id=202290
​https://trac.webkit.org/changeset/252798

Location:
trunk/Source/WebKit
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

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

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

    r252798 r252818  
    4242    encoder.encodeEnum(cacheModel);
    4343    encoder << canHandleHTTPSServerTrustEvaluation;
    44 #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    45     encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
    46 #endif
    4744#if PLATFORM(MAC)
    4845    encoder << uiProcessCookieStorageIdentifier;
    … …  
    9693        return false;
    9794
    98 #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    99     if (!decoder.decode(result.shouldEnableNetworkCacheSpeculativeRevalidation))
    100         return false;
    101 #endif
    102 
    10395#if PLATFORM(MAC)
    10496    if (!decoder.decode(result.uiProcessCookieStorageIdentifier))

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

    r252798 r252818  
    5858    Vector<uint8_t> uiProcessCookieStorageIdentifier;
    5959#endif
    60 #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    61     bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
    62 #endif
    6360#if PLATFORM(IOS_FAMILY)
    6461    SandboxExtension::Handle cookieStorageDirectoryExtensionHandle;

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

    r252798 r252818  
    116116    m_cacheOptions = { NetworkCache::CacheOption::RegisterNotify };
    117117
    118 #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    119     if (parameters.shouldEnableNetworkCacheSpeculativeRevalidation)
    120         m_cacheOptions.add(NetworkCache::CacheOption::SpeculativeRevalidation);
    121 #endif
    122 
    123118    // Disable NSURLCache.
    124119    auto urlCache(adoptNS([[NSURLCache alloc] initWithMemoryCapacity:0 diskCapacity:0 diskPath:nil]));

  • trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.cpp

    r252798 r252818  
    4545    auto copy = this->create();
    4646
    47     copy->m_diskCacheSpeculativeValidationEnabled = this->m_diskCacheSpeculativeValidationEnabled;
    4847    copy->m_injectedBundlePath = this->m_injectedBundlePath;
    4948    copy->m_customClassesForParameterCoder = this->m_customClassesForParameterCoder;

  • trunk/Source/WebKit/UIProcess/API/APIProcessPoolConfiguration.h

    r252798 r252818  
    6868    bool clientWouldBenefitFromAutomaticProcessPrewarming() const { return m_clientWouldBenefitFromAutomaticProcessPrewarming; }
    6969    void setClientWouldBenefitFromAutomaticProcessPrewarming(bool value) { m_clientWouldBenefitFromAutomaticProcessPrewarming = value; }
    70 
    71     bool diskCacheSpeculativeValidationEnabled() const { return m_diskCacheSpeculativeValidationEnabled; }
    72     void setDiskCacheSpeculativeValidationEnabled(bool enabled) { m_diskCacheSpeculativeValidationEnabled = enabled; }
    7370
    7471    void setUsesBackForwardCache(bool value) { m_usesBackForwardCache = value; }
    … …  
    152149
    153150private:
    154     bool m_diskCacheSpeculativeValidationEnabled { false };
    155151    WTF::String m_injectedBundlePath;
    156152    Vector<WTF::String> m_customClassesForParameterCoder;

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

    r252798 r252818  
    420420}
    421421
    422 void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef contextRef, bool value)
    423 {
    424     WebKit::toImpl(contextRef)->configuration().setDiskCacheSpeculativeValidationEnabled(value);
     422void WKContextSetDiskCacheSpeculativeValidationEnabled(WKContextRef, bool)
     423{
    425424}
    426425

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

    r252798 r252818  
    110110- (BOOL)diskCacheSpeculativeValidationEnabled
    111111{
    112     return _processPoolConfiguration->diskCacheSpeculativeValidationEnabled();
     112    return NO;
    113113}
    114114
    115115- (void)setDiskCacheSpeculativeValidationEnabled:(BOOL)enabled
    116116{
    117     _processPoolConfiguration->setDiskCacheSpeculativeValidationEnabled(enabled);
    118117}
    119118

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

    r252805 r252818  
    499499        parameters.urlSchemesRegisteredForCustomProtocols.append(scheme);
    500500
    501 #if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    502     parameters.shouldEnableNetworkCacheSpeculativeRevalidation = m_configuration->diskCacheSpeculativeValidationEnabled();
    503 #endif
    504 
    505501#if PLATFORM(IOS_FAMILY)
    506502    String cookieStorageDirectory = WebProcessPool::cookieStorageDirectory();
Note: See TracChangeset for help on using the changeset viewer.