Changeset 37300 in webkit for trunk/JavaScriptCore/kjs/PropertyNameArray.h

Timestamp:

Oct 4, 2008, 2:57:26 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-04 Sam Weinig <​[email protected]>

Reviewed by Oliver Hunt.

Fix ​https://bugs.webkit.org/show_bug.cgi?id=21320
leaks of PropertyNameArrayData seen on buildbot

• Fix RefPtr cycle by making PropertyNameArrayData's pointer back to the StructureID a weak pointer.

• kjs/PropertyNameArray.h: (JSC::PropertyNameArrayData::setCachedStructureID): (JSC::PropertyNameArrayData::cachedStructureID):
• kjs/StructureID.cpp: (JSC::StructureID::getEnumerablePropertyNames): (JSC::StructureID::clearEnumerationCache): (JSC::StructureID::~StructureID):

File:

• trunk/JavaScriptCore/kjs/PropertyNameArray.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/PropertyNameArray.h

@@ -42 +42 @@
         PropertyNameVector& propertyNameVector() { return m_propertyNameVector; }
 
-        void setCachedStructureID(PassRefPtr<StructureID> structureID) { m_cachedStructureID = structureID; }
-        StructureID* cachedStructureID() const { return m_cachedStructureID.get(); }
+        void setCachedStructureID(StructureID* structureID) { m_cachedStructureID = structureID; }
+        StructureID* cachedStructureID() const { return m_cachedStructureID; }
 
         void setCachedPrototypeChain(PassRefPtr<StructureIDChain> cachedPrototypeChain) { m_cachedPrototypeChain = cachedPrototypeChain; }
@@ -50 +50 @@
     private:
         PropertyNameArrayData()
+            : m_cachedStructureID(0)
         {
         }
 
         PropertyNameVector m_propertyNameVector;
-        RefPtr<StructureID> m_cachedStructureID;
+        StructureID* m_cachedStructureID;
         RefPtr<StructureIDChain> m_cachedPrototypeChain;
     };