Changeset 429 for trunk/WebCore/loader/appcache/ApplicationCacheStorage.cpp

Timestamp:

08/04/08 12:23:14 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35534

Files:

• trunk/WebCore/loader/appcache/ApplicationCacheStorage.cpp (modified) (7 diffs)

trunk/WebCore/loader/appcache/ApplicationCacheStorage.cpp

@@ -436 +436 @@
-        return false;
-    
+    resource->setStorageID(resourceId);
-    return true;
-}
@@ -454 +455 @@
-}
-
-void
+bool
-{
-    openDatabase(true);
@@ -465 +466 @@
-        // Store the group
-        if (!store(group))
-
+ false
-    }
-    
@@ -473 +474 @@
-    // Store the newest cache
-    if (!store(group->newestCache()))
-
+ false
-    
-    // Update the newest cache in the group.
@@ -479 +480 @@
-    SQLiteStatement statement(m_database, "UPDATE CacheGroups SET newestCache=? WHERE id=?");
-    if (statement.prepare() != SQLResultOk)
-
+ false
-    
-    statement.bindInt64(1, group->newestCache()->storageID());
@@ -485 +486 @@
-    
-    if (!executeStatement(statement))
-
+ false
-    
-    storeCacheTransaction.commit();
+    return true;
-}
-
@@ -618 +620 @@
-}    
-
+bool ApplicationCacheStorage::storeCopyOfCache(const String& cacheDirectory, ApplicationCache* cache)
+{
+    // Create a new cache.
+    RefPtr<ApplicationCache> cacheCopy = ApplicationCache::create();
+    
+    // Set the online whitelist
+    cacheCopy->setOnlineWhitelist(cache->onlineWhitelist());
+    
+    // Traverse the cache and add copies of all resources.
+    ApplicationCache::ResourceMap::const_iterator end = cache->end();
+    for (ApplicationCache::ResourceMap::const_iterator it = cache->begin(); it != end; ++it) {
+        ApplicationCacheResource* resource = it->second.get();
+        
+        RefPtr<ApplicationCacheResource> resourceCopy = ApplicationCacheResource::create(resource->url(), resource->response(), resource->type(), resource->data());
+        
+        cacheCopy->addResource(resourceCopy.release());
+    }
+    
+    // Now create a new cache group.
+    OwnPtr<ApplicationCacheGroup> groupCopy(new ApplicationCacheGroup(cache->group()->manifestURL(), true));
+    
+    groupCopy->setNewestCache(cacheCopy);
+    
+    ApplicationCacheStorage copyStorage;
+    copyStorage.setCacheDirectory(cacheDirectory);
+    
+    // Empty the cache in case something was there before.
+    copyStorage.empty();
+    
+    return copyStorage.storeNewestCache(groupCopy.get());
+}
+    
-ApplicationCacheStorage& cacheStorage()
-{