JavaScriptCore-1218.35.tar.gz

[apple/javascriptcore.git] / API / JSCallbackFunction.h

diff --git a/API/JSCallbackFunction.h b/API/JSCallbackFunction.h
index 48be3d2f12ccdff7218a2d615d3dca8fc54c1be5..ea1d1abb48094470178198ff89e1e6c10a25e83a 100644 (file)
--- a/API/JSCallbackFunction.h
+++ b/API/JSCallbackFunction.h
@@ -1,6 +1,5 @@
-// -*- mode: c++; c-basic-offset: 4 -*-

 /*
 /*

- * Copyright (C) 2006 Apple Computer, Inc.  All rights reserved.
+ * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions


@@ -27,30 +26,38 @@
 #ifndef JSCallbackFunction_h
 #define JSCallbackFunction_h
 
 #ifndef JSCallbackFunction_h
 #define JSCallbackFunction_h
 

+#include "InternalFunction.h"

 #include "JSObjectRef.h"
 #include "JSObjectRef.h"

-#include "function.h"
-#include "object.h"

 
 

-namespace KJS {
+namespace JSC {

 
 

-class JSCallbackFunction : public InternalFunctionImp
-{
+class JSCallbackFunction : public InternalFunction {
+    friend struct APICallbackFunction;

 public:
 public:

-    JSCallbackFunction(ExecState* exec, JSObjectCallAsFunctionCallback callback, const Identifier& name);
+    typedef InternalFunction Base;

 
 

-    virtual bool implementsHasInstance() const;
-    virtual JSValue* callAsFunction(ExecState*, JSObject* thisObj, const List &args);
+    static JSCallbackFunction* create(ExecState*, JSGlobalObject*, JSObjectCallAsFunctionCallback, const String& name);

 
 

-    virtual const ClassInfo *classInfo() const { return &info; }
-    static const ClassInfo info;
+    static const ClassInfo s_info;

     
     

+    // InternalFunction mish-mashes constructor and function behavior -- we should 
+    // refactor the code so this override isn't necessary
+    static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue proto) 
+    { 
+        return Structure::create(vm, globalObject, proto, TypeInfo(ObjectType, StructureFlags), &s_info); 
+    }
+

 private:
 private:

-    JSCallbackFunction(); // prevent default construction
-    JSCallbackFunction(const JSCallbackFunction&);
-    
+    JSCallbackFunction(JSGlobalObject*, Structure*, JSObjectCallAsFunctionCallback);
+    void finishCreation(VM&, const String& name);
+
+    static CallType getCallData(JSCell*, CallData&);
+
+    JSObjectCallAsFunctionCallback functionCallback() { return m_callback; }
+

     JSObjectCallAsFunctionCallback m_callback;
 };
 
     JSObjectCallAsFunctionCallback m_callback;
 };
 

-} // namespace KJS
+} // namespace JSC

 
 #endif // JSCallbackFunction_h
 
 #endif // JSCallbackFunction_h