Changeset 223179 in webkit


Ignore:
Timestamp:
Oct 11, 2017 8:53:21 AM (7 years ago)
Author:
don.olmstead@sony.com
Message:

Remove ENABLE_NETWORK_CACHE
​https://bugs.webkit.org/show_bug.cgi?id=177424

Reviewed by Antti Koivisto.

  • NetworkProcess/NetworkConnectionToWebProcess.cpp:

(WebKit::NetworkConnectionToWebProcess::storeDerivedDataToCache):

  • NetworkProcess/NetworkConnectionToWebProcess.h:
  • NetworkProcess/NetworkConnectionToWebProcess.messages.in:
  • NetworkProcess/NetworkProcess.cpp:

(WebKit::fetchDiskCacheEntries):
(WebKit::clearDiskCacheEntries):
(WebKit::NetworkProcess::setCacheModel):

  • NetworkProcess/NetworkProcess.h:

(WebKit::NetworkProcess::cache):

  • NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

  • NetworkProcess/NetworkProcessCreationParameters.h:
  • NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::NetworkResourceLoader):
(WebKit::NetworkResourceLoader::canUseCachedRedirect const):
(WebKit::NetworkResourceLoader::start):
(WebKit::NetworkResourceLoader::retrieveCacheEntry):
(WebKit::NetworkResourceLoader::startNetworkLoad):
(WebKit::NetworkResourceLoader::abort):
(WebKit::NetworkResourceLoader::didReceiveResponse):
(WebKit::NetworkResourceLoader::didReceiveBuffer):
(WebKit::NetworkResourceLoader::didFinishLoading):
(WebKit::NetworkResourceLoader::didFailLoading):
(WebKit::NetworkResourceLoader::willSendRedirectedRequest):
(WebKit::NetworkResourceLoader::continueWillSendRequest):
(WebKit::NetworkResourceLoader::dispatchWillSendRequestForCacheEntry):

  • NetworkProcess/NetworkResourceLoader.h:
  • NetworkProcess/cache/NetworkCache.cpp:
  • NetworkProcess/cache/NetworkCache.h:
  • NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
  • NetworkProcess/cache/NetworkCacheBlobStorage.h:
  • NetworkProcess/cache/NetworkCacheCoders.cpp:
  • NetworkProcess/cache/NetworkCacheCoders.h:
  • NetworkProcess/cache/NetworkCacheCodersCocoa.cpp:
  • NetworkProcess/cache/NetworkCacheCodersSoup.cpp:
  • NetworkProcess/cache/NetworkCacheData.cpp:
  • NetworkProcess/cache/NetworkCacheData.h:
  • NetworkProcess/cache/NetworkCacheDataCocoa.mm:
  • NetworkProcess/cache/NetworkCacheDataSoup.cpp:
  • NetworkProcess/cache/NetworkCacheEntry.cpp:
  • NetworkProcess/cache/NetworkCacheEntry.h:
  • NetworkProcess/cache/NetworkCacheFileSystem.cpp:
  • NetworkProcess/cache/NetworkCacheFileSystem.h:
  • NetworkProcess/cache/NetworkCacheIOChannel.h:
  • NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
  • NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
  • NetworkProcess/cache/NetworkCacheKey.cpp:
  • NetworkProcess/cache/NetworkCacheKey.h:
  • NetworkProcess/cache/NetworkCacheStatistics.cpp:
  • NetworkProcess/cache/NetworkCacheStatistics.h:
  • NetworkProcess/cache/NetworkCacheStorage.cpp:
  • NetworkProcess/cache/NetworkCacheStorage.h:
  • NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
(WebKit::NetworkProcess::clearDiskCache):

  • NetworkProcess/ios/NetworkProcessIOS.mm:

(WebKit::NetworkProcess::clearCacheForAllOrigins):

  • NetworkProcess/soup/NetworkProcessSoup.cpp:

(WebKit::NetworkProcess::platformInitializeNetworkProcess):
(WebKit::NetworkProcess::clearDiskCache):

  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::registerUserDefaultsIfNeeded):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):
(WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
(WebKit::WebProcessPool::isNetworkCacheEnabled):

  • UIProcess/soup/WebProcessPoolSoup.cpp:

(WebKit::WebProcessPool::platformInitializeNetworkProcess):

  • WebProcess/Network/WebLoaderStrategy.cpp:

(WebKit::WebLoaderStrategy::storeDerivedDataToCache):

  • config.h:
Location:
trunk/Source/WebKit
Files:
42 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r223174 r223179  
     12017-10-11  Don Olmstead  <don.olmstead@sony.com>
     2
     3        Remove ENABLE_NETWORK_CACHE
     4        https://bugs.webkit.org/show_bug.cgi?id=177424
     5
     6        Reviewed by Antti Koivisto.
     7
     8        * NetworkProcess/NetworkConnectionToWebProcess.cpp:
     9        (WebKit::NetworkConnectionToWebProcess::storeDerivedDataToCache):
     10        * NetworkProcess/NetworkConnectionToWebProcess.h:
     11        * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
     12        * NetworkProcess/NetworkProcess.cpp:
     13        (WebKit::fetchDiskCacheEntries):
     14        (WebKit::clearDiskCacheEntries):
     15        (WebKit::NetworkProcess::setCacheModel):
     16        * NetworkProcess/NetworkProcess.h:
     17        (WebKit::NetworkProcess::cache):
     18        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     19        (WebKit::NetworkProcessCreationParameters::encode const):
     20        (WebKit::NetworkProcessCreationParameters::decode):
     21        * NetworkProcess/NetworkProcessCreationParameters.h:
     22        * NetworkProcess/NetworkResourceLoader.cpp:
     23        (WebKit::NetworkResourceLoader::NetworkResourceLoader):
     24        (WebKit::NetworkResourceLoader::canUseCachedRedirect const):
     25        (WebKit::NetworkResourceLoader::start):
     26        (WebKit::NetworkResourceLoader::retrieveCacheEntry):
     27        (WebKit::NetworkResourceLoader::startNetworkLoad):
     28        (WebKit::NetworkResourceLoader::abort):
     29        (WebKit::NetworkResourceLoader::didReceiveResponse):
     30        (WebKit::NetworkResourceLoader::didReceiveBuffer):
     31        (WebKit::NetworkResourceLoader::didFinishLoading):
     32        (WebKit::NetworkResourceLoader::didFailLoading):
     33        (WebKit::NetworkResourceLoader::willSendRedirectedRequest):
     34        (WebKit::NetworkResourceLoader::continueWillSendRequest):
     35        (WebKit::NetworkResourceLoader::dispatchWillSendRequestForCacheEntry):
     36        * NetworkProcess/NetworkResourceLoader.h:
     37        * NetworkProcess/cache/NetworkCache.cpp:
     38        * NetworkProcess/cache/NetworkCache.h:
     39        * NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
     40        * NetworkProcess/cache/NetworkCacheBlobStorage.h:
     41        * NetworkProcess/cache/NetworkCacheCoders.cpp:
     42        * NetworkProcess/cache/NetworkCacheCoders.h:
     43        * NetworkProcess/cache/NetworkCacheCodersCocoa.cpp:
     44        * NetworkProcess/cache/NetworkCacheCodersSoup.cpp:
     45        * NetworkProcess/cache/NetworkCacheData.cpp:
     46        * NetworkProcess/cache/NetworkCacheData.h:
     47        * NetworkProcess/cache/NetworkCacheDataCocoa.mm:
     48        * NetworkProcess/cache/NetworkCacheDataSoup.cpp:
     49        * NetworkProcess/cache/NetworkCacheEntry.cpp:
     50        * NetworkProcess/cache/NetworkCacheEntry.h:
     51        * NetworkProcess/cache/NetworkCacheFileSystem.cpp:
     52        * NetworkProcess/cache/NetworkCacheFileSystem.h:
     53        * NetworkProcess/cache/NetworkCacheIOChannel.h:
     54        * NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm:
     55        * NetworkProcess/cache/NetworkCacheIOChannelSoup.cpp:
     56        * NetworkProcess/cache/NetworkCacheKey.cpp:
     57        * NetworkProcess/cache/NetworkCacheKey.h:
     58        * NetworkProcess/cache/NetworkCacheStatistics.cpp:
     59        * NetworkProcess/cache/NetworkCacheStatistics.h:
     60        * NetworkProcess/cache/NetworkCacheStorage.cpp:
     61        * NetworkProcess/cache/NetworkCacheStorage.h:
     62        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     63        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
     64        (WebKit::NetworkProcess::clearDiskCache):
     65        * NetworkProcess/ios/NetworkProcessIOS.mm:
     66        (WebKit::NetworkProcess::clearCacheForAllOrigins):
     67        * NetworkProcess/soup/NetworkProcessSoup.cpp:
     68        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
     69        (WebKit::NetworkProcess::clearDiskCache):
     70        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     71        (WebKit::registerUserDefaultsIfNeeded):
     72        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     73        (WebKit::WebProcessPool::legacyPlatformDefaultNetworkCacheDirectory):
     74        (WebKit::WebProcessPool::isNetworkCacheEnabled):
     75        * UIProcess/soup/WebProcessPoolSoup.cpp:
     76        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     77        * WebProcess/Network/WebLoaderStrategy.cpp:
     78        (WebKit::WebLoaderStrategy::storeDerivedDataToCache):
     79        * config.h:
     80
    1812017-10-11  Michael Catanzaro  <mcatanzaro@igalia.com>
    282

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

    r223149 r223179  
    455455}
    456456
    457 #if ENABLE(NETWORK_CACHE)
    458457void NetworkConnectionToWebProcess::storeDerivedDataToCache(const WebKit::NetworkCache::DataKey& dataKey, const IPC::DataReference& data)
    459458{
    … …  
    461460        cache->storeData(dataKey, data.data(), data.size());
    462461}
    463 #endif
    464462
    465463void NetworkConnectionToWebProcess::setCaptureExtraNetworkLoadMetricsEnabled(bool enabled)

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

    r222938 r223179  
    119119    void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, uint64_t requestIdentifier);
    120120
    121 #if ENABLE(NETWORK_CACHE)
    122121    void storeDerivedDataToCache(const WebKit::NetworkCache::DataKey&, const IPC::DataReference&);
    123 #endif
    124122
    125123    void setCaptureExtraNetworkLoadMetricsEnabled(bool);

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

    r222938 r223179  
    5151    WriteBlobsToTemporaryFiles(Vector<String> blobURLs, uint64_t requestIdentifier)
    5252
    53 #if ENABLE(NETWORK_CACHE)
    5453    StoreDerivedDataToCache(WebKit::NetworkCache::DataKey key, IPC::DataReference data)
    55 #endif
    5654
    5755    SetCaptureExtraNetworkLoadMetricsEnabled(bool enabled)

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

    r223073 r223179  
    7575#endif
    7676
    77 #if ENABLE(NETWORK_CACHE)
    7877#include "NetworkCache.h"
    7978#include "NetworkCacheCoders.h"
    80 #endif
    8179
    8280#if ENABLE(NETWORK_CAPTURE)
    … …  
    338336static void fetchDiskCacheEntries(PAL::SessionID sessionID, OptionSet<WebsiteDataFetchOption> fetchOptions, Function<void (Vector<WebsiteData::Entry>)>&& completionHandler)
    339337{
    340 #if ENABLE(NETWORK_CACHE)
    341338    if (auto* cache = NetworkProcess::singleton().cache()) {
    342339        HashMap<SecurityOriginData, uint64_t> originsAndSizes;
    … …  
    364361        return;
    365362    }
    366 #endif
    367363
    368364    RunLoop::main().dispatch([completionHandler = WTFMove(completionHandler)] {
    … …  
    446442static void clearDiskCacheEntries(const Vector<SecurityOriginData>& origins, Function<void ()>&& completionHandler)
    447443{
    448 #if ENABLE(NETWORK_CACHE)
    449444    if (auto* cache = NetworkProcess::singleton().cache()) {
    450445        HashSet<RefPtr<SecurityOrigin>> originsToDelete;
    … …  
    466461        return;
    467462    }
    468 #endif
    469463
    470464    RunLoop::main().dispatch(WTFMove(completionHandler));
    … …  
    609603        urlCacheDiskCapacity = m_diskCacheSizeOverride;
    610604
    611 #if ENABLE(NETWORK_CACHE)
    612605    if (m_cache) {
    613606        m_cache->setCapacity(urlCacheDiskCapacity);
    614607        return;
    615608    }
    616 #endif
    617609
    618610    platformSetURLCacheSize(urlCacheMemoryCapacity, urlCacheDiskCapacity);

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

    r223073 r223179  
    101101    DownloadManager& downloadManager();
    102102
    103 #if ENABLE(NETWORK_CACHE)
    104103    NetworkCache::Cache* cache() { return m_cache.get(); }
    105 #endif
    106104
    107105    bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
    … …  
    249247    Seconds m_loadThrottleLatency;
    250248
    251 #if ENABLE(NETWORK_CACHE)
    252249    RefPtr<NetworkCache::Cache> m_cache;
    253 #endif
    254250
    255251    typedef HashMap<const char*, std::unique_ptr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;

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

    r223073 r223179  
    5151    encoder << diskCacheDirectory;
    5252    encoder << diskCacheDirectoryExtensionHandle;
    53 #if ENABLE(NETWORK_CACHE)
    5453    encoder << shouldEnableNetworkCache;
    5554    encoder << shouldEnableNetworkCacheEfficacyLogging;
    5655#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    5756    encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
    58 #endif
    5957#endif
    6058#if PLATFORM(MAC)
    … …  
    126124    if (!decoder.decode(result.diskCacheDirectoryExtensionHandle))
    127125        return false;
    128 #if ENABLE(NETWORK_CACHE)
    129126    if (!decoder.decode(result.shouldEnableNetworkCache))
    130127        return false;
    … …  
    135132        return false;
    136133#endif
    137 #endif
    138134#if PLATFORM(MAC)
    139135    if (!decoder.decode(result.uiProcessCookieStorageIdentifier))

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

    r223073 r223179  
    6161    String diskCacheDirectory;
    6262    SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
    63 #if ENABLE(NETWORK_CACHE)
    6463    bool shouldEnableNetworkCache { false };
    6564    bool shouldEnableNetworkCacheEfficacyLogging { false };
    6665#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    6766    bool shouldEnableNetworkCacheSpeculativeRevalidation { false };
    68 #endif
    6967#endif
    7068#if PLATFORM(MAC)

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

    r221005 r223179  
    8787    , m_defersLoading(parameters.defersLoading)
    8888    , m_bufferingTimer(*this, &NetworkResourceLoader::bufferingTimerFired)
    89 #if ENABLE(NETWORK_CACHE)
    9089    , m_cache(sessionID().isEphemeral() ? nullptr : NetworkProcess::singleton().cache())
    91 #endif
    9290{
    9391    ASSERT(RunLoop::isMain());
    … …  
    122120}
    123121
    124 #if ENABLE(NETWORK_CACHE)
    125122bool NetworkResourceLoader::canUseCache(const ResourceRequest& request) const
    126123{
    … …  
    149146    return true;
    150147}
    151 #endif
    152148
    153149bool NetworkResourceLoader::isSynchronous() const
    … …  
    168164    m_wasStarted = true;
    169165
    170 #if ENABLE(NETWORK_CACHE)
    171166    if (canUseCache(originalRequest())) {
    172167        RELEASE_LOG_IF_ALLOWED("start: Checking cache for resource (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", isMainResource = %d, isSynchronous = %d)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, isMainResource(), isSynchronous());
    … …  
    174169        return;
    175170    }
    176 #endif
    177171
    178172    startNetworkLoad(originalRequest());
    179173}
    180174
    181 #if ENABLE(NETWORK_CACHE)
    182175void NetworkResourceLoader::retrieveCacheEntry(const ResourceRequest& request)
    183176{
    … …  
    214207    });
    215208}
    216 #endif
    217209
    218210void NetworkResourceLoader::startNetworkLoad(const ResourceRequest& request)
    … …  
    225217        m_bufferedData = SharedBuffer::create();
    226218
    227 #if ENABLE(NETWORK_CACHE)
    228219    if (canUseCache(request))
    229220        m_bufferedDataForCache = SharedBuffer::create();
    230 #endif
    231221
    232222    NetworkLoadParameters parameters = m_parameters;
    … …  
    307297
    308298    if (m_networkLoad) {
    309 #if ENABLE(NETWORK_CACHE)
    310299        if (canUseCache(m_networkLoad->currentRequest())) {
    311300            // We might already have used data from this incomplete load. Ensure older versions don't remain in the cache after cancel.
    … …  
    313302                m_cache->remove(m_networkLoad->currentRequest());
    314303        }
    315 #endif
    316304        m_networkLoad->cancel();
    317305    }
    … …  
    330318        m_bufferedData = nullptr;
    331319
    332     bool shouldSendDidReceiveResponse = true;
    333 #if ENABLE(NETWORK_CACHE)
    334320    if (m_response.isMultipart())
    335321        m_bufferedDataForCache = nullptr;
    … …  
    345331            m_cacheEntryForValidation = nullptr;
    346332    }
    347     shouldSendDidReceiveResponse = !m_cacheEntryForValidation;
    348 #endif
     333    bool shouldSendDidReceiveResponse = !m_cacheEntryForValidation;
    349334
    350335    bool shouldWaitContinueDidReceiveResponse = isMainResource();
    … …  
    357342
    358343    // For main resources, the web process is responsible for sending back a NetworkResourceLoader::ContinueDidReceiveResponse message.
    359     bool shouldContinueDidReceiveResponse = !shouldWaitContinueDidReceiveResponse;
    360 #if ENABLE(NETWORK_CACHE)
    361     shouldContinueDidReceiveResponse = shouldContinueDidReceiveResponse || m_cacheEntryForValidation;
    362 #endif
     344    bool shouldContinueDidReceiveResponse = !shouldWaitContinueDidReceiveResponse || m_cacheEntryForValidation;
    363345
    364346    if (shouldContinueDidReceiveResponse) {
    … …  
    378360    m_numBytesReceived += buffer->size();
    379361
    380 #if ENABLE(NETWORK_CACHE)
    381362    ASSERT(!m_cacheEntryForValidation);
    382363
    … …  
    389370            m_bufferedDataForCache = nullptr;
    390371    }
    391 #endif
    392372    // FIXME: At least on OS X Yosemite we always get -1 from the resource handle.
    393373    unsigned encodedDataLength = reportedEncodedDataLength >= 0 ? reportedEncodedDataLength : buffer->size();
    … …  
    407387    RELEASE_LOG_IF_ALLOWED("didFinishLoading: (pageID = %" PRIu64 ", frameID = %" PRIu64 ", resourceID = %" PRIu64 ", length = %zd)", m_parameters.webPageID, m_parameters.webFrameID, m_parameters.identifier, m_numBytesReceived);
    408388
    409 #if ENABLE(NETWORK_CACHE)
    410389    if (m_cacheEntryForValidation) {
    411390        // 304 Not Modified
    … …  
    415394        return;
    416395    }
    417 #endif
    418396
    419397    if (isSynchronous())
    … …  
    427405    }
    428406
    429 #if ENABLE(NETWORK_CACHE)
    430407    tryStoreAsCacheEntry();
    431 #endif
    432408
    433409    cleanup();
    … …  
    440416    ASSERT(!error.isNull());
    441417
    442 #if ENABLE(NETWORK_CACHE)
    443418    m_cacheEntryForValidation = nullptr;
    444 #endif
    445419
    446420    if (isSynchronous()) {
    … …  
    472446    send(Messages::WebResourceLoader::WillSendRequest(redirectRequest, redirectResponse));
    473447
    474 #if ENABLE(NETWORK_CACHE)
    475448    if (canUseCachedRedirect(request))
    476449        m_cache->storeRedirect(request, redirectResponse, redirectRequest);
    477 #else
    478     UNUSED_PARAM(request);
    479 #endif
    480450}
    481451
    … …  
    488458    newRequest.setCachePartition(originalRequest().cachePartition());
    489459
    490 #if ENABLE(NETWORK_CACHE)
    491460    if (m_isWaitingContinueWillSendRequestForCachedRedirect) {
    492461        m_isWaitingContinueWillSendRequestForCachedRedirect = false;
    … …  
    501470        return;
    502471    }
    503 #endif
    504472
    505473    if (m_networkLoad)
    … …  
    555523}
    556524
    557 #if ENABLE(NETWORK_CACHE)
    558525void NetworkResourceLoader::tryStoreAsCacheEntry()
    559526{
    … …  
    669636    m_isWaitingContinueWillSendRequestForCachedRedirect = true;
    670637}
    671 #endif
    672638
    673639IPC::Connection* NetworkResourceLoader::messageSenderConnection()

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

    r220857 r223179  
    110110    uint64_t messageSenderDestinationID() override { return m_parameters.identifier; }
    111111
    112 #if ENABLE(NETWORK_CACHE)
    113112    bool canUseCache(const WebCore::ResourceRequest&) const;
    114113    bool canUseCachedRedirect(const WebCore::ResourceRequest&) const;
    … …  
    120119    void validateCacheEntry(std::unique_ptr<NetworkCache::Entry>);
    121120    void dispatchWillSendRequestForCacheEntry(std::unique_ptr<NetworkCache::Entry>);
    122 #endif
    123121
    124122    void startNetworkLoad(const WebCore::ResourceRequest&);
    … …  
    160158
    161159    WebCore::Timer m_bufferingTimer;
    162 #if ENABLE(NETWORK_CACHE)
    163160    RefPtr<NetworkCache::Cache> m_cache;
    164161    RefPtr<WebCore::SharedBuffer> m_bufferedDataForCache;
    165162    std::unique_ptr<NetworkCache::Entry> m_cacheEntryForValidation;
    166163    bool m_isWaitingContinueWillSendRequestForCachedRedirect { false };
    167 #endif
    168164};
    169165

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

    r220267 r223179  
    2626#include "config.h"
    2727#include "NetworkCache.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "Logging.h"
    … …  
    649647}
    650648}
    651 
    652 #endif

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

    r220267 r223179  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(NETWORK_CACHE)
    2927
    3028#include "NetworkCacheEntry.h"
    … …  
    160158}
    161159}
    162 #endif

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

    r209554 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheBlobStorage.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "Logging.h"
    … …  
    150148}
    151149}
    152 
    153 #endif

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

    r209554 r223179  
    2626#ifndef NetworkCacheBlobStorage_h
    2727#define NetworkCacheBlobStorage_h
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "NetworkCacheData.h"
    … …  
    7371
    7472#endif
    75 #endif

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

    r210502 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheCoders.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129namespace WTF {
    … …  
    6260}
    6361}
    64 
    65 #endif

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

    r220574 r223179  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(NETWORK_CACHE)
    2927
    3028#include <WebCore/CertificateInfo.h>
    … …  
    5553}
    5654}
    57 #endif

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

    r210502 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheCoders.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#if PLATFORM(COCOA)
    … …  
    191189}
    192190}
    193 
    194 #endif

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

    r210502 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheCoders.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129namespace WTF {
    … …  
    9189}
    9290}
    93 
    94 #endif

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

    r221426 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheData.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include <WebCore/FileSystem.h>
    … …  
    160158} // namespace NetworkCache
    161159} // namespace WebKit
    162 
    163 #endif // #if ENABLE(NETWORK_CACHE)

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

    r221426 r223179  
    2626#ifndef NetworkCacheData_h
    2727#define NetworkCacheData_h
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include <wtf/FunctionDispatcher.h>
    … …  
    113111
    114112#endif
    115 #endif

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheDataCocoa.mm

    r210364 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheData.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "SharedMemory.h"
    … …  
    115113}
    116114}
    117 
    118 #endif

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

    r210364 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheData.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "SharedMemory.h"
    … …  
    139137} // namespace NetworkCache
    140138} // namespace WebKit
    141 
    142 #endif

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

    r220267 r223179  
    3434#include <wtf/text/StringBuilder.h>
    3535
    36 #if ENABLE(NETWORK_CACHE)
    37 
    3836namespace WebKit {
    3937namespace NetworkCache {
    … …  
    245243}
    246244}
    247 
    248 #endif

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

    r211894 r223179  
    2626#ifndef NetworkCacheEntry_h
    2727#define NetworkCacheEntry_h
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "NetworkCacheStorage.h"
    … …  
    9795
    9896#endif
    99 #endif

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

    r212244 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheFileSystem.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "Logging.h"
    … …  
    167165}
    168166}
    169 
    170 #endif // ENABLE(NETWORK_CACHE)

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

    r218457 r223179  
    2626#pragma once
    2727
    28 #if ENABLE(NETWORK_CACHE)
    29 
    3028#include <WebCore/FileSystem.h>
    3129#include <chrono>
    … …  
    5048}
    5149}
    52 
    53 #endif

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

    r218024 r223179  
    2626#ifndef NetworkCacheIOChannel_h
    2727#define NetworkCacheIOChannel_h
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "NetworkCacheData.h"
    … …  
    8583
    8684#endif
    87 #endif

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheIOChannelCocoa.mm

    r218024 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheIOChannel.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "NetworkCacheFileSystem.h"
    … …  
    123121}
    124122}
    125 
    126 #endif

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

    r218763 r223179  
    2727#include "NetworkCacheIOChannel.h"
    2828
    29 #if ENABLE(NETWORK_CACHE)
    30 
    3129#include "NetworkCacheFileSystem.h"
    3230#include <wtf/MainThread.h>
    … …  
    283281} // namespace NetworkCache
    284282} // namespace WebKit
    285 
    286 #endif

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

    r220574 r223179  
    2626#include "config.h"
    2727#include "NetworkCacheKey.h"
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "NetworkCacheCoders.h"
    … …  
    183181}
    184182}
    185 
    186 #endif

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

    r220574 r223179  
    2626#ifndef NetworkCacheKey_h
    2727#define NetworkCacheKey_h
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "NetworkCacheData.h"
    … …  
    139137
    140138#endif
    141 #endif

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

    r220267 r223179  
    2626#include "config.h"
    2727
    28 #if ENABLE(NETWORK_CACHE)
    2928#include "NetworkCacheStatistics.h"
    3029
    … …  
    453452}
    454453}
    455 
    456 #endif // ENABLE(NETWORK_CACHE)

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

    r220267 r223179  
    2626#ifndef NetworkCacheStatistics_h
    2727#define NetworkCacheStatistics_h
    28 
    29 #if ENABLE(NETWORK_CACHE)
    3028
    3129#include "NetworkCache.h"
    … …  
    9391}
    9492
    95 #endif // ENABLE(NETWORK_CACHE)
    96 
    9793#endif // NetworkCacheStatistics_h

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

    r223073 r223179  
    2727#include "NetworkCacheStorage.h"
    2828
    29 #if ENABLE(NETWORK_CACHE)
    30 
    3129#include "Logging.h"
    3230#include "NetworkCacheCoders.h"
    … …  
    11011099}
    11021100}
    1103 
    1104 #endif

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

    r222073 r223179  
    2525
    2626#pragma once
    27 
    28 #if ENABLE(NETWORK_CACHE)
    2927
    3028#include "NetworkCacheBlobStorage.h"
    … …  
    197195}
    198196}
    199 #endif

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

    r223073 r223179  
    114114    if (!m_diskCacheDirectory.isNull()) {
    115115        SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
    116 #if ENABLE(NETWORK_CACHE)
    117116        if (parameters.shouldEnableNetworkCache) {
    118117            OptionSet<NetworkCache::Cache::Option> cacheOptions { NetworkCache::Cache::Option::RegisterNotify };
    … …  
    134133            }
    135134        }
    136 #endif
    137135        String nsURLCacheDirectory = m_diskCacheDirectory;
    138136#if PLATFORM(IOS)
    … …  
    197195        m_clearCacheDispatchGroup = dispatch_group_create();
    198196
    199 #if ENABLE(NETWORK_CACHE)
    200197    if (auto* cache = NetworkProcess::singleton().cache()) {
    201198        auto group = m_clearCacheDispatchGroup;
    … …  
    208205        return;
    209206    }
    210 #endif
    211207    clearNSURLCache(m_clearCacheDispatchGroup, modifiedSince, WTFMove(completionHandler));
    212208}

  • trunk/Source/WebKit/NetworkProcess/ios/NetworkProcessIOS.mm

    r220267 r223179  
    7979    if (resourceCachesToClear == InMemoryResourceCachesOnly)
    8080        return;
    81 #if ENABLE(NETWORK_CACHE)
    8281    if (m_cache)
    8382        m_cache->clear();
    84 #endif
    8583}
    8684

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

    r221005 r223179  
    113113    SoupNetworkSession::clearOldSoupCache(WebCore::directoryName(m_diskCacheDirectory));
    114114
    115 #if ENABLE(NETWORK_CACHE)
    116115    OptionSet<NetworkCache::Cache::Option> cacheOptions { NetworkCache::Cache::Option::RegisterNotify };
    117116    if (parameters.shouldEnableNetworkCacheEfficacyLogging)
    … …  
    123122
    124123    m_cache = NetworkCache::Cache::open(m_diskCacheDirectory, cacheOptions);
    125 #endif
    126124
    127125    if (!parameters.cookiePersistentStoragePath.isEmpty()) {
    … …  
    161159void NetworkProcess::clearDiskCache(std::chrono::system_clock::time_point modifiedSince, Function<void ()>&& completionHandler)
    162160{
    163 #if ENABLE(NETWORK_CACHE)
    164161    if (!m_cache)
    165162        return;
    166163    m_cache->clear(modifiedSince, WTFMove(completionHandler));
    167 #else
    168     UNUSED_PARAM(modifiedSince);
    169     UNUSED_PARAM(completionHandler);
    170 #endif
    171164}
    172165

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r222896 r223179  
    7979static NSString * const WebKit2HTTPSProxyDefaultsKey = @"WebKit2HTTPSProxy";
    8080
    81 #if ENABLE(NETWORK_CACHE)
    8281static NSString * const WebKitNetworkCacheEnabledDefaultsKey = @"WebKitNetworkCacheEnabled";
    8382static NSString * const WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey = @"WebKitNetworkCacheEfficacyLoggingEnabled";
    84 #endif
    8583
    8684static NSString * const WebKitSuppressMemoryPressureHandlerDefaultsKey = @"WebKitSuppressMemoryPressureHandler";
    … …  
    109107    [registrationDictionary setObject:@YES forKey:WebKitJSCFTLJITEnabledDefaultsKey];
    110108
    111 #if ENABLE(NETWORK_CACHE)
    112109    [registrationDictionary setObject:@YES forKey:WebKitNetworkCacheEnabledDefaultsKey];
    113110    [registrationDictionary setObject:@NO forKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
    114 #endif
    115111
    116112    [[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
    … …  
    282278    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    283279
    284 #if ENABLE(NETWORK_CACHE)
    285280    parameters.shouldEnableNetworkCache = isNetworkCacheEnabled();
    286281    parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
    287 #endif
    288282
    289283    parameters.sourceApplicationBundleIdentifier = m_configuration->sourceApplicationBundleIdentifier();
    … …  
    468462        cachePath = @"~/Library/Caches/com.apple.WebKit.WebProcess";
    469463
    470 #if ENABLE(NETWORK_CACHE)
    471464    if (isNetworkCacheEnabled())
    472465        cachePath = [cachePath stringByAppendingPathComponent:@"WebKitCache"];
    473 #endif
    474466
    475467    return stringByResolvingSymlinksInPath([cachePath stringByStandardizingPath]);
    … …  
    505497bool WebProcessPool::isNetworkCacheEnabled()
    506498{
    507 #if ENABLE(NETWORK_CACHE)
    508499    registerUserDefaultsIfNeeded();
    509500
    … …  
    513504
    514505    return networkCacheEnabledByDefaults && linkedOnOrAfter(SDKVersion::FirstWithNetworkCache);
    515 #else
    516     return false;
    517 #endif
    518506}
    519507

  • trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp

    r221768 r223179  
    4343    parameters.ignoreTLSErrors = m_ignoreTLSErrors;
    4444    parameters.languages = userPreferredLanguages();
    45 #if ENABLE(NETWORK_CACHE)
    4645    parameters.shouldEnableNetworkCacheEfficacyLogging = false;
    47 #endif
    4846    parameters.proxySettings = m_networkProxySettings;
    4947}

  • trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp

    r222739 r223179  
    506506void WebLoaderStrategy::storeDerivedDataToCache(const SHA1::Digest& bodyHash, const String& type, const String& partition, WebCore::SharedBuffer& data)
    507507{
    508 #if ENABLE(NETWORK_CACHE)
    509508    NetworkCache::DataKey key { partition, type, bodyHash };
    510509    IPC::SharedBufferDataReference dataReference { &data };
    511510    WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::StoreDerivedDataToCache(key, dataReference), 0);
    512 #else
    513     UNUSED_PARAM(bodyHash);
    514     UNUSED_PARAM(type);
    515     UNUSED_PARAM(partition);
    516     UNUSED_PARAM(data);
    517 #endif
    518511}
    519512

  • trunk/Source/WebKit/config.h

    r222876 r223179  
    118118#endif
    119119
    120 #ifndef ENABLE_NETWORK_CACHE
    121 #if PLATFORM(COCOA) || USE(SOUP)
    122 #define ENABLE_NETWORK_CACHE 1
    123 #else
    124 #define ENABLE_NETWORK_CACHE 0
    125 #endif
    126 #endif
    127 
    128120#ifndef ENABLE_NETWORK_CAPTURE
    129121#if USE(NETWORK_SESSION) && PLATFORM(COCOA)
    … …  
    133125
    134126#ifndef ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION
    135 #if ENABLE(NETWORK_CACHE) && (PLATFORM(COCOA) || PLATFORM(GTK))
     127#if (PLATFORM(COCOA) || PLATFORM(GTK))
    136128#define ENABLE_NETWORK_CACHE_SPECULATIVE_REVALIDATION 1
    137129#else
Note: See TracChangeset for help on using the changeset viewer.