commit 53f9919d655a49f395674b9f15f33a996c2b775d
author ap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon May 12 07:12:31 2008 +0000
committer ap@webkit.org <ap@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Mon May 12 07:12:31 2008 +0000
tree 0d52224d3fd4aa3c2930554f2a386247a081ae85
parent a8ad498186dd9d235e2eff359f221199f97624d6

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



git-svn-id: http://svn.webkit.org/repository/webkit/trunk@33038 268f45cc-cd09-0410-ab3c-d52691b4dbfc

JavaScriptCore/kjs/string_object.h

diff --git a/JavaScriptCore/kjs/string_object.h b/JavaScriptCore/kjs/string_object.h
index 5a8fd8a..8508788 100644
--- a/JavaScriptCore/kjs/string_object.h
+++ b/JavaScriptCore/kjs/string_object.h
@@ -31,9 +31,9 @@
 
   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&);
     virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
@@ -57,8 +57,8 @@
   // WebCore uses this to make style.filter undetectable
   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; }
   };