Changeset 39725 in webkit

Timestamp:

Jan 8, 2009, 3:44:59 PM (18 years ago)

Author:

Antti Koivisto

Message:

2009-01-08 Antti Koivisto <Antti Koivisto>

Reviewed by Oliver Hunt.

Fix <rdar://problem/6467206>
Resources loaded from the memory cache do not get correctly inserted into the DocLoader resource map (22994)

Use CachedResourceHandle in document resource map so resources get updated correctly when using
using cache validation conditionals.

• loader/Cache.cpp: (WebCore::Cache::evict):
• loader/DocLoader.cpp: (WebCore::DocLoader::~DocLoader): (WebCore::DocLoader::requestResource): (WebCore::DocLoader::setAutoLoadImages): (WebCore::DocLoader::removeCachedResource):
• loader/DocLoader.h: (WebCore::DocLoader::cachedResource): (WebCore::DocLoader::allCachedResources):
• loader/DocumentLoader.cpp: (WebCore::DocumentLoader::getSubresources):
• loader/ImageLoader.cpp: (WebCore::ImageLoader::updateFromElement):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/Cache.cpp (modified) (2 diffs)
• loader/DocLoader.cpp (modified) (5 diffs)
• loader/DocLoader.h (modified) (3 diffs)
• loader/DocumentLoader.cpp (modified) (1 diff)
• loader/ImageLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-01-08  Antti Koivisto  <antti@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        Fix <rdar://problem/6467206> 
+        Resources loaded from the memory cache do not get correctly inserted into the DocLoader resource map (22994)
+        
+        Use CachedResourceHandle in document resource map so resources get updated correctly when using
+        using cache validation conditionals.
+
+        * loader/Cache.cpp:
+        (WebCore::Cache::evict):
+        * loader/DocLoader.cpp:
+        (WebCore::DocLoader::~DocLoader):
+        (WebCore::DocLoader::requestResource):
+        (WebCore::DocLoader::setAutoLoadImages):
+        (WebCore::DocLoader::removeCachedResource):
+        * loader/DocLoader.h:
+        (WebCore::DocLoader::cachedResource):
+        (WebCore::DocLoader::allCachedResources):
+        * loader/DocumentLoader.cpp:
+        (WebCore::DocumentLoader::getSubresources):
+        * loader/ImageLoader.cpp:
+        (WebCore::ImageLoader::updateFromElement):
+
 2009-01-08  Dimitri Glazkov  <dglazkov@chromium.org>
 

trunk/WebCore/loader/Cache.cpp

@@ -398 +398 @@
     // who needed a fresh copy for a reload. See <http://bugs.webkit.org/show_bug.cgi?id=12479#c6>.
     if (resource->inCache()) {
+        if (!resource->isCacheValidator()) {
+            // Notify all doc loaders that might be observing this object still that it has been
+            // extracted from the set of resources.
+            // No need to do this for cache validator resources, they are replaced automatically by using CachedResourceHandles.
+            HashSet<DocLoader*>::iterator end = m_docLoaders.end();
+            for (HashSet<DocLoader*>::iterator itr = m_docLoaders.begin(); itr != end; ++itr)
+                (*itr)->removeCachedResource(resource);
+        }
+        
         // Remove from the resource map.
         m_resources.remove(resource->url());
@@ -405 +414 @@
         removeFromLRUList(resource);
         removeFromLiveDecodedResourcesList(resource);
-        
-        // Notify all doc loaders that might be observing this object still that it has been
-        // extracted from the set of resources.
-        HashSet<DocLoader*>::iterator end = m_docLoaders.end();
-        for (HashSet<DocLoader*>::iterator itr = m_docLoaders.begin(); itr != end; ++itr)
-            (*itr)->removeCachedResource(resource);
 
         // Subtract from our size totals.

trunk/WebCore/loader/DocLoader.cpp

@@ -61 +61 @@
 {
     clearPreloads();
-    HashMap<String, CachedResource*>::iterator end = m_docResources.end();
-    for (HashMap<String, CachedResource*>::iterator it = m_docResources.begin(); it != end; ++it)
+    DocumentResourceMap::iterator end = m_documentResources.end();
+    for (DocumentResourceMap::iterator it = m_documentResources.begin(); it != end; ++it)
         it->second->setDocLoader(0);
     m_cache->removeDocLoader(this);
@@ -196 +196 @@
 
     if (cache()->disabled()) {
-        HashMap<String, CachedResource*>::iterator it = m_docResources.find(fullURL.string());
+        DocumentResourceMap::iterator it = m_documentResources.find(fullURL.string());
         
-        if (it != m_docResources.end()) {
+        if (it != m_documentResources.end()) {
             it->second->setDocLoader(0);
-            m_docResources.remove(it);
+            m_documentResources.remove(it);
         }
     }
@@ -213 +213 @@
             return 0;
 
-        m_docResources.set(resource->url(), resource);
+        m_documentResources.set(resource->url(), resource);
         checkCacheObjectStatus(resource);
     }
@@ -253 +253 @@
         return;
 
-    HashMap<String, CachedResource*>::iterator end = m_docResources.end();
-    for (HashMap<String, CachedResource*>::iterator it = m_docResources.begin(); it != end; ++it) {
-        CachedResource* resource = it->second;
+    DocumentResourceMap::iterator end = m_documentResources.end();
+    for (DocumentResourceMap::iterator it = m_documentResources.begin(); it != end; ++it) {
+        CachedResource* resource = it->second.get();
         if (resource->type() == CachedResource::ImageResource) {
             CachedImage* image = const_cast<CachedImage*>(static_cast<const CachedImage*>(resource));
@@ -272 +272 @@
 void DocLoader::removeCachedResource(CachedResource* resource) const
 {
-    m_docResources.remove(resource->url());
+    m_documentResources.remove(resource->url());
 }
 

trunk/WebCore/loader/DocLoader.h

@@ -27 +27 @@
 
 #include "CachedResource.h"
+#include "CachedResourceHandle.h"
 #include "CachePolicy.h"
 #include "StringHash.h"
@@ -71 +72 @@
     void printAccessDeniedMessage(const KURL& url) const;
 
-    CachedResource* cachedResource(const String& url) const { return m_docResources.get(url); }
-    const HashMap<String, CachedResource*>& allCachedResources() const { return m_docResources; }
+    CachedResource* cachedResource(const String& url) const { return m_documentResources.get(url).get(); }
+    
+    typedef HashMap<String, CachedResourceHandle<CachedResource> > DocumentResourceMap;
+    const DocumentResourceMap& allCachedResources() const { return m_documentResources; }
 
     bool autoLoadImages() const { return m_autoLoadImages; }
@@ -112 +115 @@
     Cache* m_cache;
     HashSet<String> m_reloadedURLs;
-    mutable HashMap<String, CachedResource*> m_docResources;
+    mutable DocumentResourceMap m_documentResources;
     Document* m_doc;
     

trunk/WebCore/loader/DocumentLoader.cpp

@@ -565 +565 @@
         return;
 
-    const HashMap<String, CachedResource*>& allResources = document->docLoader()->allCachedResources();
-    HashMap<String, CachedResource*>::const_iterator end = allResources.end();
-    for (HashMap<String, CachedResource*>::const_iterator it = allResources.begin(); it != end; ++it) {
+    const DocLoader::DocumentResourceMap& allResources = document->docLoader()->allCachedResources();
+    DocLoader::DocumentResourceMap::const_iterator end = allResources.end();
+    for (DocLoader::DocumentResourceMap::const_iterator it = allResources.begin(); it != end; ++it) {
         RefPtr<ArchiveResource> subresource = this->subresource(KURL(it->second->url()));
         if (subresource)

trunk/WebCore/loader/ImageLoader.cpp

@@ -102 +102 @@
             newImage->setLoading(true);
             newImage->setDocLoader(doc->docLoader());
-            doc->docLoader()->m_docResources.set(newImage->url(), newImage);
+            doc->docLoader()->m_documentResources.set(newImage->url(), newImage);
         } else
             newImage = doc->docLoader()->requestImage(sourceURI(attr));