Changeset 102063 in webkit

Timestamp:

Dec 5, 2011, 4:15:16 PM (15 years ago)

Author:

Darin Adler

Message:

Change RuleSet to use HashMap<OwnPtr>
​https://bugs.webkit.org/show_bug.cgi?id=73783

Reviewed by Andreas Kling.

• css/CSSStyleSelector.cpp: Make RuleSet::AtomRuleMap use OwnPtr for the mapped values.

(WebCore::RuleSet::addToRuleSet): Use add instead of get/set to set up a new entry in the
map or find the old entry in the map.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• css/CSSStyleSelector.cpp (modified) (6 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-12-05  Darin Adler  <darin@apple.com>
+
+        Change RuleSet to use HashMap<OwnPtr>
+        https://bugs.webkit.org/show_bug.cgi?id=73783
+
+        Reviewed by Andreas Kling.
+
+        * css/CSSStyleSelector.cpp: Make RuleSet::AtomRuleMap use OwnPtr for the mapped values.
+        (WebCore::RuleSet::addToRuleSet): Use add instead of get/set to set up a new entry in the
+        map or find the old entry in the map.
+
 2011-12-05  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Source/WebCore/css/CSSStyleSelector.cpp

@@ -55 +55 @@
 #include "CSSValueList.h"
 #include "CursorList.h"
-#if ENABLE(CSS_FILTERS)
-#include "FilterOperation.h"
-#endif
 #include "FontFamilyValue.h"
 #include "FontFeatureValue.h"
@@ -103 +100 @@
 #include "TranslateTransformOperation.h"
 #include "UserAgentStyleSheets.h"
-#if ENABLE(CSS_FILTERS)
-#include "WebKitCSSFilterValue.h"
-#endif
 #include "WebKitCSSKeyframeRule.h"
 #include "WebKitCSSKeyframesRule.h"
@@ -114 +108 @@
 #include <wtf/StdLibExtras.h>
 #include <wtf/Vector.h>
+
+#if ENABLE(CSS_FILTERS)
+#include "FilterOperation.h"
+#include "WebKitCSSFilterValue.h"
+#endif
 
 #if ENABLE(DASHBOARD_SUPPORT)
@@ -204 +203 @@
 public:
     RuleSet();
-    ~RuleSet();
-
-    typedef HashMap<AtomicStringImpl*, Vector<RuleData>*> AtomRuleMap;
+
+    typedef HashMap<AtomicStringImpl*, OwnPtr<Vector<RuleData> > > AtomRuleMap;
 
     void addRulesFromSheet(CSSStyleSheet*, const MediaQueryEvaluator&, CSSStyleSelector* = 0);
@@ -213 +211 @@
     void addRule(CSSStyleRule* rule, CSSSelector* sel);
     void addPageRule(CSSPageRule*);
-    void addToRuleSet(AtomicStringImpl* key, AtomRuleMap& map,
-                      CSSStyleRule* rule, CSSSelector* sel);
+    void addToRuleSet(AtomicStringImpl* key, AtomRuleMap&, CSSStyleRule*, CSSSelector*);
     void shrinkToFit();
     void disableAutoShrinkToFit() { m_autoShrinkToFitEnabled = false; }
@@ -1859 +1856 @@
 }
 
-RuleSet::~RuleSet()
-{
-    deleteAllValues(m_idRules);
-    deleteAllValues(m_classRules);
-    deleteAllValues(m_shadowPseudoElementRules);
-    deleteAllValues(m_tagRules);
-}
-
-
-void RuleSet::addToRuleSet(AtomicStringImpl* key, AtomRuleMap& map,
-                              CSSStyleRule* rule, CSSSelector* sel)
-{
-    if (!key) return;
-    Vector<RuleData>* rules = map.get(key);
-    if (!rules) {
-        rules = new Vector<RuleData>;
-        map.set(key, rules);
-    }
-    rules->append(RuleData(rule, sel, m_ruleCount++));
+void RuleSet::addToRuleSet(AtomicStringImpl* key, AtomRuleMap& map, CSSStyleRule* rule, CSSSelector* selector)
+{
+    if (!key)
+        return;
+    OwnPtr<Vector<RuleData> >& rules = map.add(key, nullptr).first->second;
+    if (!rules)
+        rules = adoptPtr(new Vector<RuleData>);
+    rules->append(RuleData(rule, selector, m_ruleCount++));
 }