Diff
Modified: trunk/Source/WebKit/ChangeLog (221004 => 221005)
--- trunk/Source/WebKit/ChangeLog 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/ChangeLog 2017-08-22 06:31:49 UTC (rev 221005)
@@ -1,3 +1,28 @@
+2017-08-21 Zan Dobersek <[email protected]>
+
+ [WK] Add missing ENABLE(NETWORK_CACHE) build guards
+ https://bugs.webkit.org/show_bug.cgi?id=175769
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ Given that the build guard exists, it should be possible to
+ compile the WebKit layer with the feature disabled. Missing
+ guards are added in order to achieve that.
+
+ * NetworkProcess/NetworkConnectionToWebProcess.cpp:
+ * NetworkProcess/NetworkConnectionToWebProcess.h:
+ * NetworkProcess/NetworkConnectionToWebProcess.messages.in:
+ * NetworkProcess/NetworkProcess.h:
+ * NetworkProcess/NetworkResourceLoader.cpp:
+ (WebKit::NetworkResourceLoader::NetworkResourceLoader):
+ * NetworkProcess/soup/NetworkProcessSoup.cpp:
+ (WebKit::NetworkProcess::platformInitializeNetworkProcess):
+ (WebKit::NetworkProcess::clearDiskCache):
+ * UIProcess/soup/WebProcessPoolSoup.cpp:
+ (WebKit::WebProcessPool::platformInitializeNetworkProcess):
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::storeDerivedDataToCache):
+
2017-08-21 Chris Dumez <[email protected]>
[Beacon] Content extensions should be able to intercept Beacon / Ping redirects
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp (221004 => 221005)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp 2017-08-22 06:31:49 UTC (rev 221005)
@@ -431,11 +431,13 @@
});
}
+#if ENABLE(NETWORK_CACHE)
void NetworkConnectionToWebProcess::storeDerivedDataToCache(const WebKit::NetworkCache::DataKey& dataKey, const IPC::DataReference& data)
{
if (auto* cache = NetworkProcess::singleton().cache())
cache->storeData(dataKey, data.data(), data.size());
}
+#endif
void NetworkConnectionToWebProcess::setCaptureExtraNetworkLoadMetricsEnabled(bool enabled)
{
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h (221004 => 221005)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h 2017-08-22 06:31:49 UTC (rev 221005)
@@ -112,7 +112,9 @@
void unregisterBlobURL(const WebCore::URL&);
void writeBlobsToTemporaryFiles(const Vector<String>& blobURLs, uint64_t requestIdentifier);
+#if ENABLE(NETWORK_CACHE)
void storeDerivedDataToCache(const WebKit::NetworkCache::DataKey&, const IPC::DataReference&);
+#endif
void setCaptureExtraNetworkLoadMetricsEnabled(bool);
Modified: trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in (221004 => 221005)
--- trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.messages.in 2017-08-22 06:31:49 UTC (rev 221005)
@@ -49,7 +49,9 @@
BlobSize(WebCore::URL url) -> (uint64_t resultSize)
WriteBlobsToTemporaryFiles(Vector<String> blobURLs, uint64_t requestIdentifier)
+#if ENABLE(NETWORK_CACHE)
StoreDerivedDataToCache(WebKit::NetworkCache::DataKey key, IPC::DataReference data)
+#endif
SetCaptureExtraNetworkLoadMetricsEnabled(bool enabled)
Modified: trunk/Source/WebKit/NetworkProcess/NetworkProcess.h (221004 => 221005)
--- trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/NetworkProcess/NetworkProcess.h 2017-08-22 06:31:49 UTC (rev 221005)
@@ -94,7 +94,9 @@
AuthenticationManager& authenticationManager();
DownloadManager& downloadManager();
+#if ENABLE(NETWORK_CACHE)
NetworkCache::Cache* cache() { return m_cache.get(); }
+#endif
bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
@@ -230,7 +232,9 @@
bool m_canHandleHTTPSServerTrustEvaluation;
Seconds m_loadThrottleLatency;
+#if ENABLE(NETWORK_CACHE)
RefPtr<NetworkCache::Cache> m_cache;
+#endif
typedef HashMap<const char*, std::unique_ptr<NetworkProcessSupplement>, PtrHash<const char*>> NetworkProcessSupplementMap;
NetworkProcessSupplementMap m_supplements;
Modified: trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp (221004 => 221005)
--- trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp 2017-08-22 06:31:49 UTC (rev 221005)
@@ -86,7 +86,9 @@
, m_connection(connection)
, m_defersLoading(parameters.defersLoading)
, m_bufferingTimer(*this, &NetworkResourceLoader::bufferingTimerFired)
+#if ENABLE(NETWORK_CACHE)
, m_cache(sessionID().isEphemeral() ? nullptr : NetworkProcess::singleton().cache())
+#endif
{
ASSERT(RunLoop::isMain());
// FIXME: This is necessary because of the existence of EmptyFrameLoaderClient in WebCore.
Modified: trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp (221004 => 221005)
--- trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp 2017-08-22 06:31:49 UTC (rev 221005)
@@ -112,6 +112,7 @@
SoupNetworkSession::clearOldSoupCache(WebCore::directoryName(m_diskCacheDirectory));
+#if ENABLE(NETWORK_CACHE)
OptionSet<NetworkCache::Cache::Option> cacheOptions { NetworkCache::Cache::Option::RegisterNotify };
if (parameters.shouldEnableNetworkCacheEfficacyLogging)
cacheOptions |= NetworkCache::Cache::Option::EfficacyLogging;
@@ -121,6 +122,7 @@
#endif
m_cache = NetworkCache::Cache::open(m_diskCacheDirectory, cacheOptions);
+#endif
if (!parameters.cookiePersistentStoragePath.isEmpty()) {
supplement<WebCookieManager>()->setCookiePersistentStorage(parameters.cookiePersistentStoragePath,
@@ -158,9 +160,14 @@
void NetworkProcess::clearDiskCache(std::chrono::system_clock::time_point modifiedSince, Function<void ()>&& completionHandler)
{
+#if ENABLE(NETWORK_CACHE)
if (!m_cache)
return;
m_cache->clear(modifiedSince, WTFMove(completionHandler));
+#else
+ UNUSED_PARAM(modifiedSince);
+ UNUSED_PARAM(completionHandler);
+#endif
}
void NetworkProcess::platformTerminate()
Modified: trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp (221004 => 221005)
--- trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp 2017-08-22 06:31:49 UTC (rev 221005)
@@ -42,7 +42,9 @@
parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
parameters.ignoreTLSErrors = m_ignoreTLSErrors;
parameters.languages = WebCore::userPreferredLanguages();
+#if ENABLE(NETWORK_CACHE)
parameters.shouldEnableNetworkCacheEfficacyLogging = false;
+#endif
parameters.proxySettings = m_networkProxySettings;
}
Modified: trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp (221004 => 221005)
--- trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2017-08-22 05:54:30 UTC (rev 221004)
+++ trunk/Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp 2017-08-22 06:31:49 UTC (rev 221005)
@@ -461,9 +461,16 @@
void WebLoaderStrategy::storeDerivedDataToCache(const SHA1::Digest& bodyHash, const String& type, const String& partition, WebCore::SharedBuffer& data)
{
+#if ENABLE(NETWORK_CACHE)
NetworkCache::DataKey key { partition, type, bodyHash };
IPC::SharedBufferDataReference dataReference { &data };
WebProcess::singleton().networkConnection().connection().send(Messages::NetworkConnectionToWebProcess::StoreDerivedDataToCache(key, dataReference), 0);
+#else
+ UNUSED_PARAM(bodyHash);
+ UNUSED_PARAM(type);
+ UNUSED_PARAM(partition);
+ UNUSED_PARAM(data);
+#endif
}
void WebLoaderStrategy::setCaptureExtraNetworkLoadMetricsEnabled(bool enabled)
