JavaScriptCore-903.tar.gz

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

diff --git a/API/JSCallbackObject.h b/API/JSCallbackObject.h
index 1cf7a02b256e11521d8a699ec04f462d47bd81cb..2b322e7cf2c8386dc58c12d2fa7235496c5633bf 100644 (file)
--- a/API/JSCallbackObject.h
+++ b/API/JSCallbackObject.h
@@ -1,5 +1,5 @@
 /*
 /*

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

  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without
  * Copyright (C) 2007 Eric Seidel <eric@webkit.org>
  *
  * Redistribution and use in source and binary forms, with or without


@@ -30,10 +30,11 @@
 #include "JSObjectRef.h"
 #include "JSValueRef.h"
 #include "JSObject.h"
 #include "JSObjectRef.h"
 #include "JSValueRef.h"
 #include "JSObject.h"

+#include <wtf/PassOwnPtr.h>

 
 namespace JSC {
 
 
 namespace JSC {
 

-struct JSCallbackObjectData {
+struct JSCallbackObjectData : WeakHandleOwner {

     JSCallbackObjectData(void* privateData, JSClassRef jsClass)
         : privateData(privateData)
         , jsClass(jsClass)
     JSCallbackObjectData(void* privateData, JSClassRef jsClass)
         : privateData(privateData)
         , jsClass(jsClass)


@@ -53,11 +54,11 @@ struct JSCallbackObjectData {
         return m_privateProperties->getPrivateProperty(propertyName);
     }
     
         return m_privateProperties->getPrivateProperty(propertyName);
     }
     

-    void setPrivateProperty(const Identifier& propertyName, JSValue value)
+    void setPrivateProperty(JSGlobalData& globalData, JSCell* owner, const Identifier& propertyName, JSValue value)

     {
         if (!m_privateProperties)
     {
         if (!m_privateProperties)

-            m_privateProperties.set(new JSPrivatePropertyMap);
-        m_privateProperties->setPrivateProperty(propertyName, value);
+            m_privateProperties = adoptPtr(new JSPrivatePropertyMap);
+        m_privateProperties->setPrivateProperty(globalData, owner, propertyName, value);

     }
     
     void deletePrivateProperty(const Identifier& propertyName)
     }
     
     void deletePrivateProperty(const Identifier& propertyName)


@@ -67,11 +68,11 @@ struct JSCallbackObjectData {
         m_privateProperties->deletePrivateProperty(propertyName);
     }
 
         m_privateProperties->deletePrivateProperty(propertyName);
     }
 

-    void markChildren(MarkStack& markStack)
+    void visitChildren(SlotVisitor& visitor)

     {
         if (!m_privateProperties)
             return;
     {
         if (!m_privateProperties)
             return;

-        m_privateProperties->markChildren(markStack);
+        m_privateProperties->visitChildren(visitor);

     }
 
     void* privateData;
     }
 
     void* privateData;


@@ -79,56 +80,57 @@ struct JSCallbackObjectData {
     struct JSPrivatePropertyMap {
         JSValue getPrivateProperty(const Identifier& propertyName) const
         {
     struct JSPrivatePropertyMap {
         JSValue getPrivateProperty(const Identifier& propertyName) const
         {

-            PrivatePropertyMap::const_iterator location = m_propertyMap.find(propertyName.ustring().rep());
+            PrivatePropertyMap::const_iterator location = m_propertyMap.find(propertyName.impl());

             if (location == m_propertyMap.end())
                 return JSValue();
             if (location == m_propertyMap.end())
                 return JSValue();

-            return location->second;
+            return location->second.get();

         }
         
         }
         

-        void setPrivateProperty(const Identifier& propertyName, JSValue value)
+        void setPrivateProperty(JSGlobalData& globalData, JSCell* owner, const Identifier& propertyName, JSValue value)

         {
         {

-            m_propertyMap.set(propertyName.ustring().rep(), value);
+            WriteBarrier<Unknown> empty;
+            m_propertyMap.add(propertyName.impl(), empty).first->second.set(globalData, owner, value);

         }
         
         void deletePrivateProperty(const Identifier& propertyName)
         {
         }
         
         void deletePrivateProperty(const Identifier& propertyName)
         {

-            m_propertyMap.remove(propertyName.ustring().rep());
+            m_propertyMap.remove(propertyName.impl());

         }
 
         }
 

-        void markChildren(MarkStack& markStack)
+        void visitChildren(SlotVisitor& visitor)

         {
             for (PrivatePropertyMap::iterator ptr = m_propertyMap.begin(); ptr != m_propertyMap.end(); ++ptr) {
                 if (ptr->second)
         {
             for (PrivatePropertyMap::iterator ptr = m_propertyMap.begin(); ptr != m_propertyMap.end(); ++ptr) {
                 if (ptr->second)

-                    markStack.append(ptr->second);
+                    visitor.append(&ptr->second);

             }
         }
 
     private:
             }
         }
 
     private:

-        typedef HashMap<RefPtr<UString::Rep>, JSValue, IdentifierRepHash> PrivatePropertyMap;
+        typedef HashMap<RefPtr<StringImpl>, WriteBarrier<Unknown>, IdentifierRepHash> PrivatePropertyMap;

         PrivatePropertyMap m_propertyMap;
     };
     OwnPtr<JSPrivatePropertyMap> m_privateProperties;
         PrivatePropertyMap m_propertyMap;
     };
     OwnPtr<JSPrivatePropertyMap> m_privateProperties;

+    virtual void finalize(Handle<Unknown>, void*);

 };
 
     
 template <class Base>
 class JSCallbackObject : public Base {
 public:
 };
 
     
 template <class Base>
 class JSCallbackObject : public Base {
 public:

-    JSCallbackObject(ExecState*, NonNullPassRefPtr<Structure>, JSClassRef, void* data);
-    JSCallbackObject(JSClassRef);
-    virtual ~JSCallbackObject();
+    JSCallbackObject(ExecState*, JSGlobalObject*, Structure*, JSClassRef, void* data);
+    JSCallbackObject(JSGlobalData&, JSClassRef, Structure*);

 
     void setPrivate(void* data);
     void* getPrivate();
 
 
     void setPrivate(void* data);
     void* getPrivate();
 

-    static const ClassInfo info;
+    static const ClassInfo s_info;

 
     JSClassRef classRef() const { return m_callbackObjectData->jsClass; }
     bool inherits(JSClassRef) const;
 
 
     JSClassRef classRef() const { return m_callbackObjectData->jsClass; }
     bool inherits(JSClassRef) const;
 

-    static PassRefPtr<Structure> createStructure(JSValue proto) 
+    static Structure* createStructure(JSGlobalData& globalData, JSValue proto) 

     { 
     { 

-        return Structure::create(proto, TypeInfo(ObjectType, StructureFlags), Base::AnonymousSlotCount); 
+        return Structure::create(globalData, proto, TypeInfo(ObjectType, StructureFlags), Base::AnonymousSlotCount, &s_info); 

     }
     
     JSValue getPrivateProperty(const Identifier& propertyName) const
     }
     
     JSValue getPrivateProperty(const Identifier& propertyName) const


@@ -136,9 +138,9 @@ public:
         return m_callbackObjectData->getPrivateProperty(propertyName);
     }
     
         return m_callbackObjectData->getPrivateProperty(propertyName);
     }
     

-    void setPrivateProperty(const Identifier& propertyName, JSValue value)
+    void setPrivateProperty(JSGlobalData& globalData, const Identifier& propertyName, JSValue value)

     {
     {

-        m_callbackObjectData->setPrivateProperty(propertyName, value);
+        m_callbackObjectData->setPrivateProperty(globalData, this, propertyName, value);

     }
     
     void deletePrivateProperty(const Identifier& propertyName)
     }
     
     void deletePrivateProperty(const Identifier& propertyName)


@@ -147,13 +149,12 @@ public:
     }
 
 protected:
     }
 
 protected:

-    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesHasInstance | OverridesMarkChildren | OverridesGetPropertyNames | Base::StructureFlags;
+    static const unsigned StructureFlags = ProhibitsPropertyCaching | OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesHasInstance | OverridesVisitChildren | OverridesGetPropertyNames | Base::StructureFlags;

 
 private:
     virtual UString className() const;
 
     virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);
 
 private:
     virtual UString className() const;
 
     virtual bool getOwnPropertySlot(ExecState*, const Identifier&, PropertySlot&);

-    virtual bool getOwnPropertySlot(ExecState*, unsigned, PropertySlot&);

     virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);
     
     virtual void put(ExecState*, const Identifier&, JSValue, PutPropertySlot&);
     virtual bool getOwnPropertyDescriptor(ExecState*, const Identifier&, PropertyDescriptor&);
     
     virtual void put(ExecState*, const Identifier&, JSValue, PutPropertySlot&);


@@ -170,22 +171,21 @@ private:
 
     virtual ConstructType getConstructData(ConstructData&);
     virtual CallType getCallData(CallData&);
 
     virtual ConstructType getConstructData(ConstructData&);
     virtual CallType getCallData(CallData&);

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

 
 

-    virtual void markChildren(MarkStack& markStack)
+    virtual void visitChildren(SlotVisitor& visitor)

     {
     {

-        Base::markChildren(markStack);
-        m_callbackObjectData->markChildren(markStack);
+        Base::visitChildren(visitor);
+        m_callbackObjectData->visitChildren(visitor);

     }
 
     void init(ExecState*);
  
     static JSCallbackObject* asCallbackObject(JSValue);
  
     }
 
     void init(ExecState*);
  
     static JSCallbackObject* asCallbackObject(JSValue);
  

-    static JSValue JSC_HOST_CALL call(ExecState*, JSObject* functionObject, JSValue thisValue, const ArgList&);
-    static JSObject* construct(ExecState*, JSObject* constructor, const ArgList&);
+    static EncodedJSValue JSC_HOST_CALL call(ExecState*);
+    static EncodedJSValue JSC_HOST_CALL construct(ExecState*);

    
    

-    static JSValue staticValueGetter(ExecState*, JSValue, const Identifier&);
+    JSValue getStaticValue(ExecState*, const Identifier&);

     static JSValue staticFunctionGetter(ExecState*, JSValue, const Identifier&);
     static JSValue callbackGetter(ExecState*, JSValue, const Identifier&);
 
     static JSValue staticFunctionGetter(ExecState*, JSValue, const Identifier&);
     static JSValue callbackGetter(ExecState*, JSValue, const Identifier&);