JavaScriptCore-1097.3.tar.gz

[apple/javascriptcore.git] / API / JSCallbackObjectFunctions.h

diff --git a/API/JSCallbackObjectFunctions.h b/API/JSCallbackObjectFunctions.h
index f987dd8ccf32a41b71e886c418d69b2c8bb735ef..b909dde7181b3cec0838e567efb15c33c66a2494 100644 (file)
--- a/API/JSCallbackObjectFunctions.h
+++ b/API/JSCallbackObjectFunctions.h
@@ -1,6 +1,5 @@
-// -*- mode: c++; c-basic-offset: 4 -*-

 /*
 /*

- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.

  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without


@@ -25,45 +24,72 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
  */
 

-#include <wtf/Platform.h>
+#include "APIShims.h"

 #include "APICast.h"
 #include "APICast.h"

+#include "Error.h"
+#include "ExceptionHelpers.h"

 #include "JSCallbackFunction.h"
 #include "JSClassRef.h"
 #include "JSCallbackFunction.h"
 #include "JSClassRef.h"

-#include "JSObjectRef.h"
+#include "JSFunction.h"

 #include "JSGlobalObject.h"
 #include "JSGlobalObject.h"

+#include "JSLock.h"
+#include "JSObjectRef.h"
+#include "JSString.h"

 #include "JSStringRef.h"
 #include "JSStringRef.h"

+#include "OpaqueJSString.h"

 #include "PropertyNameArray.h"
 #include "PropertyNameArray.h"

-#include "internal.h"

 #include <wtf/Vector.h>
 
 #include <wtf/Vector.h>
 

-namespace KJS {
+namespace JSC {

 
 

-template <class Base>
-JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSClassRef jsClass, JSValue* prototype, void* data)
-    : Base(prototype)
-    , m_privateData(data)
-    , m_class(JSClassRetain(jsClass))
+template <class Parent>
+inline JSCallbackObject<Parent>* JSCallbackObject<Parent>::asCallbackObject(JSValue value)

 {
 {

+    ASSERT(asObject(value)->inherits(&s_info));
+    return jsCast<JSCallbackObject*>(asObject(value));
+}
+
+template <class Parent>
+JSCallbackObject<Parent>::JSCallbackObject(ExecState* exec, Structure* structure, JSClassRef jsClass, void* data)
+    : Parent(exec->globalData(), structure)
+    , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(data, jsClass)))
+{
+}
+
+// Global object constructor.
+// FIXME: Move this into a separate JSGlobalCallbackObject class derived from this one.
+template <class Parent>
+JSCallbackObject<Parent>::JSCallbackObject(JSGlobalData& globalData, JSClassRef jsClass, Structure* structure)
+    : Parent(globalData, structure)
+    , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(0, jsClass)))
+{
+}
+
+template <class Parent>
+void JSCallbackObject<Parent>::finishCreation(ExecState* exec)
+{
+    Base::finishCreation(exec->globalData());
+    ASSERT(Parent::inherits(&s_info));

     init(exec);
 }
 
     init(exec);
 }
 

-// Global object constructor. FIXME: Move this into a JSGlobalCallbackObject subclass.
-template <class Base>
-JSCallbackObject<Base>::JSCallbackObject(JSClassRef jsClass)
-    : m_privateData(0)
-    , m_class(JSClassRetain(jsClass))
+// This is just for Global object, so we can assume that Base::finishCreation is JSGlobalObject::finishCreation.
+template <class Parent>
+void JSCallbackObject<Parent>::finishCreation(JSGlobalData& globalData)

 {
 {

-    ASSERT(Base::isGlobalObject());
-    init(static_cast<JSGlobalObject*>(this)->globalExec());
+    ASSERT(Parent::inherits(&s_info));
+    ASSERT(Parent::isGlobalObject());
+    Base::finishCreation(globalData);
+    init(jsCast<JSGlobalObject*>(this)->globalExec());

 }
 
 }
 

-template <class Base>
-void JSCallbackObject<Base>::init(ExecState* exec)
+template <class Parent>
+void JSCallbackObject<Parent>::init(ExecState* exec)

 {
     ASSERT(exec);
     
     Vector<JSObjectInitializeCallback, 16> initRoutines;
 {
     ASSERT(exec);
     
     Vector<JSObjectInitializeCallback, 16> initRoutines;

-    JSClassRef jsClass = m_class;
+    JSClassRef jsClass = classRef();

     do {
         if (JSObjectInitializeCallback initialize = jsClass->initialize)
             initRoutines.append(initialize);
     do {
         if (JSObjectInitializeCallback initialize = jsClass->initialize)
             initRoutines.append(initialize);


@@ -71,155 +97,226 @@ void JSCallbackObject<Base>::init(ExecState* exec)
     
     // initialize from base to derived
     for (int i = static_cast<int>(initRoutines.size()) - 1; i >= 0; i--) {
     
     // initialize from base to derived
     for (int i = static_cast<int>(initRoutines.size()) - 1; i >= 0; i--) {

-        JSLock::DropAllLocks dropAllLocks;
+        APICallbackShim callbackShim(exec);

         JSObjectInitializeCallback initialize = initRoutines[i];
         initialize(toRef(exec), toRef(this));
     }
         JSObjectInitializeCallback initialize = initRoutines[i];
         initialize(toRef(exec), toRef(this));
     }

-}

 
 

-template <class Base>
-JSCallbackObject<Base>::~JSCallbackObject()
-{
-    JSObjectRef thisRef = toRef(this);
-    
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectFinalizeCallback finalize = jsClass->finalize) {
-            finalize(thisRef);
+    for (JSClassRef jsClassPtr = classRef(); jsClassPtr; jsClassPtr = jsClassPtr->parentClass) {
+        if (jsClassPtr->finalize) {
+            WeakSet::allocate(this, m_callbackObjectData.get(), classRef());
+            break;

         }
         }

-            
-    JSClassRelease(m_class);
+    }

 }
 
 }
 

-template <class Base>
-UString JSCallbackObject<Base>::className() const
+template <class Parent>
+UString JSCallbackObject<Parent>::className(const JSObject* object)

 {
 {

-    if (!m_class->className.isNull())
-        return m_class->className;
+    const JSCallbackObject* thisObject = jsCast<const JSCallbackObject*>(object);
+    UString thisClassName = thisObject->classRef()->className();
+    if (!thisClassName.isEmpty())
+        return thisClassName;

     
     

-    return Base::className();
+    return Parent::className(object);

 }
 
 }
 

-template <class Base>
-bool JSCallbackObject<Base>::getOwnPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+template <class Parent>
+bool JSCallbackObject<Parent>::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)

 {
 {

+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);

     JSContextRef ctx = toRef(exec);
     JSContextRef ctx = toRef(exec);

-    JSObjectRef thisRef = toRef(this);
-    JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+    JSObjectRef thisRef = toRef(thisObject);
+    RefPtr<OpaqueJSString> propertyNameRef;

     
     

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {

         // optional optimization to bypass getProperty in cases when we only need to know if the property exists
         if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
         // optional optimization to bypass getProperty in cases when we only need to know if the property exists
         if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {

-            JSLock::DropAllLocks dropAllLocks;
-            if (hasProperty(ctx, thisRef, propertyNameRef)) {
-                slot.setCustom(this, callbackGetter);
+            if (!propertyNameRef)
+                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+            APICallbackShim callbackShim(exec);
+            if (hasProperty(ctx, thisRef, propertyNameRef.get())) {
+                slot.setCustom(thisObject, callbackGetter);

                 return true;
             }
         } else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
                 return true;
             }
         } else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {

-            JSLock::DropAllLocks dropAllLocks;
-            if (JSValueRef value = getProperty(ctx, thisRef, propertyNameRef, toRef(exec->exceptionSlot()))) {
-                // cache the value so we don't have to compute it again
-                // FIXME: This violates the PropertySlot design a little bit.
-                // We should either use this optimization everywhere, or nowhere.
-                slot.setCustom(reinterpret_cast<JSObject*>(toJS(value)), cachedValueGetter);
+            if (!propertyNameRef)
+                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+            JSValueRef exception = 0;
+            JSValueRef value;
+            {
+                APICallbackShim callbackShim(exec);
+                value = getProperty(ctx, thisRef, propertyNameRef.get(), &exception);
+            }
+            if (exception) {
+                throwError(exec, toJS(exec, exception));
+                slot.setValue(jsUndefined());
+                return true;
+            }
+            if (value) {
+                slot.setValue(toJS(exec, value));

                 return true;
             }
         }
         
                 return true;
             }
         }
         

-        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
-            if (staticValues->contains(propertyName.ustring().rep())) {
-                slot.setCustom(this, staticValueGetter);
-                return true;
+        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+            if (staticValues->contains(propertyName.impl())) {
+                JSValue value = thisObject->getStaticValue(exec, propertyName);
+                if (value) {
+                    slot.setValue(value);
+                    return true;
+                }

             }
         }
         
             }
         }
         

-        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
-            if (staticFunctions->contains(propertyName.ustring().rep())) {
-                slot.setCustom(this, staticFunctionGetter);
+        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+            if (staticFunctions->contains(propertyName.impl())) {
+                slot.setCustom(thisObject, staticFunctionGetter);

                 return true;
             }
         }
     }
     
                 return true;
             }
         }
     }
     

-    return Base::getOwnPropertySlot(exec, propertyName, slot);
+    return Parent::getOwnPropertySlot(thisObject, exec, propertyName, slot);
+}
+
+template <class Parent>
+JSValue JSCallbackObject<Parent>::defaultValue(const JSObject* object, ExecState* exec, PreferredPrimitiveType hint)
+{
+    const JSCallbackObject* thisObject = jsCast<const JSCallbackObject*>(object);
+    JSContextRef ctx = toRef(exec);
+    JSObjectRef thisRef = toRef(thisObject);
+    ::JSType jsHint = hint == PreferString ? kJSTypeString : kJSTypeNumber;
+
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
+        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
+            JSValueRef exception = 0;
+            JSValueRef result = convertToType(ctx, thisRef, jsHint, &exception);
+            if (exception) {
+                throwError(exec, toJS(exec, exception));
+                return jsUndefined();
+            }
+            if (result)
+                return toJS(exec, result);
+        }
+    }
+    
+    return Parent::defaultValue(object, exec, hint);

 }
 
 }
 

-template <class Base>
-bool JSCallbackObject<Base>::getOwnPropertySlot(ExecState* exec, unsigned propertyName, PropertySlot& slot)
+template <class Parent>
+bool JSCallbackObject<Parent>::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)

 {
 {

-    return getOwnPropertySlot(exec, Identifier::from(propertyName), slot);
+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(object);
+    PropertySlot slot;
+    if (thisObject->methodTable()->getOwnPropertySlot(thisObject, exec, propertyName, slot)) {
+        // Ideally we should return an access descriptor, but returning a value descriptor is better than nothing.
+        JSValue value = slot.getValue(exec, propertyName);
+        if (!exec->hadException())
+            descriptor.setValue(value);
+        // We don't know whether the property is configurable, but assume it is.
+        descriptor.setConfigurable(true);
+        // We don't know whether the property is enumerable (we could call getOwnPropertyNames() to find out), but assume it isn't.
+        descriptor.setEnumerable(false);
+        return true;
+    }
+
+    return Parent::getOwnPropertyDescriptor(thisObject, exec, propertyName, descriptor);

 }
 
 }
 

-template <class Base>
-void JSCallbackObject<Base>::put(ExecState* exec, const Identifier& propertyName, JSValue* value, int attr)
+template <class Parent>
+void JSCallbackObject<Parent>::put(JSCell* cell, ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)

 {
 {

+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);

     JSContextRef ctx = toRef(exec);
     JSContextRef ctx = toRef(exec);

-    JSObjectRef thisRef = toRef(this);
-    JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
-    JSValueRef valueRef = toRef(value);
+    JSObjectRef thisRef = toRef(thisObject);
+    RefPtr<OpaqueJSString> propertyNameRef;
+    JSValueRef valueRef = toRef(exec, value);

     
     

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {

         if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
         if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {

-            JSLock::DropAllLocks dropAllLocks;
-            if (setProperty(ctx, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
+            if (!propertyNameRef)
+                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+            JSValueRef exception = 0;
+            bool result;
+            {
+                APICallbackShim callbackShim(exec);
+                result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
+            }
+            if (exception)
+                throwError(exec, toJS(exec, exception));
+            if (result || exception)

                 return;
         }
         
                 return;
         }
         

-        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
+        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+            if (StaticValueEntry* entry = staticValues->get(propertyName.impl())) {

                 if (entry->attributes & kJSPropertyAttributeReadOnly)
                     return;
                 if (JSObjectSetPropertyCallback setProperty = entry->setProperty) {
                 if (entry->attributes & kJSPropertyAttributeReadOnly)
                     return;
                 if (JSObjectSetPropertyCallback setProperty = entry->setProperty) {

-                    JSLock::DropAllLocks dropAllLocks;
-                    if (setProperty(ctx, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
+                    if (!propertyNameRef)
+                        propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+                    JSValueRef exception = 0;
+                    bool result;
+                    {
+                        APICallbackShim callbackShim(exec);
+                        result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
+                    }
+                    if (exception)
+                        throwError(exec, toJS(exec, exception));
+                    if (result || exception)

                         return;
                         return;

-                } else
-                    throwError(exec, ReferenceError, "Attempt to set a property that is not settable.");
+                }

             }
         }
         
             }
         }
         

-        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
+        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {

                 if (entry->attributes & kJSPropertyAttributeReadOnly)
                     return;
                 if (entry->attributes & kJSPropertyAttributeReadOnly)
                     return;

-                JSCallbackObject<Base>::putDirect(propertyName, value, attr); // put as override property
+                thisObject->JSCallbackObject<Parent>::putDirect(exec->globalData(), propertyName, value); // put as override property

                 return;
             }
         }
     }
     
                 return;
             }
         }
     }
     

-    return Base::put(exec, propertyName, value, attr);
+    return Parent::put(thisObject, exec, propertyName, value, slot);

 }
 
 }
 

-template <class Base>
-void JSCallbackObject<Base>::put(ExecState* exec, unsigned propertyName, JSValue* value, int attr)
-{
-    return put(exec, Identifier::from(propertyName), value, attr);
-}
-
-template <class Base>
-bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, const Identifier& propertyName)
+template <class Parent>
+bool JSCallbackObject<Parent>::deleteProperty(JSCell* cell, ExecState* exec, const Identifier& propertyName)

 {
 {

+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);

     JSContextRef ctx = toRef(exec);
     JSContextRef ctx = toRef(exec);

-    JSObjectRef thisRef = toRef(this);
-    JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+    JSObjectRef thisRef = toRef(thisObject);
+    RefPtr<OpaqueJSString> propertyNameRef;

     
     

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {

         if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
         if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {

-            JSLock::DropAllLocks dropAllLocks;
-            if (deleteProperty(ctx, thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
+            if (!propertyNameRef)
+                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+            JSValueRef exception = 0;
+            bool result;
+            {
+                APICallbackShim callbackShim(exec);
+                result = deleteProperty(ctx, thisRef, propertyNameRef.get(), &exception);
+            }
+            if (exception)
+                throwError(exec, toJS(exec, exception));
+            if (result || exception)

                 return true;
         }
         
                 return true;
         }
         

-        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
+        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+            if (StaticValueEntry* entry = staticValues->get(propertyName.impl())) {

                 if (entry->attributes & kJSPropertyAttributeDontDelete)
                     return false;
                 return true;
             }
         }
         
                 if (entry->attributes & kJSPropertyAttributeDontDelete)
                     return false;
                 return true;
             }
         }
         

-        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
+        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {

                 if (entry->attributes & kJSPropertyAttributeDontDelete)
                     return false;
                 return true;
                 if (entry->attributes & kJSPropertyAttributeDontDelete)
                     return false;
                 return true;


@@ -227,269 +324,267 @@ bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, const Identifier& p
         }
     }
     
         }
     }
     

-    return Base::deleteProperty(exec, propertyName);
+    return Parent::deleteProperty(thisObject, exec, propertyName);

 }
 
 }
 

-template <class Base>
-bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, unsigned propertyName)
+template <class Parent>
+bool JSCallbackObject<Parent>::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned propertyName)

 {
 {

-    return deleteProperty(exec, Identifier::from(propertyName));
+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);
+    return thisObject->methodTable()->deleteProperty(thisObject, exec, Identifier::from(exec, propertyName));

 }
 
 }
 

-template <class Base>
-bool JSCallbackObject<Base>::implementsConstruct() const
+template <class Parent>
+ConstructType JSCallbackObject<Parent>::getConstructData(JSCell* cell, ConstructData& constructData)

 {
 {

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
-        if (jsClass->callAsConstructor)
-            return true;
-    
-    return false;
+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
+        if (jsClass->callAsConstructor) {
+            constructData.native.function = construct;
+            return ConstructTypeHost;
+        }
+    }
+    return ConstructTypeNone;

 }
 
 }
 

-template <class Base>
-JSObject* JSCallbackObject<Base>::construct(ExecState* exec, const List& args)
+template <class Parent>
+EncodedJSValue JSCallbackObject<Parent>::construct(ExecState* exec)

 {
 {

+    JSObject* constructor = exec->callee();

     JSContextRef execRef = toRef(exec);
     JSContextRef execRef = toRef(exec);

-    JSObjectRef thisRef = toRef(this);
+    JSObjectRef constructorRef = toRef(constructor);

     
     

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = jsCast<JSCallbackObject<Parent>*>(constructor)->classRef(); jsClass; jsClass = jsClass->parentClass) {

         if (JSObjectCallAsConstructorCallback callAsConstructor = jsClass->callAsConstructor) {
         if (JSObjectCallAsConstructorCallback callAsConstructor = jsClass->callAsConstructor) {

-            int argumentCount = static_cast<int>(args.size());
+            int argumentCount = static_cast<int>(exec->argumentCount());

             Vector<JSValueRef, 16> arguments(argumentCount);
             for (int i = 0; i < argumentCount; i++)
             Vector<JSValueRef, 16> arguments(argumentCount);
             for (int i = 0; i < argumentCount; i++)

-                arguments[i] = toRef(args[i]);
-            JSLock::DropAllLocks dropAllLocks;
-            return toJS(callAsConstructor(execRef, thisRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
+                arguments[i] = toRef(exec, exec->argument(i));
+            JSValueRef exception = 0;
+            JSObject* result;
+            {
+                APICallbackShim callbackShim(exec);
+                result = toJS(callAsConstructor(execRef, constructorRef, argumentCount, arguments.data(), &exception));
+            }
+            if (exception)
+                throwError(exec, toJS(exec, exception));
+            return JSValue::encode(result);

         }
     }
     
         }
     }
     

-    ASSERT(0); // implementsConstruct should prevent us from reaching here
-    return 0;
+    ASSERT_NOT_REACHED(); // getConstructData should prevent us from reaching here
+    return JSValue::encode(JSValue());

 }
 
 }
 

-template <class Base>
-bool JSCallbackObject<Base>::implementsHasInstance() const
-{
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
-        if (jsClass->hasInstance)
-            return true;
-    
-    return false;
-}
-
-template <class Base>
-bool JSCallbackObject<Base>::hasInstance(ExecState *exec, JSValue *value)
+template <class Parent>
+bool JSCallbackObject<Parent>::hasInstance(JSObject* object, ExecState* exec, JSValue value, JSValue)

 {
 {

+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(object);

     JSContextRef execRef = toRef(exec);
     JSContextRef execRef = toRef(exec);

-    JSObjectRef thisRef = toRef(this);
+    JSObjectRef thisRef = toRef(thisObject);

     
     

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {

         if (JSObjectHasInstanceCallback hasInstance = jsClass->hasInstance) {
         if (JSObjectHasInstanceCallback hasInstance = jsClass->hasInstance) {

-            JSLock::DropAllLocks dropAllLocks;
-            return hasInstance(execRef, thisRef, toRef(value), toRef(exec->exceptionSlot()));
+            JSValueRef valueRef = toRef(exec, value);
+            JSValueRef exception = 0;
+            bool result;
+            {
+                APICallbackShim callbackShim(exec);
+                result = hasInstance(execRef, thisRef, valueRef, &exception);
+            }
+            if (exception)
+                throwError(exec, toJS(exec, exception));
+            return result;

         }
         }

-            
-    ASSERT_NOT_REACHED(); // implementsHasInstance should prevent us from reaching here
-    return 0;
+    }
+    return false;

 }
 
 }
 

-
-template <class Base>
-bool JSCallbackObject<Base>::implementsCall() const
+template <class Parent>
+CallType JSCallbackObject<Parent>::getCallData(JSCell* cell, CallData& callData)

 {
 {

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
-        if (jsClass->callAsFunction)
-            return true;
-    
-    return false;
+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {
+        if (jsClass->callAsFunction) {
+            callData.native.function = call;
+            return CallTypeHost;
+        }
+    }
+    return CallTypeNone;

 }
 
 }
 

-template <class Base>
-JSValue* JSCallbackObject<Base>::callAsFunction(ExecState* exec, JSObject* thisObj, const List &args)
+template <class Parent>
+EncodedJSValue JSCallbackObject<Parent>::call(ExecState* exec)

 {
     JSContextRef execRef = toRef(exec);
 {
     JSContextRef execRef = toRef(exec);

-    JSObjectRef thisRef = toRef(this);
-    JSObjectRef thisObjRef = toRef(thisObj);
+    JSObjectRef functionRef = toRef(exec->callee());
+    JSObjectRef thisObjRef = toRef(exec->hostThisValue().toThisObject(exec));

     
     

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = jsCast<JSCallbackObject<Parent>*>(toJS(functionRef))->classRef(); jsClass; jsClass = jsClass->parentClass) {

         if (JSObjectCallAsFunctionCallback callAsFunction = jsClass->callAsFunction) {
         if (JSObjectCallAsFunctionCallback callAsFunction = jsClass->callAsFunction) {

-            int argumentCount = static_cast<int>(args.size());
+            int argumentCount = static_cast<int>(exec->argumentCount());

             Vector<JSValueRef, 16> arguments(argumentCount);
             for (int i = 0; i < argumentCount; i++)
             Vector<JSValueRef, 16> arguments(argumentCount);
             for (int i = 0; i < argumentCount; i++)

-                arguments[i] = toRef(args[i]);
-            JSLock::DropAllLocks dropAllLocks;
-            return toJS(callAsFunction(execRef, thisRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
+                arguments[i] = toRef(exec, exec->argument(i));
+            JSValueRef exception = 0;
+            JSValue result;
+            {
+                APICallbackShim callbackShim(exec);
+                result = toJS(exec, callAsFunction(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception));
+            }
+            if (exception)
+                throwError(exec, toJS(exec, exception));
+            return JSValue::encode(result);

         }
     }
     
         }
     }
     

-    ASSERT_NOT_REACHED(); // implementsCall should prevent us from reaching here
-    return 0;
+    ASSERT_NOT_REACHED(); // getCallData should prevent us from reaching here
+    return JSValue::encode(JSValue());

 }
 
 }
 

-template <class Base>
-void JSCallbackObject<Base>::getPropertyNames(ExecState* exec, PropertyNameArray& propertyNames)
+template <class Parent>
+void JSCallbackObject<Parent>::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)

 {
 {

+    JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(object);

     JSContextRef execRef = toRef(exec);
     JSContextRef execRef = toRef(exec);

-    JSObjectRef thisRef = toRef(this);
+    JSObjectRef thisRef = toRef(thisObject);

     
     

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = thisObject->classRef(); jsClass; jsClass = jsClass->parentClass) {

         if (JSObjectGetPropertyNamesCallback getPropertyNames = jsClass->getPropertyNames) {
         if (JSObjectGetPropertyNamesCallback getPropertyNames = jsClass->getPropertyNames) {

-            JSLock::DropAllLocks dropAllLocks;
+            APICallbackShim callbackShim(exec);

             getPropertyNames(execRef, thisRef, toRef(&propertyNames));
         }
         
             getPropertyNames(execRef, thisRef, toRef(&propertyNames));
         }
         

-        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues) {
-            typedef OpaqueJSClass::StaticValuesTable::const_iterator iterator;
+        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
+            typedef OpaqueJSClassStaticValuesTable::const_iterator iterator;

             iterator end = staticValues->end();
             for (iterator it = staticValues->begin(); it != end; ++it) {
             iterator end = staticValues->end();
             for (iterator it = staticValues->begin(); it != end; ++it) {

-                UString::Rep* name = it->first.get();
-                StaticValueEntry* entry = it->second;
-                if (entry->getProperty && !(entry->attributes & kJSPropertyAttributeDontEnum))
-                    propertyNames.add(Identifier(name));
+                StringImpl* name = it->first.get();
+                StaticValueEntry* entry = it->second.get();
+                if (entry->getProperty && (!(entry->attributes & kJSPropertyAttributeDontEnum) || (mode == IncludeDontEnumProperties)))
+                    propertyNames.add(Identifier(exec, name));

             }
         }
         
             }
         }
         

-        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
-            typedef OpaqueJSClass::StaticFunctionsTable::const_iterator iterator;
+        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+            typedef OpaqueJSClassStaticFunctionsTable::const_iterator iterator;

             iterator end = staticFunctions->end();
             for (iterator it = staticFunctions->begin(); it != end; ++it) {
             iterator end = staticFunctions->end();
             for (iterator it = staticFunctions->begin(); it != end; ++it) {

-                UString::Rep* name = it->first.get();
-                StaticFunctionEntry* entry = it->second;
-                if (!(entry->attributes & kJSPropertyAttributeDontEnum))
-                    propertyNames.add(Identifier(name));
+                StringImpl* name = it->first.get();
+                StaticFunctionEntry* entry = it->second.get();
+                if (!(entry->attributes & kJSPropertyAttributeDontEnum) || (mode == IncludeDontEnumProperties))
+                    propertyNames.add(Identifier(exec, name));

             }
         }
     }
     
             }
         }
     }
     

-    Base::getPropertyNames(exec, propertyNames);
+    Parent::getOwnPropertyNames(thisObject, exec, propertyNames, mode);

 }
 
 }
 

-template <class Base>
-double JSCallbackObject<Base>::toNumber(ExecState* exec) const
+template <class Parent>
+void JSCallbackObject<Parent>::setPrivate(void* data)

 {
 {

-    JSContextRef ctx = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
-    
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
-            JSLock::DropAllLocks dropAllLocks;
-            if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeNumber, toRef(exec->exceptionSlot())))
-                return toJS(value)->getNumber();
-        }
-            
-    return Base::toNumber(exec);
-}
-
-template <class Base>
-UString JSCallbackObject<Base>::toString(ExecState* exec) const
-{
-    JSContextRef ctx = toRef(exec);
-    JSObjectRef thisRef = toRef(this);
-    
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
-            JSLock::DropAllLocks dropAllLocks;
-            if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeString, toRef(exec->exceptionSlot())))
-                return toJS(value)->getString();
-        }
-            
-    return Base::toString(exec);
-}
-
-template <class Base>
-void JSCallbackObject<Base>::setPrivate(void* data)
-{
-    m_privateData = data;
+    m_callbackObjectData->privateData = data;

 }
 
 }
 

-template <class Base>
-void* JSCallbackObject<Base>::getPrivate()
+template <class Parent>
+void* JSCallbackObject<Parent>::getPrivate()

 {
 {

-    return m_privateData;
+    return m_callbackObjectData->privateData;

 }
 
 }
 

-template <class Base>
-bool JSCallbackObject<Base>::inherits(JSClassRef c) const
+template <class Parent>
+bool JSCallbackObject<Parent>::inherits(JSClassRef c) const

 {
 {

-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
+    for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)

         if (jsClass == c)
             return true;
     
     return false;
 }
 
         if (jsClass == c)
             return true;
     
     return false;
 }
 

-template <class Base>
-JSValue* JSCallbackObject<Base>::cachedValueGetter(ExecState*, JSObject*, const Identifier&, const PropertySlot& slot)
-{
-    JSValue* v = slot.slotBase();
-    ASSERT(v);
-    return v;
-}
-
-template <class Base>
-JSValue* JSCallbackObject<Base>::staticValueGetter(ExecState* exec, JSObject*, const Identifier& propertyName, const PropertySlot& slot)
+template <class Parent>
+JSValue JSCallbackObject<Parent>::getStaticValue(ExecState* exec, const Identifier& propertyName)

 {
 {

-    ASSERT(slot.slotBase()->inherits(&JSCallbackObject::info));
-    JSCallbackObject* thisObj = static_cast<JSCallbackObject*>(slot.slotBase());
-    
-    JSObjectRef thisRef = toRef(thisObj);
-    JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+    JSObjectRef thisRef = toRef(this);
+    RefPtr<OpaqueJSString> propertyNameRef;

     
     

-    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass)
-        if (OpaqueJSClass::StaticValuesTable* staticValues = jsClass->staticValues)
-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep()))
+    for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass)
+        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec))
+            if (StaticValueEntry* entry = staticValues->get(propertyName.impl()))

                 if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {
                 if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {

-                    JSLock::DropAllLocks dropAllLocks;
-                    if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
-                        return toJS(value);
+                    if (!propertyNameRef)
+                        propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+                    JSValueRef exception = 0;
+                    JSValueRef value;
+                    {
+                        APICallbackShim callbackShim(exec);
+                        value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
+                    }
+                    if (exception) {
+                        throwError(exec, toJS(exec, exception));
+                        return jsUndefined();
+                    }
+                    if (value)
+                        return toJS(exec, value);

                 }
                 }

-                    
-    return throwError(exec, ReferenceError, "Static value property defined with NULL getProperty callback.");
+
+    return JSValue();

 }
 
 }
 

-template <class Base>
-JSValue* JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, JSObject*, const Identifier& propertyName, const PropertySlot& slot)
+template <class Parent>
+JSValue JSCallbackObject<Parent>::staticFunctionGetter(ExecState* exec, JSValue slotParent, const Identifier& propertyName)

 {
 {

-    ASSERT(slot.slotBase()->inherits(&JSCallbackObject::info));
-    JSCallbackObject* thisObj = static_cast<JSCallbackObject*>(slot.slotBase());
+    JSCallbackObject* thisObj = asCallbackObject(slotParent);

     
     // Check for cached or override property.
     
     // Check for cached or override property.

-    PropertySlot slot2;
-    if (thisObj->Base::getOwnPropertySlot(exec, propertyName, slot2))
-        return slot2.getValue(exec, thisObj, propertyName);
+    PropertySlot slot2(thisObj);
+    if (Parent::getOwnPropertySlot(thisObj, exec, propertyName, slot2))
+        return slot2.getValue(exec, propertyName);

     
     

-    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass) {
-        if (OpaqueJSClass::StaticFunctionsTable* staticFunctions = jsClass->staticFunctions) {
-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
+    for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
+        if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
+            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {

                 if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {
                 if (JSObjectCallAsFunctionCallback callAsFunction = entry->callAsFunction) {

-                    JSObject* o = new JSCallbackFunction(exec, callAsFunction, propertyName);
-                    thisObj->putDirect(propertyName, o, entry->attributes);
+                    
+                    JSObject* o = JSCallbackFunction::create(exec, thisObj->globalObject(), callAsFunction, propertyName);
+                    thisObj->putDirect(exec->globalData(), propertyName, o, entry->attributes);

                     return o;
                 }
             }
         }
     }
     
                     return o;
                 }
             }
         }
     }
     

-    return throwError(exec, ReferenceError, "Static function property defined with NULL callAsFunction callback.");
+    return throwError(exec, createReferenceError(exec, "Static function property defined with NULL callAsFunction callback."));

 }
 
 }
 

-template <class Base>
-JSValue* JSCallbackObject<Base>::callbackGetter(ExecState* exec, JSObject*, const Identifier& propertyName, const PropertySlot& slot)
+template <class Parent>
+JSValue JSCallbackObject<Parent>::callbackGetter(ExecState* exec, JSValue slotParent, const Identifier& propertyName)

 {
 {

-    ASSERT(slot.slotBase()->inherits(&JSCallbackObject::info));
-    JSCallbackObject* thisObj = static_cast<JSCallbackObject*>(slot.slotBase());
+    JSCallbackObject* thisObj = asCallbackObject(slotParent);

     
     JSObjectRef thisRef = toRef(thisObj);
     
     JSObjectRef thisRef = toRef(thisObj);

-    JSStringRef propertyNameRef = toRef(propertyName.ustring().rep());
+    RefPtr<OpaqueJSString> propertyNameRef;

     
     

-    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass)
+    for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass)

         if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
         if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {

-            JSLock::DropAllLocks dropAllLocks;
-            if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
-                return toJS(value);
+            if (!propertyNameRef)
+                propertyNameRef = OpaqueJSString::create(propertyName.ustring());
+            JSValueRef exception = 0;
+            JSValueRef value;
+            {
+                APICallbackShim callbackShim(exec);
+                value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
+            }
+            if (exception) {
+                throwError(exec, toJS(exec, exception));
+                return jsUndefined();
+            }
+            if (value)
+                return toJS(exec, value);

         }
             
         }
             

-    return throwError(exec, ReferenceError, "hasProperty callback returned true for a property that doesn't exist.");
+    return throwError(exec, createReferenceError(exec, "hasProperty callback returned true for a property that doesn't exist."));

 }
 
 }
 

-} // namespace KJS
+} // namespace JSC