Changeset 11684 in webkit for trunk/JavaScriptCore/kjs/property_map.cpp

Timestamp:

Dec 20, 2005, 12:12:50 PM (19 years ago)

Author:

mjs

Message:

JavaScriptCore:

Reviewed by Darin.

• fixed a leak in the assignment operator from PassRefPtr to RefPtr

• kxmlcore/RefPtr.h: (KXMLCore::RefPtr::operator=):

• fix problem with PassRefPtr that darin spotted - it lacked a copy constructor and therefore was using the default one, which can lead to excess derefs

I fixed this by adding a copy constructor from non-const
reference, and by adding a template pass() function that you have
to use when raw pointer or RefPtr are passed where PassRefPtr is
expected.

• kjs/identifier.cpp: (KJS::Identifier::add): Changed to have PassRefPtr return type and pass() the results.
• kjs/identifier.h:
• kjs/property_map.cpp: (KJS::PropertyMap::addSparseArrayPropertiesToReferenceList): Use pass() where required.
• kjs/ustring.cpp: (KJS::UString::UString): Use pass() as needed. (KJS::UString::append): ditto (KJS::UString::substr): ditto
• kjs/ustring.h: (KJS::UString::UString): Use initializer instead of assignment
• kxmlcore/PassRefPtr.h: (KXMLCore::PassRefPtr::PassRefPtr): Added copy constructor (KXMLCore::pass): new template function to make it convenient to pass a PassRefPtr

WebCore:

Reviewed by Darin.

• change an assignment to a contructor declaration to build with PassRefPtr leak fix changes

• ksvg2/svg/SVGTransformableImpl.cpp: (SVGTransformableImpl::parseTransformAttribute):

File:

• trunk/JavaScriptCore/kjs/property_map.cpp (modified) (2 diffs)

trunk/JavaScriptCore/kjs/property_map.cpp

@@ -615 +615 @@
         UString::Rep *key = _singleEntry.key;
         if (key) {
-            UString k(key);
+            UString k(pass(key));
             bool fitsInUInt32;
             k.toUInt32(&fitsInUInt32);
             if (fitsInUInt32)
-                list.append(Reference(base, Identifier(key)));
+                list.append(Reference(base, Identifier(pass(key))));
         }
 #endif
@@ -630 +630 @@
         UString::Rep *key = entries[i].key;
         if (key && key != &UString::Rep::null) {
-            UString k(key);
+            UString k(pass(key));
             bool fitsInUInt32;
             k.toUInt32(&fitsInUInt32);
             if (fitsInUInt32)
-                list.append(Reference(base, Identifier(key)));
+                list.append(Reference(base, Identifier(pass(key))));
         }
     }