Title: [182020] trunk/Source/WebKit2
- Revision
- 182020
- Author
- [email protected]
- Date
- 2015-03-26 11:49:40 -0700 (Thu, 26 Mar 2015)
Log 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (182019 => 182020)
--- trunk/Source/WebKit2/ChangeLog 2015-03-26 18:39:22 UTC (rev 182019)
+++ trunk/Source/WebKit2/ChangeLog 2015-03-26 18:49:40 UTC (rev 182020)
@@ -1,5 +1,20 @@
2015-03-26 Antti Koivisto <[email protected]>
+ 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 <[email protected]>
+
Rename Storage::Entry to Storage::Record
https://bugs.webkit.org/show_bug.cgi?id=143101
Modified: trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp (182019 => 182020)
--- trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-03-26 18:39:22 UTC (rev 182019)
+++ trunk/Source/WebKit2/NetworkProcess/NetworkResourceLoader.cpp 2015-03-26 18:49:40 UTC (rev 182020)
@@ -228,17 +228,6 @@
cleanup();
}
-#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)
{
ASSERT_UNUSED(handle, handle == m_handle);
@@ -258,7 +247,7 @@
bool validationSucceeded = m_response.httpStatusCode() == 304; // 304 Not Modified
if (validationSucceeded)
NetworkCache::singleton().update(originalRequest(), *m_cacheEntryForValidation, m_response);
- if (!validationSucceeded || isConditionalRequest(originalRequest()))
+ else
m_cacheEntryForValidation = nullptr;
}
shouldSendDidReceiveResponse = !m_cacheEntryForValidation;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
