[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[yuzo at google.com]

The following commit has been merged in the webkit-1.3 branch:
commit 931a4158e7b1cc0b30968a6d5147f95ddb926740
Author: yuzo at google.com <yuzo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 17 06:20:57 2011 +0000

    2011-01-13  Yuzo Fujishima  <yuzo at google.com>
    
            Reviewed by Antti Koivisto.
    
            Fix for Bug 52427 - Inconsistent use of m_cache in CachedResourceLoader
            https://bugs.webkit.org/show_bug.cgi?id=52427
    
            In constructor/destructor of CachedResourceLoader, m_cache has been
            used to call MemoryCache::addCachedResourceLoader/removeCachedResourceLoader
            while cache() is used everywhere else.
    
            Actually addCachedResourceLoader/removeCachedResourceLoader need not be called at all.
            Remove the call sites and make MemoryCache non-friend of CachedResourceLoader.
    
            No new tests because the behavior remains the same.
    
            * loader/cache/CachedResourceLoader.cpp:
            (WebCore::CachedResourceLoader::CachedResourceLoader):
            (WebCore::CachedResourceLoader::~CachedResourceLoader):
            * loader/cache/CachedResourceLoader.h:
            * loader/cache/MemoryCache.cpp:
            * loader/cache/MemoryCache.h:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75912 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 79cb8ba..87950c7 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,26 @@
+2011-01-13  Yuzo Fujishima  <yuzo at google.com>
+
+        Reviewed by Antti Koivisto.
+
+        Fix for Bug 52427 - Inconsistent use of m_cache in CachedResourceLoader
+        https://bugs.webkit.org/show_bug.cgi?id=52427
+
+        In constructor/destructor of CachedResourceLoader, m_cache has been
+        used to call MemoryCache::addCachedResourceLoader/removeCachedResourceLoader
+        while cache() is used everywhere else.
+
+        Actually addCachedResourceLoader/removeCachedResourceLoader need not be called at all.
+        Remove the call sites and make MemoryCache non-friend of CachedResourceLoader.
+
+        No new tests because the behavior remains the same.
+
+        * loader/cache/CachedResourceLoader.cpp:
+        (WebCore::CachedResourceLoader::CachedResourceLoader):
+        (WebCore::CachedResourceLoader::~CachedResourceLoader):
+        * loader/cache/CachedResourceLoader.h:
+        * loader/cache/MemoryCache.cpp:
+        * loader/cache/MemoryCache.h:
+
 2011-01-16  Adam Barth  <abarth at webkit.org>
 
         Rubber-stamped by Eric Seidel.
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.cpp b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
index 1291959..8a4c836 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.cpp
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.cpp
@@ -78,14 +78,12 @@ static CachedResource* createResource(CachedResource::Type type, const KURL& url
 }
 
 CachedResourceLoader::CachedResourceLoader(Document* document)
-    : m_cache(memoryCache())
-    , m_document(document)
+    : m_document(document)
     , m_requestCount(0)
     , m_autoLoadImages(true)
     , m_loadFinishing(false)
     , m_allowStaleResources(false)
 {
-    m_cache->addCachedResourceLoader(this);
 }
 
 CachedResourceLoader::~CachedResourceLoader()
@@ -95,7 +93,6 @@ CachedResourceLoader::~CachedResourceLoader()
     DocumentResourceMap::iterator end = m_documentResources.end();
     for (DocumentResourceMap::iterator it = m_documentResources.begin(); it != end; ++it)
         it->second->setOwningCachedResourceLoader(0);
-    m_cache->removeCachedResourceLoader(this);
 
     // Make sure no requests still point to this CachedResourceLoader
     ASSERT(m_requestCount == 0);
diff --git a/Source/WebCore/loader/cache/CachedResourceLoader.h b/Source/WebCore/loader/cache/CachedResourceLoader.h
index 2b90611..34ef700 100644
--- a/Source/WebCore/loader/cache/CachedResourceLoader.h
+++ b/Source/WebCore/loader/cache/CachedResourceLoader.h
@@ -50,7 +50,6 @@ class KURL;
 
 // The CachedResourceLoader manages the loading of scripts/images/stylesheets for a single document.
 class CachedResourceLoader : public Noncopyable {
-friend class MemoryCache;
 friend class ImageLoader;
 
 public:
@@ -118,7 +117,6 @@ private:
     void notifyLoadedFromMemoryCache(CachedResource*);
     bool canRequest(CachedResource::Type, const KURL&);
     
-    MemoryCache* m_cache;
     HashSet<String> m_validatedURLs;
     mutable DocumentResourceMap m_documentResources;
     Document* m_document;
diff --git a/Source/WebCore/loader/cache/MemoryCache.cpp b/Source/WebCore/loader/cache/MemoryCache.cpp
index 6689524..c0927f8 100644
--- a/Source/WebCore/loader/cache/MemoryCache.cpp
+++ b/Source/WebCore/loader/cache/MemoryCache.cpp
@@ -346,16 +346,6 @@ void MemoryCache::evict(CachedResource* resource)
         delete resource;
 }
 
-void MemoryCache::addCachedResourceLoader(CachedResourceLoader* cachedResourceLoader)
-{
-    m_cachedResourceLoaders.add(cachedResourceLoader);
-}
-
-void MemoryCache::removeCachedResourceLoader(CachedResourceLoader* cachedResourceLoader)
-{
-    m_cachedResourceLoaders.remove(cachedResourceLoader);
-}
-
 static inline unsigned fastLog2(unsigned i)
 {
     unsigned log2 = 0;
diff --git a/Source/WebCore/loader/cache/MemoryCache.h b/Source/WebCore/loader/cache/MemoryCache.h
index 287e097..e926d7c 100644
--- a/Source/WebCore/loader/cache/MemoryCache.h
+++ b/Source/WebCore/loader/cache/MemoryCache.h
@@ -181,9 +181,6 @@ private:
     bool makeResourcePurgeable(CachedResource*);
     void evict(CachedResource*);
 
-    // Member variables.
-    HashSet<CachedResourceLoader*> m_cachedResourceLoaders;
-
     bool m_disabled;  // Whether or not the cache is enabled.
     bool m_pruneEnabled;
     bool m_inPruneDeadResources;

-- 
WebKit Debian packaging