Changeset 23512 in webkit for trunk/JavaScriptCore/bindings/runtime.cpp

Timestamp:

Jun 13, 2007, 5:10:38 PM (18 years ago)

Author:

andersca

Message:

JavaScriptCore:

Reviewed by Geoff.

Make sure that bindings instances get correct root objects.

• JavaScriptCore.exp:
• bindings/NP_jsobject.cpp: (listFromVariantArgs): (_NPN_InvokeDefault): (_NPN_Invoke): (_NPN_SetProperty):
• bindings/c/c_instance.cpp: (KJS::Bindings::CInstance::invokeMethod): (KJS::Bindings::CInstance::invokeDefaultMethod):
• bindings/c/c_runtime.cpp: (KJS::Bindings::CField::valueFromInstance):
• bindings/c/c_utility.cpp: (KJS::Bindings::convertNPVariantToValue):
• bindings/c/c_utility.h:
• bindings/objc/objc_instance.mm: (ObjcInstance::invokeMethod): (ObjcInstance::invokeDefaultMethod): (ObjcInstance::getValueOfUndefinedField):
• bindings/objc/objc_runtime.mm: (ObjcField::valueFromInstance): (ObjcArray::valueAt):
• bindings/objc/objc_utility.h:
• bindings/objc/objc_utility.mm: (KJS::Bindings::convertObjcValueToValue):
• bindings/runtime.h:

WebCore:

Reviewed by Geoff.

Pass the root object to methods that end up creating new ObjcInstance objects.

• bindings/objc/WebScriptObject.mm: (listFromNSArray): (-[WebScriptObject callWebScriptMethod:withArguments:]): (-[WebScriptObject evaluateWebScript:]): (-[WebScriptObject setValue:forKey:]): (-[WebScriptObject valueForKey:]): (-[WebScriptObject removeWebScriptKey:]): (-[WebScriptObject setWebScriptValueAtIndex:value:]):

File:

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

trunk/JavaScriptCore/bindings/runtime.cpp

@@ -48 +48 @@
     : _rootObject(rootObject)
 {
+    ASSERT(_rootObject);
 }
 
@@ -58 +59 @@
     , _refCount(0)
 {
+    ASSERT(_rootObject);
 }