Title: [164516] trunk
- Revision
- 164516
- Author
- jp...@apple.com
- Date
- 2014-02-21 16:31:23 -0800 (Fri, 21 Feb 2014)
Log Message
[Mac] Cache callbacks for cache partitioning may be passed null
https://bugs.webkit.org/show_bug.cgi?id=129175
Reviewed by Brady Eidson.
Source/WebKit2:
* WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp:
(WebKit::WebResourceCacheManager::cfURLCacheHostNamesWithCallback):
WebKitLibraries:
* libWebKitSystemInterfaceLion.a:
* libWebKitSystemInterfaceMavericks.a:
* libWebKitSystemInterfaceMountainLion.a:
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (164515 => 164516)
--- trunk/Source/WebKit2/ChangeLog 2014-02-22 00:28:49 UTC (rev 164515)
+++ trunk/Source/WebKit2/ChangeLog 2014-02-22 00:31:23 UTC (rev 164516)
@@ -1,3 +1,13 @@
+2014-02-21 Jeffrey Pfau <jp...@apple.com>
+
+ [Mac] Cache callbacks for cache partitioning may be passed null
+ https://bugs.webkit.org/show_bug.cgi?id=129175
+
+ Reviewed by Brady Eidson.
+
+ * WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp:
+ (WebKit::WebResourceCacheManager::cfURLCacheHostNamesWithCallback):
+
2014-02-21 Benjamin Poulain <bpoul...@apple.com>
[iOS][WK2] Update the visible content rects on zoom
Modified: trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp (164515 => 164516)
--- trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp 2014-02-22 00:28:49 UTC (rev 164515)
+++ trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp 2014-02-22 00:31:23 UTC (rev 164516)
@@ -66,8 +66,10 @@
WKCFURLCacheCopyAllPartitionNames(^(CFArrayRef partitionNames) {
RetainPtr<CFArrayRef> hostNamesInPersistentStore = adoptCF(WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(CFSTR("")));
RetainPtr<CFMutableArrayRef> hostNames = adoptCF(CFArrayCreateMutableCopy(0, 0, hostNamesInPersistentStore.get()));
- CFArrayAppendArray(hostNames.get(), partitionNames, CFRangeMake(0, CFArrayGetCount(partitionNames)));
- CFRelease(partitionNames);
+ if (partitionNames) {
+ CFArrayAppendArray(hostNames.get(), partitionNames, CFRangeMake(0, CFArrayGetCount(partitionNames)));
+ CFRelease(partitionNames);
+ }
callback(std::move(hostNames));
});
}
Modified: trunk/WebKitLibraries/ChangeLog (164515 => 164516)
--- trunk/WebKitLibraries/ChangeLog 2014-02-22 00:28:49 UTC (rev 164515)
+++ trunk/WebKitLibraries/ChangeLog 2014-02-22 00:31:23 UTC (rev 164516)
@@ -1,3 +1,14 @@
+2014-02-21 Jeffrey Pfau <jp...@apple.com>
+
+ [Mac] Cache callbacks for cache partitioning may be passed null
+ https://bugs.webkit.org/show_bug.cgi?id=129175
+
+ Reviewed by Brady Eidson.
+
+ * libWebKitSystemInterfaceLion.a:
+ * libWebKitSystemInterfaceMavericks.a:
+ * libWebKitSystemInterfaceMountainLion.a:
+
2014-02-11 Roger Fong <roger_f...@apple.com>
[Windows] Set ENABLE_CSS_SHAPE_INSIDE feature flag on Windows.
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceLion.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceMavericks.a
(Binary files differ)
Modified: trunk/WebKitLibraries/libWebKitSystemInterfaceMountainLion.a
(Binary files differ)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
