Changeset 427 for trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

Timestamp:

08/01/08 14:47:24 (5 months ago)

Author:

sroret

Message:

merge with webkit revision 35510

Files:

• trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h (modified) (15 diffs)

trunk/JavaScriptCore/API/JSCallbackObjectFunctions.h

@@ -31 +31 @@
-#include "JSClassRef.h"
-#include "JSGlobalObject.h"
-#include "JSLock.h"
-#include "JSObjectRef.h"
-#include "JSString.h"
@@ -74 +73 @@
-    // initialize from base to derived
-    for (int i = static_cast<int>(initRoutines.size()) - 1; i >= 0; i--) {
-        JSLock::DropAllLocks dropAllLocks(exec);
-        JSObjectInitializeCallback initialize = initRoutines[i];
-        initialize(toRef(exec), toRef(this));
@@ -113 +111 @@
-        // 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(exec);
-            if (hasProperty(ctx, thisRef, propertyNameRef)) {
-                slot.setCustom(this, callbackGetter);
@@ -119 +116 @@
-            }
-        } else if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
-            JSLock::DropAllLocks dropAllLocks(exec);
-            if (JSValueRef value = getProperty(ctx, thisRef, propertyNameRef, toRef(exec->exceptionSlot()))) {
-                // cache the value so we don't have to compute it again
@@ -163 +159 @@
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
-        if (JSObjectSetPropertyCallback setProperty = jsClass->setProperty) {
-            JSLock::DropAllLocks dropAllLocks(exec);
-            if (setProperty(ctx, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
-                return;
@@ -173 +168 @@
-                    return;
-                if (JSObjectSetPropertyCallback setProperty = entry->setProperty) {
-                    JSLock::DropAllLocks dropAllLocks(exec);
-                    if (setProperty(ctx, thisRef, propertyNameRef, valueRef, toRef(exec->exceptionSlot())))
-                        return;
@@ -209 +203 @@
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
-        if (JSObjectDeletePropertyCallback deleteProperty = jsClass->deleteProperty) {
-            JSLock::DropAllLocks dropAllLocks(exec);
-            if (deleteProperty(ctx, thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
-                return true;
@@ -264 +257 @@
-            for (int i = 0; i < argumentCount; i++)
-                arguments[i] = toRef(args.at(exec, i));
-            JSLock::DropAllLocks dropAllLocks(exec);
-            return toJS(callAsConstructor(execRef, constructorRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
-        }
@@ -289 +281 @@
-    JSObjectRef thisRef = toRef(this);
-    
-
-
-
+
+
-            return hasInstance(execRef, thisRef, toRef(value), toRef(exec->exceptionSlot()));
-
-
+
-    ASSERT_NOT_REACHED(); // implementsHasInstance should prevent us from reaching here
-    return 0;
@@ -324 +314 @@
-            for (int i = 0; i < argumentCount; i++)
-                arguments[i] = toRef(args.at(exec, i));
-            JSLock::DropAllLocks dropAllLocks(exec);
-            return toJS(callAsFunction(execRef, functionRef, thisObjRef, argumentCount, arguments.data(), toRef(exec->exceptionSlot())));
-        }
@@ -340 +329 @@
-    
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass) {
-
-
+
-            getPropertyNames(execRef, thisRef, toRef(&propertyNames));
-        }
-        
-        if (OpaqueJSClassStaticValuesTable* staticValues = jsClass->staticValues(exec)) {
@@ -384 +371 @@
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
-            JSLock::DropAllLocks dropAllLocks(exec);
-            if (JSValueRef value = convertToType(ctx, thisRef, kJSTypeNumber, toRef(exec->exceptionSlot())))
-                return toJS(value)->getNumber();
@@ -400 +386 @@
-    for (JSClassRef jsClass = m_class; jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectConvertToTypeCallback convertToType = jsClass->convertToType) {
-
-
-
-
-
+
-            if (value)
-                return toJS(value)->getString();
@@ -455 +437 @@
-            if (StaticValueEntry* entry = staticValues->get(propertyName.ustring().rep()))
-                if (JSObjectGetPropertyCallback getProperty = entry->getProperty) {
-                    JSLock::DropAllLocks dropAllLocks(exec);
-                    if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
-                        return toJS(value);
@@ -500 +481 @@
-    for (JSClassRef jsClass = thisObj->m_class; jsClass; jsClass = jsClass->parentClass)
-        if (JSObjectGetPropertyCallback getProperty = jsClass->getProperty) {
-            JSLock::DropAllLocks dropAllLocks(exec);
-            if (JSValueRef value = getProperty(toRef(exec), thisRef, propertyNameRef, toRef(exec->exceptionSlot())))
-                return toJS(value);