Changeset 43160 in webkit for trunk/JavaScriptCore/API/JSObjectRef.cpp

Timestamp:

May 3, 2009, 2:02:04 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-05-02 Sam Weinig <​[email protected]>

Roll JSC API number marshaling back in one last time (I hope).

WebCore:

2009-05-03 Sam Weinig <​[email protected]>

Roll JSC API number marshaling back in one last time (I hope).

File:

• trunk/JavaScriptCore/API/JSObjectRef.cpp (modified) (16 diffs)

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -131 +131 @@
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
         result = 0;
@@ -148 +148 @@
         MarkedArgumentBuffer argList;
         for (size_t i = 0; i < argumentCount; ++i)
-            argList.append(toJS(arguments[i]));
+            argList.append(toJS(exec, arguments[i]));
 
         result = constructArray(exec, argList);
@@ -156 +156 @@
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
         result = 0;
@@ -172 +172 @@
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; ++i)
-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));
 
     JSObject* result = constructDate(exec, argList);
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
         result = 0;
@@ -193 +193 @@
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; ++i)
-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));
 
     JSObject* result = constructError(exec, argList);
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
         result = 0;
@@ -214 +214 @@
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; ++i)
-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));
 
     JSObject* result = constructRegExp(exec, argList);
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
         result = 0;
@@ -227 +227 @@
 }
 
-JSValueRef JSObjectGetPrototype(JSContextRef, JSObjectRef object)
-{
-    JSObject* jsObject = toJS(object);
-    return toRef(jsObject->prototype());
-}
-
-void JSObjectSetPrototype(JSContextRef, JSObjectRef object, JSValueRef value)
-{
-    JSObject* jsObject = toJS(object);
-    JSValue jsValue = toJS(value);
+JSValueRef JSObjectGetPrototype(JSContextRef ctx, JSObjectRef object)
+{
+    ExecState* exec = toJS(ctx);
+    exec->globalData().heap.registerThread();
+    JSLock lock(exec);
+
+    JSObject* jsObject = toJS(object);
+    return toRef(exec, jsObject->prototype());
+}
+
+void JSObjectSetPrototype(JSContextRef ctx, JSObjectRef object, JSValueRef value)
+{
+    ExecState* exec = toJS(ctx);
+    exec->globalData().heap.registerThread();
+    JSLock lock(exec);
+
+    JSObject* jsObject = toJS(object);
+    JSValue jsValue = toJS(exec, value);
 
     jsObject->setPrototype(jsValue.isObject() ? jsValue : jsNull());
@@ -263 +271 @@
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
-        exec->clearException();
-    }
-    return toRef(jsValue);
+            *exception = toRef(exec, exec->exception());
+        exec->clearException();
+    }
+    return toRef(exec, jsValue);
 }
 
@@ -277 +285 @@
     JSObject* jsObject = toJS(object);
     Identifier name(propertyName->identifier(&exec->globalData()));
-    JSValue jsValue = toJS(value);
+    JSValue jsValue = toJS(exec, value);
 
     if (attributes && !jsObject->hasProperty(exec, name))
@@ -288 +296 @@
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
     }
@@ -304 +312 @@
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
-        exec->clearException();
-    }
-    return toRef(jsValue);
+            *exception = toRef(exec, exec->exception());
+        exec->clearException();
+    }
+    return toRef(exec, jsValue);
 }
 
@@ -318 +326 @@
 
     JSObject* jsObject = toJS(object);
-    JSValue jsValue = toJS(value);
+    JSValue jsValue = toJS(exec, value);
     
     jsObject->put(exec, propertyIndex, jsValue);
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
     }
@@ -339 +347 @@
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
     }
@@ -392 +400 @@
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; i++)
-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));
 
     CallData callData;
@@ -399 +407 @@
         return 0;
 
-    JSValueRef result = toRef(call(exec, jsObject, callType, callData, jsThisObject, argList));
-    if (exec->hadException()) {
-        if (exception)
-            *exception = toRef(exec->exception());
+    JSValueRef result = toRef(exec, call(exec, jsObject, callType, callData, jsThisObject, argList));
+    if (exec->hadException()) {
+        if (exception)
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
         result = 0;
@@ -431 +439 @@
     MarkedArgumentBuffer argList;
     for (size_t i = 0; i < argumentCount; i++)
-        argList.append(toJS(arguments[i]));
+        argList.append(toJS(exec, arguments[i]));
     JSObjectRef result = toRef(construct(exec, jsObject, constructType, constructData, argList));
     if (exec->hadException()) {
         if (exception)
-            *exception = toRef(exec->exception());
+            *exception = toRef(exec, exec->exception());
         exec->clearException();
         result = 0;