Changeset 90947 in webkit

Timestamp:

Jul 13, 2011 2:40:40 PM (13 years ago)

Author:

Joseph Pecoraro

Message:

Some ApplicationCache Origin Cleanup
​https://bugs.webkit.org/show_bug.cgi?id=64431

Reviewed by Alexey Proskuryakov.

2011-07-13 Joseph Pecoraro <Joseph Pecoraro>

• m_loadedSize is inaccurate. This just replaces it with calls to ApplicationCache::estimatedSizeInStorage.

• m_availableSpaceInQuota can get out of date, so we just recalculate it at the start of appcache downloads.

• loader/appcache/ApplicationCacheGroup.h:
• loader/appcache/ApplicationCacheGroup.cpp: (WebCore::ApplicationCacheGroup::ApplicationCacheGroup): (WebCore::ApplicationCacheGroup::didReceiveData): Remove references to m_loadedSize.

(WebCore::ApplicationCacheGroup::didFinishLoading):
Replace m_loadedSize with estimatedSizeInStorage after we
add the new cached resource to the cache. The calculation
already happened so this check is fast.

(WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
When we start the Downloading phase, recalculate the quota
so that we have an up to date quota value so that we can
break early if needed.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/appcache/ApplicationCacheGroup.cpp (modified) (7 diffs)
• loader/appcache/ApplicationCacheGroup.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-13  Joseph Pecoraro  <joepeck@webkit.org>
+
+        Some ApplicationCache Origin Cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=64431
+
+        Reviewed by Alexey Proskuryakov.
+
+        - m_loadedSize is inaccurate. This just replaces it with
+        calls to ApplicationCache::estimatedSizeInStorage.
+
+        - m_availableSpaceInQuota can get out of date, so we just
+        recalculate it at the start of appcache downloads.
+
+        * loader/appcache/ApplicationCacheGroup.h:
+        * loader/appcache/ApplicationCacheGroup.cpp:
+        (WebCore::ApplicationCacheGroup::ApplicationCacheGroup):
+        (WebCore::ApplicationCacheGroup::didReceiveData):
+        Remove references to m_loadedSize.
+
+        (WebCore::ApplicationCacheGroup::didFinishLoading):
+        Replace m_loadedSize with estimatedSizeInStorage after we
+        add the new cached resource to the cache. The calculation
+        already happened so this check is fast.
+
+        (WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
+        When we start the Downloading phase, recalculate the quota
+        so that we have an up to date quota value so that we can
+        break early if needed.
+
 2011-07-12  Brent Fulgham  <bfulgham@webkit.org>
 

trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp

@@ -71 +71 @@
     , m_isCopy(isCopy)
     , m_calledReachedMaxAppCacheSize(false)
-    , m_loadedSize(0)
     , m_availableSpaceInQuota(ApplicationCacheStorage::unknownQuota())
     , m_originQuotaExceededPreviously(false)
@@ -584 +583 @@
     ASSERT(m_currentResource);
     m_currentResource->data()->append(data, length);
-
-    m_loadedSize += length;
 }
 
@@ -599 +596 @@
     }
 
-    // After finishing the loading of any resource, we check if it will
-    // fit in our last known quota limit.
-    // FIXME: The quota could be changed by another appcache in the same origin.
-    if (m_availableSpaceInQuota == ApplicationCacheStorage::unknownQuota())
-        recalculateAvailableSpaceInQuota();
+    ASSERT(m_currentHandle == handle);
+    ASSERT(m_pendingEntries.contains(handle->firstRequest().url()));
+    
+    m_pendingEntries.remove(handle->firstRequest().url());
+    
+    ASSERT(m_cacheBeingUpdated);
+
+    m_cacheBeingUpdated->addResource(m_currentResource.release());
+    m_currentHandle = 0;
 
     // While downloading check to see if we have exceeded the available quota.
@@ -610 +611 @@
     // of the quota being reached and decided not to increase it then.
     // FIXME: Should we break earlier and prevent redownloading on later page loads?
-    // We could then also get rid of m_loadedSize.
-    if (m_originQuotaExceededPreviously && m_availableSpaceInQuota < m_loadedSize) {
+    if (m_originQuotaExceededPreviously && m_availableSpaceInQuota < m_cacheBeingUpdated->estimatedSizeInStorage()) {
         m_currentResource = 0;
         m_frame->domWindow()->console()->addMessage(OtherMessageSource, LogMessageType, ErrorMessageLevel, "Application Cache update failed, because size quota was exceeded.", 0, String());
@@ -617 +617 @@
         return;
     }
-
-    ASSERT(m_currentHandle == handle);
-    ASSERT(m_pendingEntries.contains(handle->firstRequest().url()));
-    
-    m_pendingEntries.remove(handle->firstRequest().url());
-    
-    ASSERT(m_cacheBeingUpdated);
-
-    m_cacheBeingUpdated->addResource(m_currentResource.release());
-    m_currentHandle = 0;
     
     // Load the next resource, if any.
@@ -787 +777 @@
     m_progressDone = 0;
 
+    recalculateAvailableSpaceInQuota();
+
     startLoadingEntry();
 }
@@ -984 +976 @@
     setUpdateStatus(Idle);
     m_frame = 0;
-    m_loadedSize = 0;
     m_availableSpaceInQuota = ApplicationCacheStorage::unknownQuota();
     m_calledReachedMaxAppCacheSize = false;

trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.h

@@ -200 +200 @@
     RefPtr<ResourceHandle> m_manifestHandle;
 
-    int64_t m_loadedSize;
     int64_t m_availableSpaceInQuota;
     bool m_originQuotaExceededPreviously;