Imported WebKit commit 75bb2fc5882d2e1b3d5572c2961507996cbca5e3 (http://svn.webkit.org/repository/webkit/trunk@104681)

3 files changed, 4 insertions, 8 deletions

diff --git a/Source/JavaScriptCore/parser/Parser.cpp b/Source/JavaScriptCore/parser/Parser.cpp
index 7fb285a6b..5c2f0383f 100644
--- a/Source/JavaScriptCore/parser/Parser.cpp
+++ b/Source/JavaScriptCore/parser/Parser.cpp
@@ -30,7 +30,6 @@
 #include "Lexer.h"
 #include "NodeInfo.h"
 #include "SourceProvider.h"
-#include "SourceProviderCacheItem.h"
 #include <utility>
 #include <wtf/HashFunctions.h>
 #include <wtf/OwnPtr.h>
diff --git a/Source/JavaScriptCore/parser/SourceProviderCache.cpp b/Source/JavaScriptCore/parser/SourceProviderCache.cpp
index afeec5283..ad1cbe02e 100644
--- a/Source/JavaScriptCore/parser/SourceProviderCache.cpp
+++ b/Source/JavaScriptCore/parser/SourceProviderCache.cpp
@@ -26,8 +26,6 @@
 #include "config.h"
 #include "SourceProviderCache.h"
 
-#include "SourceProviderCacheItem.h"
-
 namespace JSC {
 
 SourceProviderCache::~SourceProviderCache()
@@ -37,7 +35,6 @@ SourceProviderCache::~SourceProviderCache()
 
 void SourceProviderCache::clear()
 {
-    deleteAllValues(m_map);
     m_map.clear();
     m_contentByteSize = 0;
 }
@@ -49,7 +46,7 @@ unsigned SourceProviderCache::byteSize() const
 
 void SourceProviderCache::add(int sourcePosition, PassOwnPtr<SourceProviderCacheItem> item, unsigned size)
 {
-    m_map.add(sourcePosition, item.leakPtr());
+    m_map.add(sourcePosition, item);
     m_contentByteSize += size;
 }
 
diff --git a/Source/JavaScriptCore/parser/SourceProviderCache.h b/Source/JavaScriptCore/parser/SourceProviderCache.h
index c7f332d38..e94230d10 100644
--- a/Source/JavaScriptCore/parser/SourceProviderCache.h
+++ b/Source/JavaScriptCore/parser/SourceProviderCache.h
@@ -26,13 +26,13 @@
 #ifndef SourceProviderCache_h
 #define SourceProviderCache_h
 
+#include "SourceProviderCacheItem.h"
 #include <wtf/HashMap.h>
+#include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
 namespace JSC {
 
-class SourceProviderCacheItem;
-
 class SourceProviderCache {
 public:
     SourceProviderCache() : m_contentByteSize(0) {}
@@ -44,7 +44,7 @@ public:
     const SourceProviderCacheItem* get(int sourcePosition) const { return m_map.get(sourcePosition); }
 
 private:
-    HashMap<int, SourceProviderCacheItem*> m_map;
+    HashMap<int, OwnPtr<SourceProviderCacheItem> > m_map;
     unsigned m_contentByteSize;
 };