JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/API/ObjCCallbackFunction.h b/API/ObjCCallbackFunction.h
index 0b0b5432d657d57fb49031d42177ad0319142051..adb167c7631700cf165f762915dd8015a19f8bed 100644 (file)
--- a/API/ObjCCallbackFunction.h
+++ b/API/ObjCCallbackFunction.h
@@ -48,21 +48,21 @@ class ObjCCallbackFunction : public InternalFunction {
 public:
     typedef InternalFunction Base;
 
 public:
     typedef InternalFunction Base;
 

-    static ObjCCallbackFunction* create(VM&, JSGlobalObject*, const String& name, PassOwnPtr<ObjCCallbackFunctionImpl>);
+    static ObjCCallbackFunction* create(VM&, JSGlobalObject*, const String& name, std::unique_ptr<ObjCCallbackFunctionImpl>);

     static void destroy(JSCell*);
 
     static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
     {
         ASSERT(globalObject);
     static void destroy(JSCell*);
 
     static Structure* createStructure(VM& vm, JSGlobalObject* globalObject, JSValue prototype)
     {
         ASSERT(globalObject);

-        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), &s_info);
+        return Structure::create(vm, globalObject, prototype, TypeInfo(ObjectType, StructureFlags), info());

     }
 
     }
 

-    static JS_EXPORTDATA const ClassInfo s_info;
+    DECLARE_EXPORT_INFO;

 
     ObjCCallbackFunctionImpl* impl() const { return m_impl.get(); }
 
 protected:
 
     ObjCCallbackFunctionImpl* impl() const { return m_impl.get(); }
 
 protected:

-    ObjCCallbackFunction(VM&, JSGlobalObject*, JSObjectCallAsFunctionCallback, JSObjectCallAsConstructorCallback, PassOwnPtr<ObjCCallbackFunctionImpl>);
+    ObjCCallbackFunction(VM&, JSGlobalObject*, JSObjectCallAsFunctionCallback, JSObjectCallAsConstructorCallback, std::unique_ptr<ObjCCallbackFunctionImpl>);

 
 private:
     static CallType getCallData(JSCell*, CallData&);
 
 private:
     static CallType getCallData(JSCell*, CallData&);


@@ -73,7 +73,7 @@ private:
 
     JSObjectCallAsFunctionCallback m_functionCallback;
     JSObjectCallAsConstructorCallback m_constructCallback;
 
     JSObjectCallAsFunctionCallback m_functionCallback;
     JSObjectCallAsConstructorCallback m_constructCallback;

-    OwnPtr<ObjCCallbackFunctionImpl> m_impl;
+    std::unique_ptr<ObjCCallbackFunctionImpl> m_impl;

 };
 
 } // namespace JSC
 };
 
 } // namespace JSC