Changeset 53221 in webkit for trunk/JavaScriptCore/runtime/UStringImpl.cpp

Timestamp:

Jan 13, 2010, 5:20:52 PM (15 years ago)

Author:

[email protected]

Message:

Rubber stamped by Sam Weinig & Darin Adler.

Three quick fixes to UStringImpl.

• The destroy() method can be switched back to a normal destructor; since we've switched the way we protect static strings to be using an odd ref-count the destroy() won't abort.
• The cost() calculation logic was wrong. If you have multiple JSStrings wrapping substrings of a base string, they would each report the full cost of the base string to the heap. Instead we should only be reporting once for the base string.
• Remove the overloaded new operator calling fastMalloc, replace this with a 'using' to pick up the implementation from the parent class.

• JavaScriptCore.exp:
• runtime/UStringImpl.cpp:

(JSC::UStringImpl::~UStringImpl):

• runtime/UStringImpl.h:

(JSC::UStringImpl::cost):
(JSC::UStringImpl::deref):

File:

• trunk/JavaScriptCore/runtime/UStringImpl.cpp (modified) (2 diffs)

trunk/JavaScriptCore/runtime/UStringImpl.cpp

@@ -60 +60 @@
 }
 
-void UStringImpl::destroy()
+UStringImpl::~UStringImpl()
 {
     ASSERT(!isStatic());
@@ -78 +78 @@
         }
     }
-
-    delete this;
 }