Changeset 182020 in webkit

Timestamp:

Mar 26, 2015, 11:49:40 AM (11 years ago)

Author:

Antti Koivisto

Message:

Remove unneeded isConditionalRequest check from NetworkResourceLoader
​https://bugs.webkit.org/show_bug.cgi?id=143096

Reviewed by Anders Carlsson.

This check is leftover from implementation that allowed disk cache to validate conditional
request itself. The case can't happen as NetworkCache canRetrieve test does not allow
conditional requests in the first place.

• NetworkProcess/NetworkResourceLoader.cpp:

(WebKit::NetworkResourceLoader::didReceiveResponseAsync):
(WebKit::isConditionalRequest): Deleted.

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkResourceLoader.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2015-03-26  Antti Koivisto  <antti@apple.com>
+
+        Remove unneeded isConditionalRequest check from NetworkResourceLoader
+        https://bugs.webkit.org/show_bug.cgi?id=143096
+
+        Reviewed by Anders Carlsson.
+
+        This check is leftover from implementation that allowed disk cache to validate conditional
+        request itself. The case can't happen as NetworkCache canRetrieve test does not allow
+        conditional requests in the first place.
+
+        * NetworkProcess/NetworkResourceLoader.cpp:
+        (WebKit::NetworkResourceLoader::didReceiveResponseAsync):
+        (WebKit::isConditionalRequest): Deleted.
+
 2015-03-26  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp

@@ -229 +229 @@
 }
 
-#if ENABLE(NETWORK_CACHE)
-static bool isConditionalRequest(const WebCore::ResourceRequest& request)
-{
-    if (!request.httpHeaderField(WebCore::HTTPHeaderName::IfNoneMatch).isEmpty())
-        return true;
-    if (!request.httpHeaderField(WebCore::HTTPHeaderName::IfModifiedSince).isEmpty())
-        return true;
-    return false;
-}
-#endif
-
 void NetworkResourceLoader::didReceiveResponseAsync(ResourceHandle* handle, const ResourceResponse& receivedResponse)
 {
@@ -259 +248 @@
         if (validationSucceeded)
             NetworkCache::singleton().update(originalRequest(), *m_cacheEntryForValidation, m_response);
-        if (!validationSucceeded || isConditionalRequest(originalRequest()))
+        else
             m_cacheEntryForValidation = nullptr;
     }