Changeset 102085 in webkit

Timestamp:

Dec 5, 2011, 6:55:47 PM (15 years ago)

Author:

Darin Adler

Message:

Use HashMap<OwnPtr> in CrossOriginPreflightResultCache
​https://bugs.webkit.org/show_bug.cgi?id=73785

Reviewed by Andreas Kling.

• loader/CrossOriginPreflightResultCache.cpp:

(WebCore::CrossOriginPreflightResultCache::appendEntry): Changed code to use set
instead of add, since it wants to replace existing entries. Also removed leakPtr
and removed the FIXME that documented the memory leak now fixed here.
(WebCore::CrossOriginPreflightResultCache::canSkipPreflight): Removed unneeded
std:: prefix here and also unneeded explicit delete call.
(WebCore::CrossOriginPreflightResultCache::empty): Removed unneeded deleteAllValues
call here.

• loader/CrossOriginPreflightResultCache.h: Make mapped value of the

CrossOriginPreflightResultHashMap be OwnPtr instead of raw pointer.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/CrossOriginPreflightResultCache.cpp (modified) (4 diffs)
• loader/CrossOriginPreflightResultCache.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-05  Darin Adler  <darin@apple.com>
+
+        Use HashMap<OwnPtr> in CrossOriginPreflightResultCache
+        https://bugs.webkit.org/show_bug.cgi?id=73785
+
+        Reviewed by Andreas Kling.
+
+        * loader/CrossOriginPreflightResultCache.cpp:
+        (WebCore::CrossOriginPreflightResultCache::appendEntry): Changed code to use set
+        instead of add, since it wants to replace existing entries. Also removed leakPtr
+        and removed the FIXME that documented the memory leak now fixed here.
+        (WebCore::CrossOriginPreflightResultCache::canSkipPreflight): Removed unneeded
+        std:: prefix here and also unneeded explicit delete call.
+        (WebCore::CrossOriginPreflightResultCache::empty): Removed unneeded deleteAllValues
+        call here.
+
+        * loader/CrossOriginPreflightResultCache.h: Make mapped value of the
+        CrossOriginPreflightResultHashMap be OwnPtr instead of raw pointer.
+
 2011-12-05  Darin Adler  <darin@apple.com>
 

trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.cpp

@@ -160 +160 @@
 {
     ASSERT(isMainThread());
-    CrossOriginPreflightResultCacheItem* resultPtr = preflightResult.leakPtr();
-    pair<CrossOriginPreflightResultHashMap::iterator, bool> addResult = m_preflightHashMap.add(make_pair(origin, url), resultPtr);
-    if (!addResult.second) {
-        // FIXME: We need to delete the old value before replacing with the new one.
-        addResult.first->second = resultPtr;
-    }
+    m_preflightHashMap.set(make_pair(origin, url), preflightResult);
 }
 
@@ -171 +166 @@
 {
     ASSERT(isMainThread());
-    CrossOriginPreflightResultHashMap::iterator cacheIt = m_preflightHashMap.find(std::make_pair(origin, url));
+    CrossOriginPreflightResultHashMap::iterator cacheIt = m_preflightHashMap.find(make_pair(origin, url));
     if (cacheIt == m_preflightHashMap.end())
         return false;
@@ -178 +173 @@
         return true;
 
-    delete cacheIt->second;
     m_preflightHashMap.remove(cacheIt);
     return false;
@@ -186 +180 @@
 {
     ASSERT(isMainThread());
-    deleteAllValues(m_preflightHashMap);
     m_preflightHashMap.clear();
 }

trunk/Source/WebCore/loader/CrossOriginPreflightResultCache.h

@@ -79 +79 @@
         CrossOriginPreflightResultCache() { }
 
-        typedef HashMap<std::pair<String, KURL>, CrossOriginPreflightResultCacheItem*> CrossOriginPreflightResultHashMap;
+        typedef HashMap<std::pair<String, KURL>, OwnPtr<CrossOriginPreflightResultCacheItem> > CrossOriginPreflightResultHashMap;
 
         CrossOriginPreflightResultHashMap m_preflightHashMap;