Changeset 84934 in webkit for trunk/Source/JavaScriptCore/runtime/JSString.cpp

Timestamp:

Apr 26, 2011, 11:31:03 AM (14 years ago)

Author:

[email protected]

Message:

2011-04-25 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Nixed special finalizer handling for WebCore strings
​https://bugs.webkit.org/show_bug.cgi?id=59425

SunSpider reports no change.

Not needed anymore, since weak handles have finalizers.

• runtime/JSString.cpp: (JSC::JSString::resolveRope): (JSC::JSString::resolveRopeSlowCase): (JSC::JSString::outOfMemory): (JSC::JSString::substringFromRope): (JSC::JSString::replaceCharacter): Updated for removal of union.

• runtime/JSString.h: (JSC::RopeBuilder::JSString): (JSC::RopeBuilder::~JSString): (JSC::RopeBuilder::appendStringInConstruct): (JSC::RopeBuilder::appendValueInConstructAndIncrementLength): No need for union or special constructor anymore.

2011-04-25 Geoffrey Garen <​[email protected]>

Reviewed by Oliver Hunt.

Nixed special finalizer handling for WebCore strings
​https://bugs.webkit.org/show_bug.cgi?id=59425

Not needed anymore, since weak handles have finalizers.

• WebCore.exp.in: Exports!

• bindings/js/DOMWrapperWorld.cpp: (WebCore::JSStringOwner::finalize): (WebCore::DOMWrapperWorld::DOMWrapperWorld): Use a weak handle finalizer, so we don't need special treatment anymore.

• bindings/js/DOMWrapperWorld.h: (WebCore::JSStringOwner::JSStringOwner): (WebCore::DOMWrapperWorld::stringWrapperOwner): Use a HashMap of Weak<T> instead of a WeakGCMap, so we can specify a custom finalizer.

• bindings/js/JSDOMBinding.cpp: (WebCore::jsStringSlowCase):
• bindings/js/JSDOMBinding.h: (WebCore::jsString): Updated for string map change.

File:

• trunk/Source/JavaScriptCore/runtime/JSString.cpp (modified) (9 diffs)

trunk/Source/JavaScriptCore/runtime/JSString.cpp

@@ -49 +49 @@
     }
 
-    RopeImpl::Fiber currentFiber = m_other.m_fibers[0];
+    RopeImpl::Fiber currentFiber = m_fibers[0];
 
     if ((m_fiberCount > 2) || (RopeImpl::isRope(currentFiber)) 
-        || ((m_fiberCount == 2) && (RopeImpl::isRope(m_other.m_fibers[1])))) {
+        || ((m_fiberCount == 2) && (RopeImpl::isRope(m_fibers[1])))) {
         resolveRopeSlowCase(exec, buffer);
         return;
@@ -64 +64 @@
     if (m_fiberCount > 1) {
         position += length;
-        currentFiber = m_other.m_fibers[1];
+        currentFiber = m_fibers[1];
         string = static_cast<StringImpl*>(currentFiber);
         length = string->length();
@@ -73 +73 @@
     ASSERT((buffer + m_length) == position);
     for (unsigned i = 0; i < m_fiberCount; ++i) {
-        RopeImpl::deref(m_other.m_fibers[i]);
-        m_other.m_fibers[i] = 0;
+        RopeImpl::deref(m_fibers[i]);
+        m_fibers[i] = 0;
     }
     m_fiberCount = 0;
@@ -101 +101 @@
     RopeImpl::Fiber currentFiber;
     for (unsigned i = 0; i < (m_fiberCount - 1); ++i)
-        workQueue.append(m_other.m_fibers[i]);
-    currentFiber = m_other.m_fibers[m_fiberCount - 1];
+        workQueue.append(m_fibers[i]);
+    currentFiber = m_fibers[m_fiberCount - 1];
     while (true) {
         if (RopeImpl::isRope(currentFiber)) {
@@ -123 +123 @@
                 ASSERT(buffer == position);
                 for (unsigned i = 0; i < m_fiberCount; ++i) {
-                    RopeImpl::deref(m_other.m_fibers[i]);
-                    m_other.m_fibers[i] = 0;
+                    RopeImpl::deref(m_fibers[i]);
+                    m_fibers[i] = 0;
                 }
                 m_fiberCount = 0;
@@ -142 +142 @@
 {
     for (unsigned i = 0; i < m_fiberCount; ++i) {
-        RopeImpl::deref(m_other.m_fibers[i]);
-        m_other.m_fibers[i] = 0;
+        RopeImpl::deref(m_fibers[i]);
+        m_fibers[i] = 0;
     }
     m_fiberCount = 0;
@@ -170 +170 @@
 
     RopeIterator end;
-    for (RopeIterator it(m_other.m_fibers.data(), m_fiberCount); it != end; ++it) {
+    for (RopeIterator it(m_fibers.data(), m_fiberCount); it != end; ++it) {
         ++fiberCount;
         StringImpl* fiberString = *it;
@@ -221 +221 @@
     StringImpl* matchString = 0;
     size_t matchPosition = notFound;
-    for (RopeIterator it(m_other.m_fibers.data(), m_fiberCount); it != end; ++it) {
+    for (RopeIterator it(m_fibers.data(), m_fiberCount); it != end; ++it) {
         ++fiberCount;
         if (matchString)
@@ -240 +240 @@
         return throwOutOfMemoryError(exec);
 
-    for (RopeIterator it(m_other.m_fibers.data(), m_fiberCount); it != end; ++it) {
+    for (RopeIterator it(m_fibers.data(), m_fiberCount); it != end; ++it) {
         StringImpl* string = *it;
         if (string != matchString) {