Remove ApplicationCacheGroup::m_isCopy

https://bugs.webkit.org/show_bug.cgi?id=143536

Reviewed by Tim Horton.

Code that used to set m_isCopy to true is long gone.

* loader/appcache/ApplicationCache.cpp:
(WebCore::ApplicationCache::~ApplicationCache):
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::ApplicationCacheGroup):
(WebCore::ApplicationCacheGroup::~ApplicationCacheGroup):
* loader/appcache/ApplicationCacheGroup.h:
(WebCore::ApplicationCacheGroup::isCopy): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@182570 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c00099e..d7d1044 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,5 +1,22 @@
 2015-04-08  Anders Carlsson  <andersca@apple.com>
 
+        Remove ApplicationCacheGroup::m_isCopy
+        https://bugs.webkit.org/show_bug.cgi?id=143536
+
+        Reviewed by Tim Horton.
+
+        Code that used to set m_isCopy to true is long gone.
+
+        * loader/appcache/ApplicationCache.cpp:
+        (WebCore::ApplicationCache::~ApplicationCache):
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::ApplicationCacheGroup):
+        (WebCore::ApplicationCacheGroup::~ApplicationCacheGroup):
+        * loader/appcache/ApplicationCacheGroup.h:
+        (WebCore::ApplicationCacheGroup::isCopy): Deleted.
+
+2015-04-08  Anders Carlsson  <andersca@apple.com>
+
         Delete ApplicationCache static member functions
         https://bugs.webkit.org/show_bug.cgi?id=143534
 

diff --git a/Source/WebCore/loader/appcache/ApplicationCache.cpp b/Source/WebCore/loader/appcache/ApplicationCache.cpp
index a13e690..235ea7e 100644 (file)
--- a/Source/WebCore/loader/appcache/ApplicationCache.cpp
+++ b/Source/WebCore/loader/appcache/ApplicationCache.cpp
@@ -52,7 +52,7 @@ ApplicationCache::ApplicationCache()
 
 ApplicationCache::~ApplicationCache()
 {
-    if (m_group && !m_group->isCopy())
+    if (m_group)
         m_group->cacheDestroyed(this);
 }
     

diff --git a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
index a5be01b..96793e7 100644 (file)
--- a/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
+++ b/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp
@@ -50,7 +50,7 @@
 
 namespace WebCore {
 
-ApplicationCacheGroup::ApplicationCacheGroup(const URL& manifestURL, bool isCopy)
+ApplicationCacheGroup::ApplicationCacheGroup(const URL& manifestURL)
     : m_manifestURL(manifestURL)
     , m_origin(SecurityOrigin::create(manifestURL))
     , m_updateStatus(Idle)
@@ -61,7 +61,6 @@ ApplicationCacheGroup::ApplicationCacheGroup(const URL& manifestURL, bool isCopy
     , m_storageID(0)
     , m_isObsolete(false)
     , m_completionType(None)
-    , m_isCopy(isCopy)
     , m_calledReachedMaxAppCacheSize(false)
     , m_availableSpaceInQuota(ApplicationCacheStorage::unknownQuota())
     , m_originQuotaExceededPreviously(false)
@@ -70,18 +69,6 @@ ApplicationCacheGroup::ApplicationCacheGroup(const URL& manifestURL, bool isCopy
 
 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_pendingMasterResourceLoaders.isEmpty());
-        ASSERT(m_newestCache->group() == this);
-        
-        return;
-    }
-               
     ASSERT(!m_newestCache);
     ASSERT(m_caches.isEmpty());
     

diff --git a/Source/WebCore/loader/appcache/ApplicationCacheGroup.h b/Source/WebCore/loader/appcache/ApplicationCacheGroup.h
index de99c5b..5ed0fe7 100644 (file)
--- a/Source/WebCore/loader/appcache/ApplicationCacheGroup.h
+++ b/Source/WebCore/loader/appcache/ApplicationCacheGroup.h
@@ -52,7 +52,7 @@ enum ApplicationCacheUpdateOption {
 class ApplicationCacheGroup : ResourceHandleClient {
     WTF_MAKE_NONCOPYABLE(ApplicationCacheGroup); WTF_MAKE_FAST_ALLOCATED;
 public:
-    ApplicationCacheGroup(const URL& manifestURL, bool isCopy = false);    
+    explicit ApplicationCacheGroup(const URL& manifestURL);
     virtual ~ApplicationCacheGroup();
     
     enum UpdateStatus { Idle, Checking, Downloading };
@@ -92,8 +92,6 @@ public:
 
     void disassociateDocumentLoader(DocumentLoader*);
 
-    bool isCopy() const { return m_isCopy; }
-
 private:
     static void postListenerTask(ApplicationCacheHost::EventID id, const HashSet<DocumentLoader*>& set) { postListenerTask(id, 0, 0, set); }
     static void postListenerTask(ApplicationCacheHost::EventID id, DocumentLoader* loader)  { postListenerTask(id, 0, 0, loader); }
@@ -179,9 +177,6 @@ private:
     };
     CompletionType m_completionType;
 
-    // Whether this cache group is a copy that's only used for transferring the cache to another file.
-    bool m_isCopy;
-
     // This flag is set immediately after the ChromeClient::reachedMaxAppCacheSize() callback is invoked as a result of the storage layer failing to save a cache
     // due to reaching the maximum size of the application cache database file. This flag is used by ApplicationCacheGroup::checkIfLoadIsComplete() to decide
     // the course of action in case of this failure (i.e. call the ChromeClient callback or run the failure steps).