Title: [182570] trunk/Source/WebCore
- Revision
- 182570
- Author
- [email protected]
- Date
- 2015-04-08 14:25:41 -0700 (Wed, 08 Apr 2015)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (182569 => 182570)
--- trunk/Source/WebCore/ChangeLog 2015-04-08 21:17:50 UTC (rev 182569)
+++ trunk/Source/WebCore/ChangeLog 2015-04-08 21:25:41 UTC (rev 182570)
@@ -1,5 +1,22 @@
2015-04-08 Anders Carlsson <[email protected]>
+ 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 <[email protected]>
+
Delete ApplicationCache static member functions
https://bugs.webkit.org/show_bug.cgi?id=143534
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp (182569 => 182570)
--- trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-04-08 21:17:50 UTC (rev 182569)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCache.cpp 2015-04-08 21:25:41 UTC (rev 182570)
@@ -52,7 +52,7 @@
ApplicationCache::~ApplicationCache()
{
- if (m_group && !m_group->isCopy())
+ if (m_group)
m_group->cacheDestroyed(this);
}
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (182569 => 182570)
--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2015-04-08 21:17:50 UTC (rev 182569)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp 2015-04-08 21:25:41 UTC (rev 182570)
@@ -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 @@
, 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()
{
- 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());
Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h (182569 => 182570)
--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2015-04-08 21:17:50 UTC (rev 182569)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h 2015-04-08 21:25:41 UTC (rev 182570)
@@ -52,7 +52,7 @@
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 @@
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 @@
};
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).
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
