[webkit-changes] [181688] trunk/Source/WebKit2

Wed, 18 Mar 2015 00:27:08 -0700

Title: [181688] trunk/Source/WebKit2
Revision
181688
Author
[email protected]
Date
2015-03-18 00:26:27 -0700 (Wed, 18 Mar 2015)

Log Message

[WK2] We should not even try the network cache for non-HTTP protocol requests
https://bugs.webkit.org/show_bug.cgi?id=142802
<rdar://problem/19632130>

Reviewed by Antti Koivisto.

We should not even try the network cache for non-HTTP protocol requests
and the network cache cannot handle those.

* NetworkProcess/NetworkResourceLoader.cpp:
(WebKit::NetworkResourceLoader::start):
* NetworkProcess/cache/NetworkCache.cpp:
(WebKit::NetworkCache::canRetrieve):
(WebKit::NetworkCache::Cache::retrieve):
* NetworkProcess/cache/NetworkCache.h:
* NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm:
(WebKit::NetworkCache::retrieveDecisionToDiagnosticKey):

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (181687 => 181688)


--- trunk/Source/WebKit2/ChangeLog	2015-03-18 07:19:16 UTC (rev 181687)
+++ trunk/Source/WebKit2/ChangeLog	2015-03-18 07:26:27 UTC (rev 181688)
@@ -1,3 +1,23 @@
+2015-03-18  Chris Dumez  <[email protected]>
+
+        [WK2] We should not even try the network cache for non-HTTP protocol requests
+        https://bugs.webkit.org/show_bug.cgi?id=142802
+        <rdar://problem/19632130>
+
+        Reviewed by Antti Koivisto.
+
+        We should not even try the network cache for non-HTTP protocol requests
+        and the network cache cannot handle those.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::start):
+        * NetworkProcess/cache/NetworkCache.cpp:
+        (WebKit::NetworkCache::canRetrieve):
+        (WebKit::NetworkCache::Cache::retrieve):
+        * NetworkProcess/cache/NetworkCache.h:
+        * NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm:
+        (WebKit::NetworkCache::retrieveDecisionToDiagnosticKey):
+
 2015-03-17  Conrad Shultz  <[email protected]>
 
         Ignore some deprecation warnings

Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (181687 => 181688)


--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-03-18 07:19:16 UTC (rev 181687)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp	2015-03-18 07:26:27 UTC (rev 181688)
@@ -135,7 +135,7 @@
     m_currentRequest = originalRequest();
 
 #if ENABLE(NETWORK_CACHE)
-    if (!NetworkCache::singleton().isEnabled() || sessionID().isEphemeral()) {
+    if (!NetworkCache::singleton().isEnabled() || sessionID().isEphemeral() || !originalRequest().url().protocolIsInHTTPFamily()) {
         startNetworkLoad();
         return;
     }

Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp (181687 => 181688)


--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2015-03-18 07:19:16 UTC (rev 181687)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.cpp	2015-03-18 07:26:27 UTC (rev 181688)
@@ -244,8 +244,6 @@
 
 static RetrieveDecision canRetrieve(const WebCore::ResourceRequest& request)
 {
-    if (!request.url().protocolIsInHTTPFamily())
-        return RetrieveDecision::NoDueToProtocol;
     // FIXME: Support HEAD and OPTIONS requests.
     if (request.httpMethod() != "GET")
         return RetrieveDecision::NoDueToHTTPMethod;
@@ -261,6 +259,7 @@
 void Cache::retrieve(const WebCore::ResourceRequest& originalRequest, uint64_t webPageID, std::function<void (std::unique_ptr<Entry>)> completionHandler)
 {
     ASSERT(isEnabled());
+    ASSERT(originalRequest.url().protocolIsInHTTPFamily());
 
     LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %u", originalRequest.url().string().ascii().data(), originalRequest.priority());

Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h (181687 => 181688)


--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h	2015-03-18 07:19:16 UTC (rev 181687)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCache.h	2015-03-18 07:26:27 UTC (rev 181688)
@@ -66,7 +66,6 @@
 
 enum class RetrieveDecision {
     Yes,
-    NoDueToProtocol,
     NoDueToHTTPMethod,
     NoDueToConditionalRequest,
     NoDueToReloadIgnoringCache

Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm (181687 => 181688)


--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm	2015-03-18 07:19:16 UTC (rev 181687)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheStatisticsCocoa.mm	2015-03-18 07:26:27 UTC (rev 181688)
@@ -190,8 +190,6 @@
 static String retrieveDecisionToDiagnosticKey(RetrieveDecision retrieveDecision)
 {
     switch (retrieveDecision) {
-    case RetrieveDecision::NoDueToProtocol:
-        return WebCore::DiagnosticLoggingKeys::notHTTPFamilyKey();
     case RetrieveDecision::NoDueToHTTPMethod:
         return WebCore::DiagnosticLoggingKeys::unsupportedHTTPMethodKey();
     case RetrieveDecision::NoDueToConditionalRequest:

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to