Changeset 33038 in webkit for trunk/JavaScriptCore/kjs/string_object.h

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/kjs/string_object.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/string_object.h

@@ -32 +32 @@
   class StringInstance : public JSWrapperObject {
   public:
-    StringInstance(ExecState*, JSObject* proto);
+    StringInstance(JSObject *proto);
     StringInstance(JSObject *proto, StringImp*);
-    StringInstance(ExecState*, JSObject* proto, const UString&);
+    StringInstance(JSObject *proto, const UString&);
 
     virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
@@ -58 +58 @@
   class StringInstanceThatMasqueradesAsUndefined : public StringInstance {
   public:
-      StringInstanceThatMasqueradesAsUndefined(ExecState* exec, JSObject* proto, const UString& string)
-          : StringInstance(exec, proto, string) { }
+      StringInstanceThatMasqueradesAsUndefined(JSObject* proto, const UString& string)
+          : StringInstance(proto, string) { }
       virtual bool masqueradeAsUndefined() const { return true; }
       virtual bool toBoolean(ExecState*) const { return false; }