Changeset 76611 in webkit for trunk/Source/JavaScriptCore/parser/SourceProvider.h

Timestamp:

Jan 25, 2011, 10:44:11 AM (14 years ago)

Author:

Antti Koivisto

Message:

REGRESSION: Leak in JSParser::Scope::copyCapturedVariablesToVector()
​https://bugs.webkit.org/show_bug.cgi?id=53061

Reviewed by Oliver Hunt.

Cache did not know about the subclass so failed to fully delete the items.
Got rid of the subclass and moved the classes to separate files.

• CMakeLists.txt:
• GNUmakefile.am:
• JavaScriptCore.exp:
• JavaScriptCore.gypi:
• JavaScriptCore.pro:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• parser/JSParser.cpp:

(JSC::JSParser::Scope::saveFunctionInfo):
(JSC::JSParser::Scope::restoreFunctionInfo):
(JSC::JSParser::findCachedFunctionInfo):
(JSC::JSParser::parseFunctionInfo):

• parser/SourceProvider.h:
• parser/SourceProviderCache.cpp: Added.

(JSC::SourceProviderCache::~SourceProviderCache):
(JSC::SourceProviderCache::byteSize):

• parser/SourceProviderCache.h: Added.

(JSC::SourceProviderCache::SourceProviderCache):
(JSC::SourceProviderCache::add):
(JSC::SourceProviderCache::get):

• parser/SourceProviderCacheItem.h: Added.

(JSC::SourceProviderCacheItem::SourceProviderCacheItem):
(JSC::SourceProviderCacheItem::approximateByteSize):
(JSC::SourceProviderCacheItem::closeBraceToken):

File:

• trunk/Source/JavaScriptCore/parser/SourceProvider.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/parser/SourceProvider.h

@@ -30 +30 @@
 #define SourceProvider_h
 
+#include "SourceProviderCache.h"
 #include "UString.h"
-#include <wtf/HashMap.h>
 #include <wtf/PassOwnPtr.h>
 #include <wtf/RefCounted.h>
@@ -37 +37 @@
 #include <wtf/text/TextPosition.h>
 
-
 namespace JSC {
-
-    class SourceProviderCache {
-    public:
-        struct Item {};
-
-        SourceProviderCache() : m_contentByteSize(0) {}
-        ~SourceProviderCache() { deleteAllValues(m_map); }
-        
-        unsigned byteSize() const { return m_contentByteSize + sizeof(*this) + m_map.capacity() * sizeof(Item*); } 
-        void add(int sourcePosition, PassOwnPtr<Item> item, unsigned size) { m_map.add(sourcePosition, item.leakPtr()); m_contentByteSize += size; }
-        const Item* get(int sourcePosition) const { return m_map.get(sourcePosition); }
-
-    private:
-        HashMap<int, Item*> m_map;
-        unsigned m_contentByteSize;
-    };
 
     class SourceProvider : public RefCounted<SourceProvider> {