Changeset 221005 in webkit

Timestamp:

Aug 21, 2017, 11:31:49 PM (9 years ago)

Author:

zandobersek@gmail.com

Message:

[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):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkConnectionToWebProcess.cpp (modified) (2 diffs)
• NetworkProcess/NetworkConnectionToWebProcess.h (modified) (1 diff)
• NetworkProcess/NetworkConnectionToWebProcess.messages.in (modified) (1 diff)
• NetworkProcess/NetworkProcess.h (modified) (2 diffs)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (1 diff)
• NetworkProcess/soup/NetworkProcessSoup.cpp (modified) (3 diffs)
• UIProcess/soup/WebProcessPoolSoup.cpp (modified) (1 diff)
• WebProcess/Network/WebLoaderStrategy.cpp (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-08-21  Zan Dobersek  <zdobersek@igalia.com>
+
+        [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  <cdumez@apple.com>
 

trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.cpp

@@ -432 +432 @@
 }
 
+#if ENABLE(NETWORK_CACHE)
 void NetworkConnectionToWebProcess::storeDerivedDataToCache(const WebKit::NetworkCache::DataKey& dataKey, const IPC::DataReference& data)
 {
@@ -437 +438 @@
         cache->storeData(dataKey, data.data(), data.size());
 }
+#endif
 
 void NetworkConnectionToWebProcess::setCaptureExtraNetworkLoadMetricsEnabled(bool enabled)

trunk/Source/WebKit/NetworkProcess/NetworkConnectionToWebProcess.h

@@ -113 +113 @@
     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);

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

@@ -50 +50 @@
     WriteBlobsToTemporaryFiles(Vector<String> blobURLs, uint64_t requestIdentifier)
 
+#if ENABLE(NETWORK_CACHE)
     StoreDerivedDataToCache(WebKit::NetworkCache::DataKey key, IPC::DataReference data)
+#endif
 
     SetCaptureExtraNetworkLoadMetricsEnabled(bool enabled)

trunk/Source/WebKit/NetworkProcess/NetworkProcess.h

@@ -95 +95 @@
     DownloadManager& downloadManager();
 
+#if ENABLE(NETWORK_CACHE)
     NetworkCache::Cache* cache() { return m_cache.get(); }
+#endif
 
     bool canHandleHTTPSServerTrustEvaluation() const { return m_canHandleHTTPSServerTrustEvaluation; }
@@ -231 +233 @@
     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;

trunk/Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp

@@ -87 +87 @@
     , 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());

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

@@ -113 +113 @@
     SoupNetworkSession::clearOldSoupCache(WebCore::directoryName(m_diskCacheDirectory));
 
+#if ENABLE(NETWORK_CACHE)
     OptionSet<NetworkCache::Cache::Option> cacheOptions { NetworkCache::Cache::Option::RegisterNotify };
     if (parameters.shouldEnableNetworkCacheEfficacyLogging)
@@ -122 +123 @@
 
     m_cache = NetworkCache::Cache::open(m_diskCacheDirectory, cacheOptions);
+#endif
 
     if (!parameters.cookiePersistentStoragePath.isEmpty()) {
@@ -159 +161 @@
 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
 }
 

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

@@ -43 +43 @@
     parameters.ignoreTLSErrors = m_ignoreTLSErrors;
     parameters.languages = WebCore::userPreferredLanguages();
+#if ENABLE(NETWORK_CACHE)
     parameters.shouldEnableNetworkCacheEfficacyLogging = false;
+#endif
     parameters.proxySettings = m_networkProxySettings;
 }

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

@@ -462 +462 @@
 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
 }