JavaScriptCore-1218.34.tar.gz

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

diff --git a/API/JSClassRef.h b/API/JSClassRef.h
index ae60aadef91baa47b8e345f7ed4fb8263834457b..7bf18e758c1296a97e8a60fd4c711e69a2e4f55f 100644 (file)
--- a/API/JSClassRef.h
+++ b/API/JSClassRef.h
@@ -26,16 +26,16 @@
 #ifndef JSClassRef_h
 #define JSClassRef_h
 
 #ifndef JSClassRef_h
 #define JSClassRef_h
 

-#include "JSObjectRef.h"
+#include <JavaScriptCore/JSObjectRef.h>

 
 

-#include <runtime/JSObject.h>
-#include <runtime/Protect.h>
-#include <runtime/UString.h>
-#include <runtime/WeakGCPtr.h>
+#include "Weak.h"
+#include "Protect.h"

 #include <wtf/HashMap.h>
 #include <wtf/HashMap.h>

-#include <wtf/RefCounted.h>
+#include <wtf/text/WTFString.h>

 
 

-struct StaticValueEntry : FastAllocBase {
+struct StaticValueEntry {
+    WTF_MAKE_FAST_ALLOCATED;
+public:

     StaticValueEntry(JSObjectGetPropertyCallback _getProperty, JSObjectSetPropertyCallback _setProperty, JSPropertyAttributes _attributes)
         : getProperty(_getProperty), setProperty(_setProperty), attributes(_attributes)
     {
     StaticValueEntry(JSObjectGetPropertyCallback _getProperty, JSObjectSetPropertyCallback _setProperty, JSPropertyAttributes _attributes)
         : getProperty(_getProperty), setProperty(_setProperty), attributes(_attributes)
     {


@@ -46,7 +46,9 @@ struct StaticValueEntry : FastAllocBase {
     JSPropertyAttributes attributes;
 };
 
     JSPropertyAttributes attributes;
 };
 

-struct StaticFunctionEntry : FastAllocBase {
+struct StaticFunctionEntry {
+    WTF_MAKE_FAST_ALLOCATED;
+public:

     StaticFunctionEntry(JSObjectCallAsFunctionCallback _callAsFunction, JSPropertyAttributes _attributes)
         : callAsFunction(_callAsFunction), attributes(_attributes)
     {
     StaticFunctionEntry(JSObjectCallAsFunctionCallback _callAsFunction, JSPropertyAttributes _attributes)
         : callAsFunction(_callAsFunction), attributes(_attributes)
     {


@@ -56,36 +58,37 @@ struct StaticFunctionEntry : FastAllocBase {
     JSPropertyAttributes attributes;
 };
 
     JSPropertyAttributes attributes;
 };
 

-typedef HashMap<RefPtr<JSC::UString::Rep>, StaticValueEntry*> OpaqueJSClassStaticValuesTable;
-typedef HashMap<RefPtr<JSC::UString::Rep>, StaticFunctionEntry*> OpaqueJSClassStaticFunctionsTable;
+typedef HashMap<RefPtr<StringImpl>, OwnPtr<StaticValueEntry> > OpaqueJSClassStaticValuesTable;
+typedef HashMap<RefPtr<StringImpl>, OwnPtr<StaticFunctionEntry> > OpaqueJSClassStaticFunctionsTable;

 
 struct OpaqueJSClass;
 
 // An OpaqueJSClass (JSClass) is created without a context, so it can be used with any context, even across context groups.
 // This structure holds data members that vary across context groups.
 
 struct OpaqueJSClass;
 
 // An OpaqueJSClass (JSClass) is created without a context, so it can be used with any context, even across context groups.
 // This structure holds data members that vary across context groups.

-struct OpaqueJSClassContextData : Noncopyable {
-    OpaqueJSClassContextData(OpaqueJSClass*);
-    ~OpaqueJSClassContextData();
+struct OpaqueJSClassContextData {
+    WTF_MAKE_NONCOPYABLE(OpaqueJSClassContextData); WTF_MAKE_FAST_ALLOCATED;
+public:
+    OpaqueJSClassContextData(JSC::VM&, OpaqueJSClass*);

 
     // It is necessary to keep OpaqueJSClass alive because of the following rare scenario:
 
     // It is necessary to keep OpaqueJSClass alive because of the following rare scenario:

-    // 1. A class is created and used, so its context data is stored in JSGlobalData hash map.
+    // 1. A class is created and used, so its context data is stored in VM hash map.

     // 2. The class is released, and when all JS objects that use it are collected, OpaqueJSClass
     // is deleted (that's the part prevented by this RefPtr).
     // 3. Another class is created at the same address.
     // 2. The class is released, and when all JS objects that use it are collected, OpaqueJSClass
     // is deleted (that's the part prevented by this RefPtr).
     // 3. Another class is created at the same address.

-    // 4. When it is used, the old context data is found in JSGlobalData and used.
+    // 4. When it is used, the old context data is found in VM and used.

     RefPtr<OpaqueJSClass> m_class;
 
     RefPtr<OpaqueJSClass> m_class;
 

-    OpaqueJSClassStaticValuesTable* staticValues;
-    OpaqueJSClassStaticFunctionsTable* staticFunctions;
-    JSC::WeakGCPtr<JSC::JSObject> cachedPrototype;
+    OwnPtr<OpaqueJSClassStaticValuesTable> staticValues;
+    OwnPtr<OpaqueJSClassStaticFunctionsTable> staticFunctions;
+    JSC::Weak<JSC::JSObject> cachedPrototype;

 };
 
 };
 

-struct OpaqueJSClass : public ThreadSafeShared<OpaqueJSClass> {
+struct OpaqueJSClass : public ThreadSafeRefCounted<OpaqueJSClass> {

     static PassRefPtr<OpaqueJSClass> create(const JSClassDefinition*);
     static PassRefPtr<OpaqueJSClass> createNoAutomaticPrototype(const JSClassDefinition*);
     static PassRefPtr<OpaqueJSClass> create(const JSClassDefinition*);
     static PassRefPtr<OpaqueJSClass> createNoAutomaticPrototype(const JSClassDefinition*);

-    ~OpaqueJSClass();
+    JS_EXPORT_PRIVATE ~OpaqueJSClass();

     
     

-    JSC::UString className();
+    String className();

     OpaqueJSClassStaticValuesTable* staticValues(JSC::ExecState*);
     OpaqueJSClassStaticFunctionsTable* staticFunctions(JSC::ExecState*);
     JSC::JSObject* prototype(JSC::ExecState*);
     OpaqueJSClassStaticValuesTable* staticValues(JSC::ExecState*);
     OpaqueJSClassStaticFunctionsTable* staticFunctions(JSC::ExecState*);
     JSC::JSObject* prototype(JSC::ExecState*);


@@ -114,10 +117,10 @@ private:
 
     OpaqueJSClassContextData& contextData(JSC::ExecState*);
 
 
     OpaqueJSClassContextData& contextData(JSC::ExecState*);
 

-    // UStrings in these data members should not be put into any IdentifierTable.
-    JSC::UString m_className;
-    OpaqueJSClassStaticValuesTable* m_staticValues;
-    OpaqueJSClassStaticFunctionsTable* m_staticFunctions;
+    // Strings in these data members should not be put into any IdentifierTable.
+    String m_className;
+    OwnPtr<OpaqueJSClassStaticValuesTable> m_staticValues;
+    OwnPtr<OpaqueJSClassStaticFunctionsTable> m_staticFunctions;

 };
 
 #endif // JSClassRef_h
 };
 
 #endif // JSClassRef_h