Changeset 23479 in webkit for trunk/JavaScriptCore/bindings/runtime_method.cpp

Timestamp:

Jun 12, 2007, 9:25:28 PM (18 years ago)

Author:

andersca

Message:

Reviewed by Oliver.

Get rid of the MethodList class and use a good ol' Vector instead.

• bindings/c/c_class.cpp: (KJS::Bindings::CClass::methodsNamed):
• bindings/c/c_instance.cpp: (KJS::Bindings::CInstance::invokeMethod):
• bindings/jni/jni_class.cpp: (JavaClass::JavaClass): (JavaClass::~JavaClass):
• bindings/jni/jni_instance.cpp: (JavaInstance::invokeMethod):
• bindings/objc/objc_class.mm: (KJS::Bindings::ObjcClass::methodsNamed):
• bindings/objc/objc_instance.mm: (ObjcInstance::invokeMethod):
• bindings/objc/objc_runtime.mm: (ObjcFallbackObjectImp::callAsFunction):
• bindings/runtime.cpp:
• bindings/runtime.h:
• bindings/runtime_method.cpp: (RuntimeMethod::lengthGetter): (RuntimeMethod::callAsFunction):
• bindings/runtime_object.cpp: (RuntimeObjectImp::getOwnPropertySlot):

File:

• trunk/JavaScriptCore/bindings/runtime_method.cpp (modified) (2 diffs)

trunk/JavaScriptCore/bindings/runtime_method.cpp

@@ -54 +54 @@
     // FIXME: a better solution might be to give the maximum number of parameters
     // of any method
-    return jsNumber(thisObj->_methodList->methodAt(0)->numParameters());
+    return jsNumber(thisObj->_methodList->at(0)->numParameters());
 }
 
@@ -69 +69 @@
 JSValue *RuntimeMethod::callAsFunction(ExecState *exec, JSObject *thisObj, const List &args)
 {
-    if (_methodList->length() > 0) {
-        RuntimeObjectImp *imp = 0;
+    if (_methodList->isEmpty())
+        return jsUndefined();
+    
+    RuntimeObjectImp *imp = 0;
 
-        if (thisObj->classInfo() == &KJS::RuntimeObjectImp::info) {
-            imp = static_cast<RuntimeObjectImp*>(thisObj);
-        } else {
-            // If thisObj is the DOM object for a plugin, get the corresponding
-            // runtime object from the DOM object.
-            JSValue* value = thisObj->get(exec, "__apple_runtime_object");
-            if (value->isObject(&KJS::RuntimeObjectImp::info))    
-                imp = static_cast<RuntimeObjectImp*>(value);
-        }
-
-        if (!imp)
-            return throwError(exec, TypeError);
-
-        Instance *instance = imp->getInternalInstance();
-        instance->begin();
-        JSValue *aValue = instance->invokeMethod(exec, *_methodList, args);
-        instance->end();
-        return aValue;
+    if (thisObj->classInfo() == &KJS::RuntimeObjectImp::info) {
+        imp = static_cast<RuntimeObjectImp*>(thisObj);
+    } else {
+        // If thisObj is the DOM object for a plugin, get the corresponding
+        // runtime object from the DOM object.
+        JSValue* value = thisObj->get(exec, "__apple_runtime_object");
+        if (value->isObject(&KJS::RuntimeObjectImp::info))    
+            imp = static_cast<RuntimeObjectImp*>(value);
     }
 
-    return jsUndefined();
+    if (!imp)
+        return throwError(exec, TypeError);
+
+    Instance *instance = imp->getInternalInstance();
+    instance->begin();
+    JSValue *aValue = instance->invokeMethod(exec, *_methodList, args);
+    instance->end();
+    return aValue;
 }