JavaScriptCore-903.tar.gz

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

diff --git a/API/JSCallbackObjectFunctions.h b/API/JSCallbackObjectFunctions.h
index 1abed3fb563608d82d0c8f1e5eba1017091bbd65..cc8f3a870afc77c95d58a2e9e63d87ebd7d65317 100644 (file)
--- a/API/JSCallbackObjectFunctions.h
+++ b/API/JSCallbackObjectFunctions.h
@@ -24,10 +24,13 @@
  * 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 "APIShims.h"

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

+#include "ExceptionHelpers.h"

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

+#include "JSFunction.h"

 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "JSObjectRef.h"
 #include "JSGlobalObject.h"
 #include "JSLock.h"
 #include "JSObjectRef.h"


@@ -42,25 +45,27 @@ namespace JSC {
 template <class Base>
 inline JSCallbackObject<Base>* JSCallbackObject<Base>::asCallbackObject(JSValue value)
 {
 template <class Base>
 inline JSCallbackObject<Base>* JSCallbackObject<Base>::asCallbackObject(JSValue value)
 {

-    ASSERT(asObject(value)->inherits(&info));
+    ASSERT(asObject(value)->inherits(&s_info));

     return static_cast<JSCallbackObject*>(asObject(value));
 }
 
 template <class Base>
     return static_cast<JSCallbackObject*>(asObject(value));
 }
 
 template <class Base>

-JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, PassRefPtr<Structure> structure, JSClassRef jsClass, void* data)
-    : Base(structure)
-    , m_callbackObjectData(new JSCallbackObjectData(data, jsClass))
+JSCallbackObject<Base>::JSCallbackObject(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSClassRef jsClass, void* data)
+    : Base(globalObject, structure)
+    , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(data, jsClass)))

 {
 {

+    ASSERT(Base::inherits(&s_info));

     init(exec);
 }
 
 // Global object constructor.
 // FIXME: Move this into a separate JSGlobalCallbackObject class derived from this one.
 template <class Base>
     init(exec);
 }
 
 // Global object constructor.
 // FIXME: Move this into a separate JSGlobalCallbackObject class derived from this one.
 template <class Base>

-JSCallbackObject<Base>::JSCallbackObject(JSClassRef jsClass)
-    : Base()
-    , m_callbackObjectData(new JSCallbackObjectData(0, jsClass))
+JSCallbackObject<Base>::JSCallbackObject(JSGlobalData& globalData, JSClassRef jsClass, Structure* structure)
+    : Base(globalData, structure)
+    , m_callbackObjectData(adoptPtr(new JSCallbackObjectData(0, jsClass)))

 {
 {

+    ASSERT(Base::inherits(&s_info));

     ASSERT(Base::isGlobalObject());
     init(static_cast<JSGlobalObject*>(this)->globalExec());
 }
     ASSERT(Base::isGlobalObject());
     init(static_cast<JSGlobalObject*>(this)->globalExec());
 }


@@ -79,20 +84,20 @@ 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(exec);
+        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 = classRef(); jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectFinalizeCallback finalize = jsClass->finalize)
-            finalize(thisRef);
+    bool needsFinalizer = false;
+    for (JSClassRef jsClassPtr = classRef(); jsClassPtr && !needsFinalizer; jsClassPtr = jsClassPtr->parentClass)
+        needsFinalizer = jsClassPtr->finalize;
+    if (needsFinalizer) {
+        HandleSlot slot = exec->globalData().allocateGlobalHandle();
+        HandleHeap::heapFor(slot)->makeWeak(slot, m_callbackObjectData.get(), classRef());
+        HandleHeap::heapFor(slot)->writeBarrier(slot, this);
+        *slot = this;
+    }

 }
 
 template <class Base>
 }
 
 template <class Base>


@@ -117,7 +122,7 @@ bool JSCallbackObject<Base>::getOwnPropertySlot(ExecState* exec, const Identifie
         if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
             if (!propertyNameRef)
                 propertyNameRef = OpaqueJSString::create(propertyName.ustring());
         if (JSObjectHasPropertyCallback hasProperty = jsClass->hasProperty) {
             if (!propertyNameRef)
                 propertyNameRef = OpaqueJSString::create(propertyName.ustring());

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

             if (hasProperty(ctx, thisRef, propertyNameRef.get())) {
                 slot.setCustom(this, callbackGetter);
                 return true;
             if (hasProperty(ctx, thisRef, propertyNameRef.get())) {
                 slot.setCustom(this, callbackGetter);
                 return true;


@@ -128,29 +133,32 @@ bool JSCallbackObject<Base>::getOwnPropertySlot(ExecState* exec, const Identifie
             JSValueRef exception = 0;
             JSValueRef value;
             {
             JSValueRef exception = 0;
             JSValueRef value;
             {

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

                 value = getProperty(ctx, thisRef, propertyNameRef.get(), &exception);
             }
                 value = getProperty(ctx, thisRef, propertyNameRef.get(), &exception);
             }

-            exec->setException(toJS(exec, exception));
-            if (value) {
-                slot.setValue(toJS(exec, value));
-                return true;
-            }

             if (exception) {
             if (exception) {

+                throwError(exec, toJS(exec, exception));

                 slot.setValue(jsUndefined());
                 return true;
             }
                 slot.setValue(jsUndefined());
                 return true;
             }

+            if (value) {
+                slot.setValue(toJS(exec, value));
+                return true;
+            }

         }
         
         if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
         }
         
         if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {

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

             }
         }
         
         if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
             }
         }
         
         if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {

-            if (staticFunctions->contains(propertyName.ustring().rep())) {
+            if (staticFunctions->contains(propertyName.impl())) {

                 slot.setCustom(this, staticFunctionGetter);
                 return true;
             }
                 slot.setCustom(this, staticFunctionGetter);
                 return true;
             }


@@ -161,9 +169,22 @@ bool JSCallbackObject<Base>::getOwnPropertySlot(ExecState* exec, const Identifie
 }
 
 template <class Base>
 }
 
 template <class Base>

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

 {
 {

-    return getOwnPropertySlot(exec, Identifier::from(exec, propertyName), slot);
+    PropertySlot slot;
+    if (getOwnPropertySlot(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 Base::getOwnPropertyDescriptor(exec, propertyName, descriptor);

 }
 
 template <class Base>
 }
 
 template <class Base>


@@ -181,16 +202,17 @@ void JSCallbackObject<Base>::put(ExecState* exec, const Identifier& propertyName
             JSValueRef exception = 0;
             bool result;
             {
             JSValueRef exception = 0;
             bool result;
             {

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

                 result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
             }
                 result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
             }

-            exec->setException(toJS(exec, exception));
+            if (exception)
+                throwError(exec, toJS(exec, exception));

             if (result || exception)
                 return;
         }
         
         if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
             if (result || exception)
                 return;
         }
         
         if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {

-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
+            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) {


@@ -199,22 +221,22 @@ void JSCallbackObject<Base>::put(ExecState* exec, const Identifier& propertyName
                     JSValueRef exception = 0;
                     bool result;
                     {
                     JSValueRef exception = 0;
                     bool result;
                     {

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

                         result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
                     }
                         result = setProperty(ctx, thisRef, propertyNameRef.get(), valueRef, &exception);
                     }

-                    exec->setException(toJS(exec, exception));
+                    if (exception)
+                        throwError(exec, toJS(exec, exception));

                     if (result || exception)
                         return;
                     if (result || exception)
                         return;

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

             }
         }
         
         if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
             }
         }
         
         if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {

-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
+            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {

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

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

                 return;
             }
         }
                 return;
             }
         }


@@ -237,16 +259,17 @@ bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, const Identifier& p
             JSValueRef exception = 0;
             bool result;
             {
             JSValueRef exception = 0;
             bool result;
             {

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

                 result = deleteProperty(ctx, thisRef, propertyNameRef.get(), &exception);
             }
                 result = deleteProperty(ctx, thisRef, propertyNameRef.get(), &exception);
             }

-            exec->setException(toJS(exec, exception));
+            if (exception)
+                throwError(exec, toJS(exec, exception));

             if (result || exception)
                 return true;
         }
         
         if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
             if (result || exception)
                 return true;
         }
         
         if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {

-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep())) {
+            if (StaticValueEntry* entry = staticValues->get(propertyName.impl())) {

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


@@ -254,7 +277,7 @@ bool JSCallbackObject<Base>::deleteProperty(ExecState* exec, const Identifier& p
         }
         
         if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
         }
         
         if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {

-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
+            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {

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


@@ -284,30 +307,32 @@ ConstructType JSCallbackObject<Base>::getConstructData(ConstructData& constructD
 }
 
 template <class Base>
 }
 
 template <class Base>

-JSObject* JSCallbackObject<Base>::construct(ExecState* exec, JSObject* constructor, const ArgList& args)
+EncodedJSValue JSCallbackObject<Base>::construct(ExecState* exec)

 {
 {

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

     JSContextRef execRef = toRef(exec);
     JSObjectRef constructorRef = toRef(constructor);
     
     for (JSClassRef jsClass = static_cast<JSCallbackObject<Base>*>(constructor)->classRef(); jsClass; jsClass = jsClass->parentClass) {
         if (JSObjectCallAsConstructorCallback callAsConstructor = jsClass->callAsConstructor) {
     JSContextRef execRef = toRef(exec);
     JSObjectRef constructorRef = toRef(constructor);
     
     for (JSClassRef jsClass = static_cast<JSCallbackObject<Base>*>(constructor)->classRef(); jsClass; jsClass = jsClass->parentClass) {
         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(exec, args.at(i));
+                arguments[i] = toRef(exec, exec->argument(i));

             JSValueRef exception = 0;
             JSObject* result;
             {
             JSValueRef exception = 0;
             JSObject* result;
             {

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

                 result = toJS(callAsConstructor(execRef, constructorRef, argumentCount, arguments.data(), &exception));
             }
                 result = toJS(callAsConstructor(execRef, constructorRef, argumentCount, arguments.data(), &exception));
             }

-            exec->setException(toJS(exec, exception));
-            return result;
+            if (exception)
+                throwError(exec, toJS(exec, exception));
+            return JSValue::encode(result);

         }
     }
     
     ASSERT_NOT_REACHED(); // getConstructData should prevent us from reaching here
         }
     }
     
     ASSERT_NOT_REACHED(); // getConstructData should prevent us from reaching here

-    return 0;
+    return JSValue::encode(JSValue());

 }
 
 template <class Base>
 }
 
 template <class Base>


@@ -322,10 +347,11 @@ bool JSCallbackObject<Base>::hasInstance(ExecState* exec, JSValue value, JSValue
             JSValueRef exception = 0;
             bool result;
             {
             JSValueRef exception = 0;
             bool result;
             {

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

                 result = hasInstance(execRef, thisRef, valueRef, &exception);
             }
                 result = hasInstance(execRef, thisRef, valueRef, &exception);
             }

-            exec->setException(toJS(exec, exception));
+            if (exception)
+                throwError(exec, toJS(exec, exception));

             return result;
         }
     }
             return result;
         }
     }


@@ -345,42 +371,43 @@ CallType JSCallbackObject<Base>::getCallData(CallData& callData)
 }
 
 template <class Base>
 }
 
 template <class Base>

-JSValue JSCallbackObject<Base>::call(ExecState* exec, JSObject* functionObject, JSValue thisValue, const ArgList& args)
+EncodedJSValue JSCallbackObject<Base>::call(ExecState* exec)

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

-    JSObjectRef functionRef = toRef(functionObject);
-    JSObjectRef thisObjRef = toRef(thisValue.toThisObject(exec));
+    JSObjectRef functionRef = toRef(exec->callee());
+    JSObjectRef thisObjRef = toRef(exec->hostThisValue().toThisObject(exec));

     
     

-    for (JSClassRef jsClass = static_cast<JSCallbackObject<Base>*>(functionObject)->classRef(); jsClass; jsClass = jsClass->parentClass) {
+    for (JSClassRef jsClass = static_cast<JSCallbackObject<Base>*>(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(exec, args.at(i));
+                arguments[i] = toRef(exec, exec->argument(i));

             JSValueRef exception = 0;
             JSValue result;
             {
             JSValueRef exception = 0;
             JSValue result;
             {

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

                 result = toJS(exec, callAsFunction(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception));
             }
                 result = toJS(exec, callAsFunction(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), &exception));
             }

-            exec->setException(toJS(exec, exception));
-            return result;
+            if (exception)
+                throwError(exec, toJS(exec, exception));
+            return JSValue::encode(result);

         }
     }
     
     ASSERT_NOT_REACHED(); // getCallData should prevent us from reaching here
         }
     }
     
     ASSERT_NOT_REACHED(); // getCallData should prevent us from reaching here

-    return JSValue();
+    return JSValue::encode(JSValue());

 }
 
 template <class Base>
 }
 
 template <class Base>

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

 {
     JSContextRef execRef = toRef(exec);
     JSObjectRef thisRef = toRef(this);
     
     for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
         if (JSObjectGetPropertyNamesCallback getPropertyNames = jsClass->getPropertyNames) {
 {
     JSContextRef execRef = toRef(exec);
     JSObjectRef thisRef = toRef(this);
     
     for (JSClassRef jsClass = classRef(); jsClass; jsClass = jsClass->parentClass) {
         if (JSObjectGetPropertyNamesCallback getPropertyNames = jsClass->getPropertyNames) {

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

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


@@ -388,9 +415,9 @@ void JSCallbackObject<Base>::getPropertyNames(ExecState* exec, PropertyNameArray
             typedef OpaqueJSClassStaticValuesTable::const_iterator iterator;
             iterator end = staticValues->end();
             for (iterator it = staticValues->begin(); it != end; ++it) {
             typedef OpaqueJSClassStaticValuesTable::const_iterator iterator;
             iterator end = staticValues->end();
             for (iterator it = staticValues->begin(); it != end; ++it) {

-                UString::Rep* name = it->first.get();
+                StringImpl* name = it->first.get();

                 StaticValueEntry* entry = it->second;
                 StaticValueEntry* entry = it->second;

-                if (entry->getProperty && !(entry->attributes & kJSPropertyAttributeDontEnum))
+                if (entry->getProperty && (!(entry->attributes & kJSPropertyAttributeDontEnum) || (mode == IncludeDontEnumProperties)))

                     propertyNames.add(Identifier(exec, name));
             }
         }
                     propertyNames.add(Identifier(exec, name));
             }
         }


@@ -399,15 +426,15 @@ void JSCallbackObject<Base>::getPropertyNames(ExecState* exec, PropertyNameArray
             typedef OpaqueJSClassStaticFunctionsTable::const_iterator iterator;
             iterator end = staticFunctions->end();
             for (iterator it = staticFunctions->begin(); it != end; ++it) {
             typedef OpaqueJSClassStaticFunctionsTable::const_iterator iterator;
             iterator end = staticFunctions->end();
             for (iterator it = staticFunctions->begin(); it != end; ++it) {

-                UString::Rep* name = it->first.get();
+                StringImpl* name = it->first.get();

                 StaticFunctionEntry* entry = it->second;
                 StaticFunctionEntry* entry = it->second;

-                if (!(entry->attributes & kJSPropertyAttributeDontEnum))
+                if (!(entry->attributes & kJSPropertyAttributeDontEnum) || (mode == IncludeDontEnumProperties))

                     propertyNames.add(Identifier(exec, name));
             }
         }
     }
     
                     propertyNames.add(Identifier(exec, name));
             }
         }
     }
     

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

 }
 
 template <class Base>
 }
 
 template <class Base>


@@ -426,16 +453,17 @@ double JSCallbackObject<Base>::toNumber(ExecState* exec) const
             JSValueRef exception = 0;
             JSValueRef value;
             {
             JSValueRef exception = 0;
             JSValueRef value;
             {

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

                 value = convertToType(ctx, thisRef, kJSTypeNumber, &exception);
             }
             if (exception) {
                 value = convertToType(ctx, thisRef, kJSTypeNumber, &exception);
             }
             if (exception) {

-                exec->setException(toJS(exec, exception));
+                throwError(exec, toJS(exec, exception));

                 return 0;
             }
 
             double dValue;
                 return 0;
             }
 
             double dValue;

-            return toJS(exec, value).getNumber(dValue) ? dValue : NaN;
+            if (value)
+                return toJS(exec, value).getNumber(dValue) ? dValue : NaN;

         }
             
     return Base::toNumber(exec);
         }
             
     return Base::toNumber(exec);


@@ -452,14 +480,15 @@ UString JSCallbackObject<Base>::toString(ExecState* exec) const
             JSValueRef exception = 0;
             JSValueRef value;
             {
             JSValueRef exception = 0;
             JSValueRef value;
             {

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

                 value = convertToType(ctx, thisRef, kJSTypeString, &exception);
             }
             if (exception) {
                 value = convertToType(ctx, thisRef, kJSTypeString, &exception);
             }
             if (exception) {

-                exec->setException(toJS(exec, exception));
+                throwError(exec, toJS(exec, exception));

                 return "";
             }
                 return "";
             }

-            return toJS(exec, value).getString();
+            if (value)
+                return toJS(exec, value).getString(exec);

         }
             
     return Base::toString(exec);
         }
             
     return Base::toString(exec);


@@ -488,39 +517,38 @@ bool JSCallbackObject<Base>::inherits(JSClassRef c) const
 }
 
 template <class Base>
 }
 
 template <class Base>

-JSValue JSCallbackObject<Base>::staticValueGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue JSCallbackObject<Base>::getStaticValue(ExecState* exec, const Identifier& propertyName)

 {
 {

-    JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
-    
-    JSObjectRef thisRef = toRef(thisObj);
+    JSObjectRef thisRef = toRef(this);

     RefPtr<OpaqueJSString> propertyNameRef;
     
     RefPtr<OpaqueJSString> propertyNameRef;
     

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

         if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec))
         if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec))

-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep()))
+            if (StaticValueEntry* entry = staticValues->get(propertyName.impl()))

                 if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {
                     if (!propertyNameRef)
                         propertyNameRef = OpaqueJSString::create(propertyName.ustring());
                     JSValueRef exception = 0;
                     JSValueRef value;
                     {
                 if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {
                     if (!propertyNameRef)
                         propertyNameRef = OpaqueJSString::create(propertyName.ustring());
                     JSValueRef exception = 0;
                     JSValueRef value;
                     {

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

                         value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
                     }
                         value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
                     }

-                    exec->setException(toJS(exec, exception));
+                    if (exception) {
+                        throwError(exec, toJS(exec, exception));
+                        return jsUndefined();
+                    }

                     if (value)
                         return toJS(exec, value);
                     if (value)
                         return toJS(exec, value);

-                    if (exception)
-                        return jsUndefined();

                 }
                 }

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

 }
 
 template <class Base>
 }
 
 template <class Base>

-JSValue JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, JSValue slotBase, const Identifier& propertyName)

 {
 {

-    JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
+    JSCallbackObject* thisObj = asCallbackObject(slotBase);

     
     // Check for cached or override property.
     PropertySlot slot2(thisObj);
     
     // Check for cached or override property.
     PropertySlot slot2(thisObj);


@@ -529,23 +557,24 @@ JSValue JSCallbackObject<Base>::staticFunctionGetter(ExecState* exec, const Iden
     
     for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
         if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {
     
     for (JSClassRef jsClass = thisObj->classRef(); jsClass; jsClass = jsClass->parentClass) {
         if (OpaqueJSClassStaticFunctionsTable* staticFunctions = jsClass->staticFunctions(exec)) {

-            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.ustring().rep())) {
+            if (StaticFunctionEntry* entry = staticFunctions->get(propertyName.impl())) {

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

-                    JSObject* o = new (exec) JSCallbackFunction(exec, callAsFunction, propertyName);
-                    thisObj->putDirect(propertyName, o, entry->attributes);
+                    
+                    JSObject* o = new (exec) JSCallbackFunction(exec, asGlobalObject(thisObj->getAnonymousValue(0)), 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>
 }
 
 template <class Base>

-JSValue JSCallbackObject<Base>::callbackGetter(ExecState* exec, const Identifier& propertyName, const PropertySlot& slot)
+JSValue JSCallbackObject<Base>::callbackGetter(ExecState* exec, JSValue slotBase, const Identifier& propertyName)

 {
 {

-    JSCallbackObject* thisObj = asCallbackObject(slot.slotBase());
+    JSCallbackObject* thisObj = asCallbackObject(slotBase);

     
     JSObjectRef thisRef = toRef(thisObj);
     RefPtr<OpaqueJSString> propertyNameRef;
     
     JSObjectRef thisRef = toRef(thisObj);
     RefPtr<OpaqueJSString> propertyNameRef;


@@ -557,17 +586,18 @@ JSValue JSCallbackObject<Base>::callbackGetter(ExecState* exec, const Identifier
             JSValueRef exception = 0;
             JSValueRef value;
             {
             JSValueRef exception = 0;
             JSValueRef value;
             {

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

                 value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
             }
                 value = getProperty(toRef(exec), thisRef, propertyNameRef.get(), &exception);
             }

-            exec->setException(toJS(exec, exception));
+            if (exception) {
+                throwError(exec, toJS(exec, exception));
+                return jsUndefined();
+            }

             if (value)
                 return toJS(exec, value);
             if (value)
                 return toJS(exec, value);

-            if (exception)
-                return jsUndefined();

         }
             
         }
             

-    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 JSC
 }
 
 } // namespace JSC