[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da
mitz at apple.com
mitz at apple.com
Wed Dec 22 18:42:51 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit c45b825c00c5326349e642c1a8c4c6fa0c33fbff
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Dec 16 06:32:13 2010 +0000
Allow responses to be cached by the NSURLCache.
Reviewed by Sam "I blame undersea" Weinig.
* WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
(WebKit::WebFrameLoaderClient::willCacheResponse): Changed to return the response instead of 0.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74174 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit2/ChangeLog b/WebKit2/ChangeLog
index 3f73ae3..476fde4 100644
--- a/WebKit2/ChangeLog
+++ b/WebKit2/ChangeLog
@@ -1,3 +1,12 @@
+2010-12-15 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Sam “I blame andersca” Weinig.
+
+ Allow responses to be cached by the NSURLCache.
+
+ * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp:
+ (WebKit::WebFrameLoaderClient::willCacheResponse): Changed to return the response instead of 0.
+
2010-12-14 Enrica Casucci <enrica at apple.com>
Reviewed by Adam Roben.
diff --git a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
index 2b6c3cf..698cc8d 100644
--- a/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
+++ b/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
@@ -1213,10 +1213,9 @@ void WebFrameLoaderClient::registerForIconNotification(bool listen)
#if ENABLE(MAC_JAVA_BRIDGE)
jobject WebFrameLoaderClient::javaApplet(NSView*) { return 0; }
#endif
-NSCachedURLResponse* WebFrameLoaderClient::willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse*) const
+NSCachedURLResponse* WebFrameLoaderClient::willCacheResponse(DocumentLoader*, unsigned long identifier, NSCachedURLResponse* response) const
{
- notImplemented();
- return 0;
+ return response;
}
#endif
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list