JavaScriptCore-7601.1.46.3.tar.gz

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

diff --git a/API/JSCallbackObject.h b/API/JSCallbackObject.h
index 1cf7a02b256e11521d8a699ec04f462d47bd81cb..33b4262e620174cd7bcd471c50a693a9f40b4a05 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


@@ -11,10 +11,10 @@
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  *

- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY

  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE COMPUTER, INC. OR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL APPLE INC. OR

  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
  * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR


@@ -34,6 +34,8 @@
 namespace JSC {
 
 struct JSCallbackObjectData {
 namespace JSC {
 
 struct JSCallbackObjectData {

+    WTF_MAKE_FAST_ALLOCATED;
+public:

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


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

-    void setPrivateProperty(const Identifier& propertyName, JSValue value)
+    void setPrivateProperty(VM& vm, 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 = std::make_unique<JSPrivatePropertyMap>();
+        m_privateProperties->setPrivateProperty(vm, owner, propertyName, value);

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


@@ -67,11 +69,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,66 +81,87 @@ 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->value.get();

         }
         
         }
         

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

         {
         {

-            m_propertyMap.set(propertyName.ustring().rep(), value);
+            WriteBarrier<Unknown> empty;
+            m_propertyMap.add(propertyName.impl(), empty).iterator->value.set(vm, 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) {
         {
             for (PrivatePropertyMap::iterator ptr = m_propertyMap.begin(); ptr != m_propertyMap.end(); ++ptr) {

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

             }
         }
 
     private:
             }
         }
 
     private:

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

         PrivatePropertyMap m_propertyMap;
     };
         PrivatePropertyMap m_propertyMap;
     };

-    OwnPtr<JSPrivatePropertyMap> m_privateProperties;
+    std::unique_ptr<JSPrivatePropertyMap> m_privateProperties;

 };
 
     
 };
 
     

-template <class Base>
-class JSCallbackObject : public Base {
+template <class Parent>
+class JSCallbackObject : public Parent {
+protected:
+    JSCallbackObject(ExecState*, Structure*, JSClassRef, void* data);
+    JSCallbackObject(VM&, JSClassRef, Structure*);
+
+    void finishCreation(ExecState*);
+    void finishCreation(VM&);
+

 public:
 public:

-    JSCallbackObject(ExecState*, NonNullPassRefPtr<Structure>, JSClassRef, void* data);
-    JSCallbackObject(JSClassRef);
-    virtual ~JSCallbackObject();
+    typedef Parent Base;
+    static const unsigned StructureFlags = Base::StructureFlags | ProhibitsPropertyCaching | OverridesGetOwnPropertySlot | InterceptsGetOwnPropertySlotByIndexEvenWhenLengthIsNotZero | ImplementsHasInstance | OverridesHasInstance | OverridesGetPropertyNames | TypeOfShouldCallGetCallData;
+
+    ~JSCallbackObject();
+
+    static JSCallbackObject* create(ExecState* exec, JSGlobalObject* globalObject, Structure* structure, JSClassRef classRef, void* data)
+    {
+        ASSERT_UNUSED(globalObject, !structure->globalObject() || structure->globalObject() == globalObject);
+        JSCallbackObject* callbackObject = new (NotNull, allocateCell<JSCallbackObject>(*exec->heap())) JSCallbackObject(exec, structure, classRef, data);
+        callbackObject->finishCreation(exec);
+        return callbackObject;
+    }
+    static JSCallbackObject<Parent>* create(VM&, JSClassRef, Structure*);
+
+    static const bool needsDestruction;
+    static void destroy(JSCell* cell)
+    {
+        static_cast<JSCallbackObject*>(cell)->JSCallbackObject::~JSCallbackObject();
+    }

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

-    static const ClassInfo info;
+    DECLARE_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) 
-    { 
-        return Structure::create(proto, TypeInfo(ObjectType, StructureFlags), Base::AnonymousSlotCount); 
-    }
+    static Structure* createStructure(VM&, JSGlobalObject*, JSValue);

     
     JSValue getPrivateProperty(const Identifier& propertyName) const
     {
         return m_callbackObjectData->getPrivateProperty(propertyName);
     }
     
     
     JSValue getPrivateProperty(const Identifier& propertyName) const
     {
         return m_callbackObjectData->getPrivateProperty(propertyName);
     }
     

-    void setPrivateProperty(const Identifier& propertyName, JSValue value)
+    void setPrivateProperty(VM& vm, const Identifier& propertyName, JSValue value)

     {
     {

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

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


@@ -146,50 +169,50 @@ public:
         m_callbackObjectData->deletePrivateProperty(propertyName);
     }
 
         m_callbackObjectData->deletePrivateProperty(propertyName);
     }
 

-protected:
-    static const unsigned StructureFlags = OverridesGetOwnPropertySlot | ImplementsHasInstance | OverridesHasInstance | OverridesMarkChildren | OverridesGetPropertyNames | Base::StructureFlags;
+    using Parent::methodTable;

 
 private:
 
 private:

-    virtual UString className() const;
+    static String className(const JSObject*);

 
 

-    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&);
+    static JSValue defaultValue(const JSObject*, ExecState*, PreferredPrimitiveType);

 
 

-    virtual bool deleteProperty(ExecState*, const Identifier&);
-    virtual bool deleteProperty(ExecState*, unsigned);
+    static bool getOwnPropertySlot(JSObject*, ExecState*, PropertyName, PropertySlot&);
+    static bool getOwnPropertySlotByIndex(JSObject*, ExecState*, unsigned propertyName, PropertySlot&);
+    
+    static void put(JSCell*, ExecState*, PropertyName, JSValue, PutPropertySlot&);
+    static void putByIndex(JSCell*, ExecState*, unsigned, JSValue, bool shouldThrow);

 
 

-    virtual bool hasInstance(ExecState* exec, JSValue value, JSValue proto);
+    static bool deleteProperty(JSCell*, ExecState*, PropertyName);
+    static bool deletePropertyByIndex(JSCell*, ExecState*, unsigned);

 
 

-    virtual void getOwnPropertyNames(ExecState*, PropertyNameArray&, EnumerationMode mode = ExcludeDontEnumProperties);
+    static bool customHasInstance(JSObject*, ExecState*, JSValue);

 
 

-    virtual double toNumber(ExecState*) const;
-    virtual UString toString(ExecState*) const;
+    static void getOwnNonIndexPropertyNames(JSObject*, ExecState*, PropertyNameArray&, EnumerationMode);

 
 

-    virtual ConstructType getConstructData(ConstructData&);
-    virtual CallType getCallData(CallData&);
-    virtual const ClassInfo* classInfo() const { return &info; }
+    static ConstructType getConstructData(JSCell*, ConstructData&);
+    static CallType getCallData(JSCell*, CallData&);

 
 

-    virtual void markChildren(MarkStack& markStack)
+    static void visitChildren(JSCell* cell, SlotVisitor& visitor)

     {
     {

-        Base::markChildren(markStack);
-        m_callbackObjectData->markChildren(markStack);
+        JSCallbackObject* thisObject = jsCast<JSCallbackObject*>(cell);
+        ASSERT_GC_OBJECT_INHERITS((static_cast<Parent*>(thisObject)), JSCallbackObject<Parent>::info());
+        Parent::visitChildren(thisObject, visitor);
+        thisObject->m_callbackObjectData->visitChildren(visitor);

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

+    static JSCallbackObject* asCallbackObject(EncodedJSValue);

  
  

-    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&);
-    static JSValue staticFunctionGetter(ExecState*, JSValue, const Identifier&);
-    static JSValue callbackGetter(ExecState*, JSValue, const Identifier&);
+    JSValue getStaticValue(ExecState*, PropertyName);
+    static EncodedJSValue staticFunctionGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName);
+    static EncodedJSValue callbackGetter(ExecState*, JSObject*, EncodedJSValue, PropertyName);

 
 

-    OwnPtr<JSCallbackObjectData> m_callbackObjectData;
+    std::unique_ptr<JSCallbackObjectData> m_callbackObjectData;

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