Changeset 53657 in webkit for trunk/JavaScriptCore/API/JSClassRef.cpp

Timestamp:

Jan 21, 2010, 4:06:00 PM (15 years ago)

Author:

[email protected]

Message:

2010-01-21 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Always create a prototype for automatically managed classes.

This fixes some errors where prototype chains were not correctly hooked
up, and also ensures that API classes work correctly with features like
instanceof.

• API/JSClassRef.cpp: (OpaqueJSClass::create): Cleaned up some of this code. Also changed it to always create a prototype class.

• API/tests/testapi.c: (Derived2_class): (main): Fixed a null value crash in the exception checking code.
• API/tests/testapi.js: Added some tests for the case where a prototype chain would not be hooked up correctly.

File:

• trunk/JavaScriptCore/API/JSClassRef.cpp (modified) (2 diffs)

trunk/JavaScriptCore/API/JSClassRef.cpp

@@ -35 +35 @@
 #include <runtime/Identifier.h>
 
+using namespace std;
 using namespace JSC;
 
@@ -121 +122 @@
 }
 
-PassRefPtr<OpaqueJSClass> OpaqueJSClass::create(const JSClassDefinition* definition)
-{
-    const JSStaticFunction* staticFunctions = definition->staticFunctions;
-    if (staticFunctions || definition->parentClass) {
-        // copy functions into a prototype class
-        JSClassDefinition protoDefinition = kJSClassDefinitionEmpty;
-        protoDefinition.staticFunctions = staticFunctions;
-        protoDefinition.finalize = clearReferenceToPrototype;
-        
-        // We are supposed to use JSClassRetain/Release but since we know that we currently have
-        // the only reference to this class object we cheat and use a RefPtr instead.
-        RefPtr<OpaqueJSClass> protoClass = adoptRef(new OpaqueJSClass(&protoDefinition, 0));
-
-        // remove functions from the original class
-        JSClassDefinition objectDefinition = *definition;
-        objectDefinition.staticFunctions = 0;
-
-        return adoptRef(new OpaqueJSClass(&objectDefinition, protoClass.get()));
-    }
-
-    return adoptRef(new OpaqueJSClass(definition, 0));
+PassRefPtr<OpaqueJSClass> OpaqueJSClass::create(const JSClassDefinition* clientDefinition)
+{
+    JSClassDefinition definition = *clientDefinition; // Avoid modifying client copy.
+
+    JSClassDefinition protoDefinition = kJSClassDefinitionEmpty;
+    protoDefinition.finalize = clearReferenceToPrototype;
+    swap(definition.staticFunctions, protoDefinition.staticFunctions); // Move static functions to the prototype.
+    
+    // We are supposed to use JSClassRetain/Release but since we know that we currently have
+    // the only reference to this class object we cheat and use a RefPtr instead.
+    RefPtr<OpaqueJSClass> protoClass = adoptRef(new OpaqueJSClass(&protoDefinition, 0));
+    return adoptRef(new OpaqueJSClass(&definition, protoClass.get()));
 }