Changeset 11763 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Dec 25, 2005, 1:22:35 AM (19 years ago)

Author:

mjs

Message:

Reviewed by Eric and Dave Hyatt.

• make even const PassRefPtrs give transfer of ownership semantics ​http://bugzilla.opendarwin.org/show_bug.cgi?id=6238

This is a somewhat cheesy change. Having to use PassRefPtr_Ref creates ambiguities
in assignment and copy construction. And this makes life way easier and removes
the need for pass(). It is not really correct, but we pretty much never need a real
const PassRefPtr, and this takes care of things for PassRefPtr temporaries.

• kjs/identifier.cpp: (KJS::Identifier::add): No more need for pass()
• kjs/property_map.cpp: (KJS::PropertyMap::addSparseArrayPropertiesToReferenceList): No more need for pass()
• kjs/ustring.cpp: (KJS::UString::Rep::create): Use adoptRef (KJS::UString::UString): No more need for pass (KJS::UString::append): No more need for pass (KJS::UString::substr): No more need for pass
• kxmlcore/PassRefPtr.h: made m_ptr mutable (ugh) (KXMLCore::PassRefPtr::PassRefPtr): Take a const PassRefPtr reference (KXMLCore::PassRefPtr::release): Made this a const method (ugh) (KXMLCore::PassRefPtr::operator=): clean up appropriately (KXMLCore::adoptRef): Added this to use instead of PassRefPtr<T>::adopt, I think it makes the behavior more clear and it is less verbose. (KXMLCore::static_pointer_cast): use adoptRef (KXMLCore::const_pointer_cast): use adoptRef
• kxmlcore/RefPtr.h: (KXMLCore::RefPtr::RefPtr): take const PassRefPtr& (KXMLCore::PassRefPtr::operator=): take const PassRefPtr&

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (8 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -202 +202 @@
 
   // steal the single reference this Rep was created with
-  return PassRefPtr<Rep>::adopt(r);
+  return adoptRef(r);
 }
 
@@ -232 +232 @@
 
   // steal the single reference this Rep was created with
-  return PassRefPtr<Rep>::adopt(r);
+  return adoptRef(r);
 }
 
@@ -460 +460 @@
     x.expandCapacity(aOffset + length);
     memcpy(const_cast<UChar *>(a.data() + aSize), b.data(), bSize * sizeof(UChar));
-    m_rep = Rep::create(pass(a.m_rep), 0, length);
+    m_rep = Rep::create(a.m_rep, 0, length);
   } else if (-bOffset == b.usedPreCapacity() && 4 * bSize >= aSize) {
     // - b reaches the beginning of its buffer so it qualifies for shared prepend
@@ -468 +468 @@
     y.expandPreCapacity(-bOffset + aSize);
     memcpy(const_cast<UChar *>(b.data() - aSize), a.data(), aSize * sizeof(UChar));
-    m_rep = Rep::create(pass(b.m_rep), -aSize, length);
+    m_rep = Rep::create(b.m_rep, -aSize, length);
   } else {
     // a does not qualify for append, and b does not qualify for prepend, gotta make a whole new string
@@ -686 +686 @@
     expandCapacity(thisOffset + length);
     memcpy(const_cast<UChar *>(data() + thisSize), t.data(), tSize * sizeof(UChar));
-    m_rep = Rep::create(pass(m_rep), 0, length);
+    m_rep = Rep::create(m_rep, 0, length);
   } else {
     // this is shared with someone using more capacity, gotta make a whole new string
@@ -727 +727 @@
     for (int i = 0; i < tSize; ++i)
       d[thisSize+i] = t[i];
-    m_rep = Rep::create(pass(m_rep), 0, length);
+    m_rep = Rep::create(m_rep, 0, length);
   } else {
     // this is shared with someone using more capacity, gotta make a whole new string
@@ -767 +767 @@
     UChar *d = const_cast<UChar *>(data());
     d[length] = c;
-    m_rep = Rep::create(pass(m_rep), 0, length + 1);
+    m_rep = Rep::create(m_rep, 0, length + 1);
   } else {
     // this is shared with someone using more capacity, gotta make a whole new string
@@ -1123 +1123 @@
     return *this;
 
-  return UString(Rep::create(pass(m_rep), pos, len));
+  return UString(Rep::create(m_rep, pos, len));
 }