Changeset 77098 in webkit for trunk/Source/JavaScriptCore/API/JSCallbackObject.h

Timestamp:

Jan 30, 2011, 5:13:10 PM (14 years ago)

Author:

[email protected]

Message:

Convert markstack to a slot visitor API
​https://bugs.webkit.org/show_bug.cgi?id=53219

rolling r77006 and r77020 back in.

File:

• trunk/Source/JavaScriptCore/API/JSCallbackObject.h (modified) (4 diffs)

trunk/Source/JavaScriptCore/API/JSCallbackObject.h

@@ -55 +55 @@
     }
     
-    void setPrivateProperty(const Identifier& propertyName, JSValue value)
+    void setPrivateProperty(JSGlobalData& globalData, JSCell* owner, const Identifier& propertyName, JSValue value)
     {
         if (!m_privateProperties)
             m_privateProperties = adoptPtr(new JSPrivatePropertyMap);
-        m_privateProperties->setPrivateProperty(propertyName, value);
+        m_privateProperties->setPrivateProperty(globalData, owner, propertyName, value);
     }
     
@@ -84 +84 @@
             if (location == m_propertyMap.end())
                 return JSValue();
-            return location->second;
+            return location->second.get();
         }
         
-        void setPrivateProperty(const Identifier& propertyName, JSValue value)
-        {
-            m_propertyMap.set(propertyName.impl(), value);
+        void setPrivateProperty(JSGlobalData& globalData, JSCell* owner, const Identifier& propertyName, JSValue value)
+        {
+            WriteBarrier<Unknown> empty;
+            m_propertyMap.add(propertyName.impl(), empty).first->second.set(globalData, owner, value);
         }
         
@@ -101 +102 @@
             for (PrivatePropertyMap::iterator ptr = m_propertyMap.begin(); ptr != m_propertyMap.end(); ++ptr) {
                 if (ptr->second)
-                    markStack.append(ptr->second);
+                    markStack.append(&ptr->second);
             }
         }
 
     private:
-        typedef HashMap<RefPtr<StringImpl>, JSValue, IdentifierRepHash> PrivatePropertyMap;
+        typedef HashMap<RefPtr<StringImpl>, WriteBarrier<Unknown>, IdentifierRepHash> PrivatePropertyMap;
         PrivatePropertyMap m_propertyMap;
     };
@@ -138 +139 @@
     }
     
-    void setPrivateProperty(const Identifier& propertyName, JSValue value)
-    {
-        m_callbackObjectData->setPrivateProperty(propertyName, value);
+    void setPrivateProperty(JSGlobalData& globalData, const Identifier& propertyName, JSValue value)
+    {
+        m_callbackObjectData->setPrivateProperty(globalData, this, propertyName, value);
     }