Changeset 18461 in webkit for trunk/JavaScriptCore/bindings/NP_jsobject.cpp

Timestamp:

Dec 28, 2006, 5:44:28 PM (18 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Brady Eidson.

Some cleanup in preparation for fixing <rdar://problem/4608404>
WebScriptObject's _executionContext lack of ownership policy causes
crashes (e.g., in Dashcode)

I'm just trying to make heads or tails of this baffling code.

Renamed "root" | "execContext" | "executionContext" => "rootObject", because
that's the object's (admittedly vague) type name.

• bindings/runtime.cpp: Removed createLanguageInstanceForValue because I'll give you a dollar if you can explain to me what it actually did.

• bindings/runtime_root.cpp: Put everything in the KJS::Bindings namespace, removing the KJS::Bindings prefix from individual functions and datatypes. This matches the header and eliminates a lot of syntax cruft.

• bindings/c/c_utility.cpp: (KJS::Bindings::convertValueToNPVariant): Replaced use of createLanguageInstanceForValue with call to _NPN_CreateScriptObject because that's what createLanguageInstanceForValue actually did (but don't ask me for that dollar now; that's cheating.)

• bindings/objc/objc_utility.h:
• bindings/objc/objc_utility.mm: (KJS::Bindings::convertValueToObjcValue): Removed. Its only purpose was to call a single function for WebKit, which WebKit can do on its own.

• kjs/interpreter.h: Removed rtti() because it was unused, and this class is scheduled for demolition anyway.

• kjs/interpreter.cpp: Removed createLanguageInstanceForValue because it had nothing to do with the Interpreter, and nothing makes Chuck Norris more mad than a function whose sole purpose is to call another function of the same name. (Really, I asked him.)

WebCore:

Reviewed by Brady Eidson.

Some cleanup in preparation for fixing <rdar://problem/4608404>
WebScriptObject's _executionContext lack of ownership policy causes
crashes (e.g., in Dashcode)

Layout tests pass.

Renamed "root" | "execContext" | "executionContext" => rootObject, because
that's the object's (admittedly vague) type name.

• bindings/js/kjs_binding.cpp:
• bindings/js/kjs_binding.h: Removed createLanguageInstanceForValue and createObjcInstanceForValue because their only purpose was to confuse you.

• bindings/objc/DOMInternal.h: Moved declaration of createDOMWrapper here. createDOMWrapper is the new name for createObjcInstanceForValue.

• bindings/objc/DOMInternal.mm: Renamed Interpreter::createObjcInstanceForValue to createDOMWrapper because creating DOM wrappers has nothing to do with the interpreter, and everything to do with the DOM. Renamed value to object because it is one. Removed newObj nil check that is unnecessary in ObjC.

• bindings/objc/WebScriptObject.mm: Replaced call to createLanguageInstanceForValue with explicit code to do the same thing it would have done: (1) try to create a DOM wrapper; (2) if the object is not a wrappable DOM object, create a vanilla WebScriptObject for it instead.

File:

• trunk/JavaScriptCore/bindings/NP_jsobject.cpp (modified) (10 diffs)

trunk/JavaScriptCore/bindings/NP_jsobject.cpp

@@ -62 +62 @@
 static bool _isSafeScript(JavaScriptObject* obj)
 {
-    if (obj->originExecutionContext) {
-        Interpreter* originInterpreter = obj->originExecutionContext->interpreter();
+    if (obj->originRootObject) {
+        Interpreter* originInterpreter = obj->originRootObject->interpreter();
         if (originInterpreter)
-            return originInterpreter->isSafeScript(obj->executionContext->interpreter());
+            return originInterpreter->isSafeScript(obj->rootObject->interpreter());
     }
     return true;
 }
 
-NPObject *_NPN_CreateScriptObject (NPP npp, JSObject *imp, const RootObject *originExecutionContext, const RootObject *executionContext)
+NPObject* _NPN_CreateScriptObject (NPP npp, JSObject* imp, const RootObject* originRootObject, const RootObject* rootObject)
 {
     JavaScriptObject* obj = (JavaScriptObject*)_NPN_CreateObject(npp, NPScriptObjectClass);
 
     obj->imp = imp;
-    obj->originExecutionContext = originExecutionContext;    
-    obj->executionContext = executionContext;    
-
-    addNativeReference(executionContext, imp);
+    obj->originRootObject = originRootObject;    
+    obj->rootObject = rootObject;    
+
+    addNativeReference(rootObject, imp);
 
     return (NPObject *)obj;
@@ -120 +120 @@
 
         // Lookup the function object.
-        ExecState* exec = obj->executionContext->interpreter()->globalExec();
+        ExecState* exec = obj->rootObject->interpreter()->globalExec();
         JSLock lock;
         JSValue* func = obj->imp->get(exec, identifierFromNPIdentifier(i->value.string));
@@ -157 +157 @@
             return false;
 
-        ExecState* exec = obj->executionContext->interpreter()->globalExec();
+        ExecState* exec = obj->rootObject->interpreter()->globalExec();
         
         JSLock lock;
@@ -163 +163 @@
         unsigned int UTF16Length;
         convertNPStringToUTF16(s, &scriptString, &UTF16Length); // requires free() of returned memory
-        Completion completion = obj->executionContext->interpreter()->evaluate(UString(), 0, UString((const UChar*)scriptString,UTF16Length));
+        Completion completion = obj->rootObject->interpreter()->evaluate(UString(), 0, UString((const UChar*)scriptString,UTF16Length));
         ComplType type = completion.complType();
         
@@ -192 +192 @@
             return false;
 
-        ExecState* exec = obj->executionContext->interpreter()->globalExec();
+        ExecState* exec = obj->rootObject->interpreter()->globalExec();
         PrivateIdentifier* i = (PrivateIdentifier*)propertyName;
         
@@ -231 +231 @@
             return false;
 
-        ExecState* exec = obj->executionContext->interpreter()->globalExec();
+        ExecState* exec = obj->rootObject->interpreter()->globalExec();
         JSLock lock;
         PrivateIdentifier* i = (PrivateIdentifier*)propertyName;
@@ -254 +254 @@
             return false;
 
-        ExecState* exec = obj->executionContext->interpreter()->globalExec();
+        ExecState* exec = obj->rootObject->interpreter()->globalExec();
         PrivateIdentifier* i = (PrivateIdentifier*)propertyName;
         if (i->isString) {
@@ -282 +282 @@
             return false;
 
-        ExecState* exec = obj->executionContext->interpreter()->globalExec();
+        ExecState* exec = obj->rootObject->interpreter()->globalExec();
         PrivateIdentifier* i = (PrivateIdentifier*)propertyName;
         JSLock lock;
@@ -307 +307 @@
             return false;
 
-        ExecState* exec = obj->executionContext->interpreter()->globalExec();
+        ExecState* exec = obj->rootObject->interpreter()->globalExec();
         JSLock lock;
         JSValue* func = obj->imp->get(exec, identifierFromNPIdentifier(i->value.string));
@@ -323 +323 @@
     if (o->_class == NPScriptObjectClass) {
         JavaScriptObject* obj = (JavaScriptObject*)o; 
-        ExecState* exec = obj->executionContext->interpreter()->globalExec();
+        ExecState* exec = obj->rootObject->interpreter()->globalExec();
         JSLock lock;
         throwError(exec, GeneralError, message);