Changeset 145419 in webkit

Timestamp:

Mar 11, 2013 3:38:27 PM (11 years ago)

Author:

jpfau@apple.com

Message:

List cache partitions as units instead of as their contents
​https://bugs.webkit.org/show_bug.cgi?id=111909

Reviewed by Maciej Stachowiak.

Source/WebCore:

Not possible to test with current automated test tools, must be tested manually.

• loader/cache/MemoryCache.cpp:

(WebCore::MemoryCache::getOriginsWithCache): List a cache item as a member of a partition, if possible

Source/WebKit2:

• WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp:

(WebKit::WebResourceCacheManager::cfURLCacheHostNames): Attempt to enumerate cache partitions based on information we have

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/loader/cache/MemoryCache.cpp (modified) (1 diff)
• WebKit2/ChangeLog (modified) (1 diff)
• WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-11  Jeffrey Pfau  <jpfau@apple.com>
+
+        List cache partitions as units instead of as their contents
+        https://bugs.webkit.org/show_bug.cgi?id=111909
+
+        Reviewed by Maciej Stachowiak.
+
+        Not possible to test with current automated test tools, must be tested manually.
+
+        * loader/cache/MemoryCache.cpp:
+        (WebCore::MemoryCache::getOriginsWithCache): List a cache item as a member of a partition, if possible
+
 2013-03-11  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/loader/cache/MemoryCache.cpp

@@ -601 +601 @@
 void MemoryCache::getOriginsWithCache(SecurityOriginSet& origins)
 {
+#if ENABLE(CACHE_PARTITIONING)
+    DEFINE_STATIC_LOCAL(String, httpString, ("http"));
+#endif
     CachedResourceMap::iterator e = m_resources.end();
-    for (CachedResourceMap::iterator it = m_resources.begin(); it != e; ++it)
-#if ENABLE(CACHE_PARTITIONING)
-        origins.add(SecurityOrigin::createFromString(it->value->begin()->value->url()));
+    for (CachedResourceMap::iterator it = m_resources.begin(); it != e; ++it) {
+#if ENABLE(CACHE_PARTITIONING)
+        if (it->value->begin()->key == emptyString())
+            origins.add(SecurityOrigin::createFromString(it->value->begin()->value->url()));
+        else
+            origins.add(SecurityOrigin::create(httpString, it->value->begin()->key, 0));
 #else
         origins.add(SecurityOrigin::createFromString(it->value->url()));
 #endif
+    }
 }
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2013-03-11  Jeffrey Pfau  <jpfau@apple.com>
+
+        List cache partitions as units instead of as their contents
+        https://bugs.webkit.org/show_bug.cgi?id=111909
+
+        Reviewed by Maciej Stachowiak.
+
+        * WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp:
+        (WebKit::WebResourceCacheManager::cfURLCacheHostNames): Attempt to enumerate cache partitions based on information we have
+
 2013-01-30  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebKit2/WebProcess/ResourceCache/cf/WebResourceCacheManagerCFNet.cpp

@@ -58 +58 @@
 RetainPtr<CFArrayRef> WebResourceCacheManager::cfURLCacheHostNames()
 {
-    return RetainPtr<CFArrayRef>(AdoptCF, WKCFURLCacheCopyAllHostNamesInPersistentStore());
+    RetainPtr<CFArrayRef> hostNames(AdoptCF, WKCFURLCacheCopyAllHostNamesInPersistentStore());
+#if ENABLE(CACHE_PARTITIONING)
+    RetainPtr<CFMutableArrayRef> partitions(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
+    CFIndex size = CFArrayGetCount(hostNames.get());
+    for (CFIndex i = 0; i < size; ++i) {
+        RetainPtr<CFStringRef> partition = partitionName(static_cast<CFStringRef>(CFArrayGetValueAtIndex(hostNames.get(), i)));
+        RetainPtr<CFArrayRef> partitionHostNames(AdoptCF, WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(partition.get()));
+        if (CFArrayGetCount(partitionHostNames.get()))
+            CFArrayAppendValue(partitions.get(), partition.get());
+    }
+
+    RetainPtr<CFArrayRef> rootHostNames(AdoptCF, WKCFURLCacheCopyAllHostNamesInPersistentStoreForPartition(CFSTR("")));
+    CFArrayAppendArray(partitions.get(), rootHostNames.get(), CFRangeMake(0, CFArrayGetCount(rootHostNames.get())));
+    return partitions;
+#else
+    return hostNames;
+#endif
 }