Title: [104318] trunk/Source/_javascript_Core
- Revision
- 104318
- Author
- caio.olive...@openbossa.org
- Date
- 2012-01-06 12:20:24 -0800 (Fri, 06 Jan 2012)
Log Message
Use HashMap<OwnPtr> for SourceProviderCache items
https://bugs.webkit.org/show_bug.cgi?id=75346
Reviewed by Daniel Bates.
* parser/Parser.cpp:
* parser/SourceProviderCache.cpp:
(JSC::SourceProviderCache::clear):
(JSC::SourceProviderCache::add):
* parser/SourceProviderCache.h:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (104317 => 104318)
--- trunk/Source/_javascript_Core/ChangeLog 2012-01-06 20:15:59 UTC (rev 104317)
+++ trunk/Source/_javascript_Core/ChangeLog 2012-01-06 20:20:24 UTC (rev 104318)
@@ -1,3 +1,16 @@
+2012-01-06 Caio Marcelo de Oliveira Filho <caio.olive...@openbossa.org>
+
+ Use HashMap<OwnPtr> for SourceProviderCache items
+ https://bugs.webkit.org/show_bug.cgi?id=75346
+
+ Reviewed by Daniel Bates.
+
+ * parser/Parser.cpp:
+ * parser/SourceProviderCache.cpp:
+ (JSC::SourceProviderCache::clear):
+ (JSC::SourceProviderCache::add):
+ * parser/SourceProviderCache.h:
+
2012-01-06 Sam Weinig <s...@webkit.org>
Remove unused OwnFastMallocPtr class.
Modified: trunk/Source/_javascript_Core/parser/Parser.cpp (104317 => 104318)
--- trunk/Source/_javascript_Core/parser/Parser.cpp 2012-01-06 20:15:59 UTC (rev 104317)
+++ trunk/Source/_javascript_Core/parser/Parser.cpp 2012-01-06 20:20:24 UTC (rev 104318)
@@ -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>
Modified: trunk/Source/_javascript_Core/parser/SourceProviderCache.cpp (104317 => 104318)
--- trunk/Source/_javascript_Core/parser/SourceProviderCache.cpp 2012-01-06 20:15:59 UTC (rev 104317)
+++ trunk/Source/_javascript_Core/parser/SourceProviderCache.cpp 2012-01-06 20:20:24 UTC (rev 104318)
@@ -26,8 +26,6 @@
#include "config.h"
#include "SourceProviderCache.h"
-#include "SourceProviderCacheItem.h"
-
namespace JSC {
SourceProviderCache::~SourceProviderCache()
@@ -37,7 +35,6 @@
void SourceProviderCache::clear()
{
- deleteAllValues(m_map);
m_map.clear();
m_contentByteSize = 0;
}
@@ -49,7 +46,7 @@
void SourceProviderCache::add(int sourcePosition, PassOwnPtr<SourceProviderCacheItem> item, unsigned size)
{
- m_map.add(sourcePosition, item.leakPtr());
+ m_map.add(sourcePosition, item);
m_contentByteSize += size;
}
Modified: trunk/Source/_javascript_Core/parser/SourceProviderCache.h (104317 => 104318)
--- trunk/Source/_javascript_Core/parser/SourceProviderCache.h 2012-01-06 20:15:59 UTC (rev 104317)
+++ trunk/Source/_javascript_Core/parser/SourceProviderCache.h 2012-01-06 20:20:24 UTC (rev 104318)
@@ -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 @@
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;
};
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
