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

Timestamp:

Feb 11, 2005, 4:58:13 PM (20 years ago)

Author:

rjw

Message:

WebCore:

Fixed <rdar://problem/3985118> DOM objects not being marshaled on JS->native calls

Re-factored how 'native' wrappers for JS objects are created. The interpreter now
creates these wrappers. The WebCore subclass of the interpreter now overrides
createLanguageInstanceForValue() and creates a DOM ObjC wrapper for DOM objects.

• WebCore.pbproj/project.pbxproj:
• khtml/ecma/kjs_binding.cpp: (ScriptInterpreter::createLanguageInstanceForValue):
• khtml/ecma/kjs_binding.h:
• kwq/DOMUtility.mm: Added. (KJS::ScriptInterpreter::createObjcInstanceForValue):
• kwq/KWQKHTMLPart.mm: (KWQKHTMLPart::getAppletInstanceForView): (getInstanceForView): (KWQKHTMLPart::getEmbedInstanceForView): (KWQKHTMLPart::getObjectInstanceForView):

JavaScriptCore:

Fixed <rdar://problem/3985118> DOM objects not being marshaled on JS->native calls

Re-factored how 'native' wrappers for JS objects are created. The interpreter now
creates these wrappers. The WebCore subclass of the interpreter now overrides
createLanguageInstanceForValue() and creates a DOM ObjC wrapper for DOM objects.

Reviewed by Ken.

• bindings/c/c_utility.cpp: (convertValueToNPVariant):
• bindings/jni/jni_instance.cpp: (JavaInstance::invokeMethod):
• bindings/jni/jni_runtime.cpp: (JavaField::valueFromInstance): (JavaArray::valueAt):
• bindings/objc/WebScriptObject.mm: (-[WebScriptObject _setExecutionContext:KJS::Bindings::]): (+[WebScriptObject _convertValueToObjcValue:KJS::originExecutionContext:Bindings::executionContext:Bindings::]):
• bindings/objc/WebScriptObjectPrivate.h:
• bindings/objc/objc_utility.h:
• bindings/objc/objc_utility.mm: (KJS::Bindings::convertObjcValueToValue): (KJS::Bindings::createObjcInstanceForValue):
• bindings/runtime.cpp: (Instance::createBindingForLanguageInstance): (Instance::createRuntimeObject): (Instance::createLanguageInstanceForValue):
• bindings/runtime.h:
• kjs/interpreter.cpp: (Interpreter::createLanguageInstanceForValue):
• kjs/interpreter.h:

File:

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

trunk/JavaScriptCore/bindings/runtime.cpp

@@ -30 +30 @@
 #include <objc_instance.h>
 #include <c_instance.h>
+#include <NP_jsobject.h>
+#include <jni_jsobject.h>
 
 using namespace KJS;
@@ -98 +100 @@
 }
 
-Instance *Instance::createBindingForLanguageInstance (BindingLanguage language, void *instance)
+Instance *Instance::createBindingForLanguageInstance (BindingLanguage language, void *nativeInstance, const RootObject *executionContext)
 {
-    if (language == Instance::JavaLanguage)
-        return new Bindings::JavaInstance ((jobject)instance, 0);
-    else if (language == Instance::ObjectiveCLanguage)
-        return new Bindings::ObjcInstance ((struct objc_object *)instance);
+    Instance *newInstance = 0;
+    
+    switch (language) {
+        case Instance::JavaLanguage: {
+            newInstance = new Bindings::JavaInstance ((jobject)nativeInstance, executionContext);
+            break;
+        }
+        case Instance::ObjectiveCLanguage: {
+            newInstance = new Bindings::ObjcInstance ((struct objc_object *)nativeInstance);
+            break;
+        }
+        case Instance::CLanguage: {
+            newInstance = new Bindings::CInstance ((NPObject *)nativeInstance);
+            break;
+        }
+        default:
+            break;
+    }
 
-    else if (language == Instance::CLanguage)
-        return new Bindings::CInstance ((NPObject *)instance);
-
-    return 0;
+    if (newInstance)
+        newInstance->setExecutionContext (executionContext);
+        
+    return newInstance;
 }
 
-Object Instance::createRuntimeObject (BindingLanguage language, void *myInterface)
+Object Instance::createRuntimeObject (BindingLanguage language, void *nativeInstance, const RootObject *executionContext)
 {
-    Instance *interfaceObject = Instance::createBindingForLanguageInstance (language, (void *)myInterface);
+    Instance *interfaceObject = Instance::createBindingForLanguageInstance (language, (void *)nativeInstance, executionContext);
     
     Interpreter::lock();
@@ -120 +136 @@
     
     return theObject;
+}
+
+void *Instance::createLanguageInstanceForValue (ExecState *exec, BindingLanguage language, const Object &value, const RootObject *origin, const RootObject *current)
+{
+    void *result = 0;
+    
+    if (value.type() != ObjectType)
+        return 0;
+
+    ObjectImp *imp = static_cast<ObjectImp*>(value.imp());
+    
+    switch (language) {
+        case Instance::ObjectiveCLanguage: {
+            result = createObjcInstanceForValue (value, origin, current);
+            break;
+        }
+        case Instance::CLanguage: {
+            result = _NPN_CreateScriptObject (0, imp, origin, current);
+            break;
+        }
+        case Instance::JavaLanguage: {
+            // FIXME:  factor creation of jni_jsobjects, also remove unnecessary thread
+            // invocation code.
+            break;
+        }
+        default:
+            break;
+    }
+    
+    return result;
 }