Title: [146095] trunk/Source/WebKit2
- Revision
- 146095
- Author
- beid...@apple.com
- Date
- 2013-03-18 11:41:33 -0700 (Mon, 18 Mar 2013)
Log Message
Mac build fix after http://trac.webkit.org/changeset/146088
* NetworkProcess/mac/NetworkResourceLoaderMac.mm:
(WebKit::NetworkResourceLoader::platformDidReceiveResponse):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (146094 => 146095)
--- trunk/Source/WebKit2/ChangeLog 2013-03-18 18:39:36 UTC (rev 146094)
+++ trunk/Source/WebKit2/ChangeLog 2013-03-18 18:41:33 UTC (rev 146095)
@@ -1,5 +1,12 @@
2013-03-18 Brady Eidson <beid...@apple.com>
+ Mac build fix after http://trac.webkit.org/changeset/146088
+
+ * NetworkProcess/mac/NetworkResourceLoaderMac.mm:
+ (WebKit::NetworkResourceLoader::platformDidReceiveResponse):
+
+2013-03-18 Brady Eidson <beid...@apple.com>
+
NetworkProcess should send vm_copied, mmap'ed memory to WebProcesses when a
resource is already in the disk cache.
<rdar://problem/13414153> and https://bugs.webkit.org/show_bug.cgi?id=112387
Modified: trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm (146094 => 146095)
--- trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-03-18 18:39:36 UTC (rev 146094)
+++ trunk/Source/WebKit2/NetworkProcess/mac/NetworkResourceLoaderMac.mm 2013-03-18 18:41:33 UTC (rev 146095)
@@ -46,7 +46,7 @@
{
#if __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
return;
-#endif
+#else
// Check the cache to see if we can vm_copy a filesystem-backed resource buffer.
RetainPtr<CFURLCacheRef> cache = adoptCF(CFURLCacheCopySharedURLCache());
@@ -90,6 +90,7 @@
abortInProgressLoad();
send(Messages::WebResourceLoader::DidReceiveResource(handle, currentTime()));
+#endif // __MAC_OS_X_VERSION_MIN_REQUIRED < 1090
}
size_t NetworkResourceLoader::fileBackedResourceMinimumSize()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
