Changeset 33979 in webkit for trunk/JavaScriptCore/kjs/regexp_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/regexp_object.h (modified) (3 diffs)

trunk/JavaScriptCore/kjs/regexp_object.h

@@ -50 +50 @@
         JSValue* exec(ExecState*, const List& args);
 
-        virtual bool implementsCall() const;
+        virtual CallType getCallData(CallData&);
         virtual JSValue* callAsFunction(ExecState*, JSObject*, const List&);
+
         bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
         JSValue* getValueProperty(ExecState*, int token) const;
@@ -76 +77 @@
         RegExpObjectImp(ExecState*, FunctionPrototype*, RegExpPrototype*);
 
-        virtual bool implementsConstruct() const;
+        virtual ConstructType getConstructData(ConstructData&);
         virtual JSObject* construct(ExecState*, const List&);
-        JSObject* createRegExpImp(ExecState*, PassRefPtr<RegExp>);
+
         virtual JSValue* callAsFunction(ExecState*, JSObject*, const List&);
+
         virtual void put(ExecState*, const Identifier&, JSValue*);
         void putValueProperty(ExecState*, int token, JSValue*);
         virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
         JSValue* getValueProperty(ExecState*, int token) const;
+
         virtual const ClassInfo* classInfo() const { return &info; }
+        static const ClassInfo info;
 
         void performMatch(RegExp*, const UString&, int startOffset, int& position, int& length, int** ovector = 0);
@@ -97 +101 @@
 
         OwnPtr<RegExpObjectImpPrivate> d;
-
-        static const ClassInfo info;
     };