Changeset 33979 in webkit for trunk/JavaScriptCore/API/JSCallbackConstructor.h

Timestamp:

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

Author:

[email protected]

Message:

Merge squirrelfish branch into trunk.

File:

• trunk/JavaScriptCore/API/JSCallbackConstructor.h (modified) (2 diffs)

trunk/JavaScriptCore/API/JSCallbackConstructor.h

@@ -33 +33 @@
 namespace KJS {
 
-class JSCallbackConstructor : public JSObject
-{
+class JSCallbackConstructor : public JSObject {
 public:
     JSCallbackConstructor(ExecState* exec, JSClassRef jsClass, JSObjectCallAsConstructorCallback callback);
@@ -41 +40 @@
     virtual bool implementsHasInstance() const;
     
-    virtual bool implementsConstruct() const;
-    virtual JSObject* construct(ExecState*, const List &args);
+    virtual ConstructType getConstructData(ConstructData&);
+    virtual JSObject* construct(ExecState*, const List& args);
     
     virtual const ClassInfo *classInfo() const { return &info; }