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

Timestamp:

Jun 7, 2007, 4:16:37 PM (18 years ago)

Author:

andersca

Message:

Reviewed by Geoff.

Get rid of Instance::setRootObject and pass the root object to the instance constructor instead.

• bindings/c/c_instance.cpp: (KJS::Bindings::CInstance::CInstance):
• bindings/c/c_instance.h:
• bindings/jni/jni_instance.cpp: (JavaInstance::JavaInstance):
• bindings/jni/jni_instance.h:
• bindings/jni/jni_jsobject.cpp: (JavaJSObject::convertJObjectToValue):
• bindings/objc/objc_instance.h:
• bindings/objc/objc_instance.mm: (ObjcInstance::ObjcInstance):
• bindings/runtime.cpp: (KJS::Bindings::Instance::Instance): (KJS::Bindings::Instance::createBindingForLanguageInstance):
• bindings/runtime.h:

File:

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

trunk/JavaScriptCore/bindings/runtime.cpp

@@ -96 +96 @@
 
 
-Instance::Instance()
-    : _refCount(0)
+Instance::Instance(PassRefPtr<RootObject> rootObject)
+    : _rootObject(rootObject)
+    , _refCount(0)
 {
 }
@@ -127 +128 @@
 #if HAVE(JNI)
         case Instance::JavaLanguage: {
-            newInstance = new Bindings::JavaInstance((jobject)nativeInstance);
+            newInstance = new Bindings::JavaInstance((jobject)nativeInstance, rootObject);
             break;
         }
@@ -133 +134 @@
 #if PLATFORM(MAC)
         case Instance::ObjectiveCLanguage: {
-            newInstance = new Bindings::ObjcInstance((ObjectStructPtr)nativeInstance);
+            newInstance = new Bindings::ObjcInstance((ObjectStructPtr)nativeInstance, rootObject);
             break;
         }
 #endif
         case Instance::CLanguage: {
-            newInstance = new Bindings::CInstance((NPObject *)nativeInstance);
+            newInstance = new Bindings::CInstance((NPObject *)nativeInstance, rootObject);
             break;
         }
 #if PLATFORM(QT)
         case Instance::QtLanguage: {
-            newInstance = new Bindings::QtInstance((QObject *)nativeInstance);
+            newInstance = new Bindings::QtInstance((QObject *)nativeInstance, rootObject);
             break;
         }
@@ -151 +152 @@
     }
 
-    if (newInstance)
-        newInstance->setRootObject(rootObject);
-        
     return newInstance;
 }
@@ -165 +163 @@
 }
 
-void Instance::setRootObject(PassRefPtr<RootObject> rootObject)
-{
-    _rootObject = rootObject;
-}
-
 RootObject* Instance::rootObject() const 
 {