Bug 177424 – Remove ENABLE_NETWORK_CACHE

• Status: RESOLVED
• Resolution: FIXED
• Component: WebKit2

[Yoshiaki Jitsukawa]

https://trac.webkit.org/changeset/221942/webkit introduced NetworkCache::Key and other things in NetworkCache namespace
into WebKit/NetworkProcess/cache/CacheStorageEngineCache, but NetworkCache::* is not defined unless ENABLE(NETWORK_CACHE) is true
and this causes WebKit to fail to build.

The definition in WebKit/config.h is 
#ifndef ENABLE_NETWORK_CACHE
#if PLATFORM(COCOA) || USE(SOUP)
#define ENABLE_NETWORK_CACHE 1
#else
#define ENABLE_NETWORK_CACHE 0
#endif
#endif

and it seems like all webkit(2) port enable it today.

Should we support the case ENABLE_NETWORK_CACHE==0 or should all webkit(2) port (including upcoming windows one) enable network cache?

[Antti Koivisto]

We should just remove ENABLE_NETWORK_CACHE define and always compile in the code. Cache can still be disabled dynamically.

[Yoshiaki Jitsukawa]

(In reply to Antti Koivisto from comment #1)
> We should just remove ENABLE_NETWORK_CACHE define and always compile in the
> code. Cache can still be disabled dynamically.

I understand. Thank you for the clarification :)

[Don Olmstead]

Created attachment 323349 [details]
Patch

[Antti Koivisto]

Comment on attachment 323349 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=323349&action=review

> Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:320
>      bool shouldSendDidReceiveResponse = true;

This line can be removed

> Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:334
>      shouldSendDidReceiveResponse = !m_cacheEntryForValidation;

... and this turned into

bool shouldSendDidReceiveResponse = !m_cacheEntryForValidation

> Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:-362
>      // For main resources, the web process is responsible for sending back a NetworkResourceLoader::ContinueDidReceiveResponse message.
>      bool shouldContinueDidReceiveResponse = !shouldWaitContinueDidReceiveResponse;
> -#if ENABLE(NETWORK_CACHE)
>      shouldContinueDidReceiveResponse = shouldContinueDidReceiveResponse || m_cacheEntryForValidation;
> -#endif

This can be reduced to

bool shouldContinueDidReceiveResponse = !shouldWaitContinueDidReceiveResponse || m_cacheEntryForValidation;

[Don Olmstead]

Created attachment 323365 [details]
Patch

Fixing review comments

[Antti Koivisto]

Comment on attachment 323365 [details]
Patch

r=me

[WebKit Commit Bot]

Comment on attachment 323365 [details]
Patch

Clearing flags on attachment: 323365

Committed r223179: <https://trac.webkit.org/changeset/223179>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/34934064>