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

Timestamp:

May 21, 2008, 6:20:45 PM (17 years ago)

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/kjs/string_object.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/string_object.h

@@ -127 +127 @@
   class StringObjectImp : public InternalFunctionImp {
   public:
-    StringObjectImp(ExecState *exec,
-                    FunctionPrototype *funcProto,
-                    StringPrototype *stringProto);
+    StringObjectImp(ExecState*, FunctionPrototype*, StringPrototype*);
 
-    virtual bool implementsConstruct() const;
-    virtual JSObject *construct(ExecState *exec, const List &args);
-    virtual JSValue *callAsFunction(ExecState *exec, JSObject *thisObj, const List &args);
+    virtual ConstructType getConstructData(ConstructData&);
+    virtual JSObject* construct(ExecState*, const List&);
+
+    virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const List& args);
   };