Changeset 104318 in webkit

Timestamp:

Jan 6, 2012 12:20:24 PM (12 years ago)

Author:

caio.oliveira@openbossa.org

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:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• parser/Parser.cpp (modified) (1 diff)
• parser/SourceProviderCache.cpp (modified) (3 diffs)
• parser/SourceProviderCache.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2012-01-06  Caio Marcelo de Oliveira Filho  <caio.oliveira@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  <sam@webkit.org>
 

trunk/Source/JavaScriptCore/parser/Parser.cpp

@@ -31 +31 @@
 #include "NodeInfo.h"
 #include "SourceProvider.h"
-#include "SourceProviderCacheItem.h"
 #include <utility>
 #include <wtf/HashFunctions.h>

trunk/Source/JavaScriptCore/parser/SourceProviderCache.cpp

@@ -27 +27 @@
 #include "SourceProviderCache.h"
 
-#include "SourceProviderCacheItem.h"
-
 namespace JSC {
 
@@ -38 +36 @@
 void SourceProviderCache::clear()
 {
-    deleteAllValues(m_map);
     m_map.clear();
     m_contentByteSize = 0;
@@ -50 +47 @@
 void SourceProviderCache::add(int sourcePosition, PassOwnPtr<SourceProviderCacheItem> item, unsigned size)
 {
-    m_map.add(sourcePosition, item.leakPtr());
+    m_map.add(sourcePosition, item);
     m_contentByteSize += size;
 }

trunk/Source/JavaScriptCore/parser/SourceProviderCache.h

@@ -27 +27 @@
 #define SourceProviderCache_h
 
+#include "SourceProviderCacheItem.h"
 #include <wtf/HashMap.h>
+#include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
 namespace JSC {
-
-class SourceProviderCacheItem;
 
 class SourceProviderCache {
@@ -45 +45 @@
 
 private:
-    HashMap<int, SourceProviderCacheItem*> m_map;
+    HashMap<int, OwnPtr<SourceProviderCacheItem> > m_map;
     unsigned m_contentByteSize;
 };