Changeset 154708 in webkit

Timestamp:

Aug 27, 2013 2:26:58 PM (11 years ago)

Author:

andersca@apple.com

Message:

Stop using deleteAllValues in CClass
​https://bugs.webkit.org/show_bug.cgi?id=120376

Reviewed by Andreas Kling.

• bridge/c/c_class.cpp:

(JSC::Bindings::CClass::CClass):
(JSC::Bindings::CClass::~CClass):
(JSC::Bindings::CClass::methodNamed):
(JSC::Bindings::CClass::fieldNamed):

• bridge/c/c_class.h:
• bridge/jsc/BridgeJSC.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bridge/c/c_class.cpp (modified) (4 diffs)
• bridge/c/c_class.h (modified) (1 diff)
• bridge/jsc/BridgeJSC.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-08-27  Anders Carlsson  <andersca@apple.com>
+
+        Stop using deleteAllValues in CClass
+        https://bugs.webkit.org/show_bug.cgi?id=120376
+
+        Reviewed by Andreas Kling.
+
+        * bridge/c/c_class.cpp:
+        (JSC::Bindings::CClass::CClass):
+        (JSC::Bindings::CClass::~CClass):
+        (JSC::Bindings::CClass::methodNamed):
+        (JSC::Bindings::CClass::fieldNamed):
+        * bridge/c/c_class.h:
+        * bridge/jsc/BridgeJSC.h:
+
 2013-08-27  Benjamin Poulain  <benjamin@webkit.org>
 

trunk/Source/WebCore/bridge/c/c_class.cpp

@@ -42 +42 @@
 CClass::CClass(NPClass* aClass)
 {
-    _isa = aClass;
+    m_isa = aClass;
 }
 
 CClass::~CClass()
 {
-    deleteAllValues(_methods);
-    _methods.clear();
-
-    deleteAllValues(_fields);
-    _fields.clear();
+    m_methods.clear();
+    m_fields.clear();
 }
 
@@ -75 +72 @@
     String name(propertyName.publicName());
     
-    if (Method* method = _methods.get(name.impl()))
+    if (Method* method = m_methods.get(name.impl()))
         return method;
 
@@ -81 +78 @@
     const CInstance* inst = static_cast<const CInstance*>(instance);
     NPObject* obj = inst->getObject();
-    if (_isa->hasMethod && _isa->hasMethod(obj, ident)){
-        Method* method = new CMethod(ident); // deleted in the CClass destructor
-        _methods.set(name.impl(), method);
-        return method;
+    if (m_isa->hasMethod && m_isa->hasMethod(obj, ident)) {
+        OwnPtr<Method> method = adoptPtr(new CMethod(ident));
+        m_methods.set(name.impl(), method.release());
+        return method.get();
     }
     
@@ -94 +91 @@
     String name(propertyName.publicName());
     
-    Field* aField = _fields.get(name.impl());
-    if (aField)
-        return aField;
-    
+    if (Field* field = m_fields.get(name.impl()))
+        return field;
+
     NPIdentifier ident = _NPN_GetStringIdentifier(name.ascii().data());
     const CInstance* inst = static_cast<const CInstance*>(instance);
     NPObject* obj = inst->getObject();
-    if (_isa->hasProperty && _isa->hasProperty(obj, ident)){
-        aField = new CField(ident); // deleted in the CClass destructor
-        _fields.set(name.impl(), aField);
+    if (m_isa->hasProperty && m_isa->hasProperty(obj, ident)) {
+        OwnPtr<Field> field = adoptPtr(new CField(ident));
+        m_fields.set(name.impl(), field.release());
     }
-    return aField;
+
+    return 0;
 }
 

trunk/Source/WebCore/bridge/c/c_class.h

@@ -48 +48 @@
 
 private:
-    NPClass* _isa;
-    mutable MethodMap _methods;
-    mutable FieldMap _fields;
+    NPClass* m_isa;
+    mutable HashMap<RefPtr<StringImpl>, OwnPtr<Method>> m_methods;
+    mutable HashMap<RefPtr<StringImpl>, OwnPtr<Field>> m_fields;
 };
 

trunk/Source/WebCore/bridge/jsc/BridgeJSC.h

@@ -135 +135 @@
 const char* signatureForParameters(const ArgList&);
 
-typedef HashMap<RefPtr<StringImpl>, Method*> MethodMap;
-typedef HashMap<RefPtr<StringImpl>, Field*> FieldMap;
-
 } // namespace Bindings