Changeset 104362 in webkit

Timestamp:

Jan 6, 2012 5:23:41 PM (12 years ago)

Author:

caio.oliveira@openbossa.org

Message:

Use HashMap<OwnPtr> in SVGAttributeToPropertyMap
​https://bugs.webkit.org/show_bug.cgi?id=75734

Reviewed by Daniel Bates.

• svg/properties/SVGAttributeToPropertyMap.cpp:

(WebCore::SVGAttributeToPropertyMap::addProperties):
(WebCore::SVGAttributeToPropertyMap::addProperty): use HashMap::add() to avoid an
extra hash lookup to set a new PropertiesVector.
(WebCore::SVGAttributeToPropertyMap::synchronizeProperties):

• svg/properties/SVGAttributeToPropertyMap.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• svg/properties/SVGAttributeToPropertyMap.cpp (modified) (3 diffs)
• svg/properties/SVGAttributeToPropertyMap.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-06  Caio Marcelo de Oliveira Filho  <caio.oliveira@openbossa.org>
+
+        Use HashMap<OwnPtr> in SVGAttributeToPropertyMap
+        https://bugs.webkit.org/show_bug.cgi?id=75734
+
+        Reviewed by Daniel Bates.
+
+        * svg/properties/SVGAttributeToPropertyMap.cpp:
+        (WebCore::SVGAttributeToPropertyMap::addProperties):
+        (WebCore::SVGAttributeToPropertyMap::addProperty): use HashMap::add() to avoid an
+        extra hash lookup to set a new PropertiesVector.
+        (WebCore::SVGAttributeToPropertyMap::synchronizeProperties):
+        * svg/properties/SVGAttributeToPropertyMap.h:
+
 2012-01-06  Greg Billock  <gbillock@google.com>
 

trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.cpp

@@ -32 +32 @@
     AttributeToPropertiesMap::iterator end = map.m_map.end();
     for (AttributeToPropertiesMap::iterator it = map.m_map.begin(); it != end; ++it) {
-        PropertiesVector* vector = it->second;
+        PropertiesVector* vector = it->second.get();
         ASSERT(vector);
 
@@ -45 +45 @@
     ASSERT(info);
     ASSERT(info->attributeName != anyQName());
-    if (PropertiesVector* vector = m_map.get(info->attributeName)) {
-        vector->append(info);
-        return;
-    }
-    PropertiesVector* vector = new PropertiesVector;
+    OwnPtr<PropertiesVector>& vector = m_map.add(info->attributeName, nullptr).first->second;
+    if (!vector)
+        vector = adoptPtr(new PropertiesVector);
     vector->append(info);
-    m_map.set(info->attributeName, vector);
 }
 
@@ -82 +79 @@
     AttributeToPropertiesMap::iterator end = m_map.end();
     for (AttributeToPropertiesMap::iterator it = m_map.begin(); it != end; ++it) {
-        PropertiesVector* vector = it->second;
+        PropertiesVector* vector = it->second.get();
         ASSERT(vector);
 

trunk/Source/WebCore/svg/properties/SVGAttributeToPropertyMap.h

@@ -34 +34 @@
 class SVGAttributeToPropertyMap {
 public:
-    SVGAttributeToPropertyMap() { }
-    ~SVGAttributeToPropertyMap() { deleteAllValues(m_map); }
-
     bool isEmpty() const { return m_map.isEmpty(); }
 
@@ -53 +50 @@
 
     typedef Vector<const SVGPropertyInfo*> PropertiesVector;
-    typedef HashMap<QualifiedName, PropertiesVector*> AttributeToPropertiesMap;
+    typedef HashMap<QualifiedName, OwnPtr<PropertiesVector> > AttributeToPropertiesMap;
     AttributeToPropertiesMap m_map;
 };