Changeset 78297 in webkit for trunk/Source/JavaScriptCore/parser/SourceProviderCache.cpp

Timestamp:

Feb 10, 2011, 6:10:16 PM (14 years ago)

Author:

[email protected]

Message:

2011-02-10 Michael Saboff <​[email protected]>

Reviewed by Geoffrey Garen.

Cached JavaScript Parser Data Being Left in Memory Cache
​https://bugs.webkit.org/show_bug.cgi?id=54245

Added clear method which removes SourceProviderCache items.
Cleaned up extraneous whitespace.

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• parser/SourceProviderCache.cpp: (JSC::SourceProviderCache::~SourceProviderCache): (JSC::SourceProviderCache::clear): (JSC::SourceProviderCache::byteSize): (JSC::SourceProviderCache::add):
• parser/SourceProviderCache.h:

2011-02-10 Michael Saboff <​[email protected]>

Reviewed by Geoffrey Garen.

Cached JavaScript Parser Data Being Left in Memory Cache
​https://bugs.webkit.org/show_bug.cgi?id=54245

Added logic in CachedScript to clear SourceProviderCache data in
destroyDecodedData(). Added and changed CachedScript timeout to
act similar to CachedImage. Changed didAddClient to call super
class method instead of duplicating the logic in the derived
classes.

• loader/cache/CachedImage.cpp: (WebCore::CachedImage::didAddClient):
• loader/cache/CachedScript.cpp: (WebCore::CachedScript::didAddClient): (WebCore::CachedScript::allClientsRemoved): (WebCore::CachedScript::script): (WebCore::CachedScript::destroyDecodedData):
• loader/cache/CachedScript.h:

File:

• trunk/Source/JavaScriptCore/parser/SourceProviderCache.cpp (modified) (1 diff)

trunk/Source/JavaScriptCore/parser/SourceProviderCache.cpp

@@ -33 +33 @@
 SourceProviderCache::~SourceProviderCache()
 {
+    clear();
+}
+
+void SourceProviderCache::clear()
+{
     deleteAllValues(m_map);
+    m_map.clear();
+    m_contentByteSize = 0;
 }
-    
+
 unsigned SourceProviderCache::byteSize() const
 { 
-    return m_contentByteSize + sizeof(*this) + m_map.capacity() * sizeof(SourceProviderCacheItem*); 
+    return m_contentByteSize + sizeof(*this) + m_map.capacity() * sizeof(SourceProviderCacheItem*);
 }
-    
+
 void SourceProviderCache::add(int sourcePosition, PassOwnPtr<SourceProviderCacheItem> item, unsigned size)
 {
-    m_map.add(sourcePosition, item.leakPtr()); 
-    m_contentByteSize += size; 
+    m_map.add(sourcePosition, item.leakPtr());
+    m_contentByteSize += size;
 }