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

Timestamp:

May 12, 2008, 12:12:31 AM (17 years ago)

Author:

[email protected]

Message:

Roll out recent threading changes (r32807, r32810, r32819, r32822) to simplify
SquirrelFish merging.

File:

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

trunk/JavaScriptCore/API/JSObjectRef.cpp

@@ -75 +75 @@
 
     if (!jsClass)
-        return toRef(new (exec) JSObject(exec->lexicalGlobalObject()->objectPrototype())); // slightly more efficient
+        return toRef(new JSObject(exec->lexicalGlobalObject()->objectPrototype())); // slightly more efficient
 
     JSValue* jsPrototype = jsClass->prototype(ctx);
@@ -81 +81 @@
         jsPrototype = exec->lexicalGlobalObject()->objectPrototype();
 
-    return toRef(new (exec) JSCallbackObject<JSObject>(exec, jsClass, jsPrototype, data));
+    return toRef(new JSCallbackObject<JSObject>(exec, jsClass, jsPrototype, data));
 }
 
@@ -90 +90 @@
     Identifier nameID = name ? Identifier(toJS(name)) : Identifier("anonymous");
     
-    return toRef(new (exec) JSCallbackFunction(exec, callAsFunction, nameID));
+    return toRef(new JSCallbackFunction(exec, callAsFunction, nameID));
 }
 
@@ -102 +102 @@
         : exec->dynamicGlobalObject()->objectPrototype();
     
-    JSCallbackConstructor* constructor = new (exec) JSCallbackConstructor(exec, jsClass, callAsConstructor);
+    JSCallbackConstructor* constructor = new JSCallbackConstructor(exec, jsClass, callAsConstructor);
     constructor->putDirect(exec->propertyNames().prototype, jsPrototype, DontEnum | DontDelete | ReadOnly);
     return toRef(constructor);
@@ -119 +119 @@
     List args;
     for (unsigned i = 0; i < parameterCount; i++)
-        args.append(jsString(exec, UString(toJS(parameterNames[i]))));
-    args.append(jsString(exec, UString(bodyRep)));
+        args.append(jsString(UString(toJS(parameterNames[i]))));
+    args.append(jsString(UString(bodyRep)));
 
     JSObject* result = exec->dynamicGlobalObject()->functionConstructor()->construct(exec, args, nameID, UString(sourceURLRep), startingLineNumber);