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

Timestamp:

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

Author:

mbensi

Message:

merge with webkit revision 35534

Files:

• trunk/WebCore/loader/appcache/ApplicationCacheGroup.cpp (modified) (3 diffs)

trunk/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -45 +45 @@
-namespace WebCore {
-
-
+, bool isCopy
-    : m_manifestURL(manifestURL)
-    , m_status(Idle)
@@ -51 +51 @@
-    , m_frame(0)
-    , m_storageID(0)
+    , m_isCopy(isCopy)
-{
-}
@@ -56 +57 @@
-ApplicationCacheGroup::~ApplicationCacheGroup()
-{
+    if (m_isCopy) {
+        ASSERT(m_newestCache);
+        ASSERT(m_caches.size() == 1);
+        ASSERT(m_caches.contains(m_newestCache.get()));
+        ASSERT(!m_cacheBeingUpdated);
+        ASSERT(m_associatedDocumentLoaders.isEmpty());
+        ASSERT(m_cacheCandidates.isEmpty());
+        ASSERT(m_newestCache->group() == this);
+        
+        return;
+    }
+               
-    ASSERT(!m_newestCache);
-    ASSERT(m_caches.isEmpty());