Changeset 100208 in webkit

Timestamp:

Nov 14, 2011, 4:16:59 PM (15 years ago)

Author:

msaboff@apple.com

Message:

Further changes and cleanup to JSString.h and cpp.

Reviewed by Darin Adler.

• runtime/JSString.cpp:

(JSC::JSString::resolveRope): Change PassRefPtr to RefPtr. Eliminated exec in slow case calls.
(JSC::JSString::resolveRopeSlowCase8): Darin and I agreed that this should have 8 in name.
(JSC::JSString::resolveRopeSlowCase): Removed exec parameter.

• runtime/JSString.h:

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSString.cpp (modified) (6 diffs)
• runtime/JSString.h (modified) (1 diff)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-11-14  Michael Saboff  <msaboff@apple.com>
+
+        Further changes and cleanup to JSString.h and cpp.
+
+        Reviewed by Darin Adler.
+
+        * runtime/JSString.cpp:
+        (JSC::JSString::resolveRope): Change PassRefPtr to RefPtr.  Eliminated exec in slow case calls.
+        (JSC::JSString::resolveRopeSlowCase8): Darin and I agreed that this should have 8 in name.
+        (JSC::JSString::resolveRopeSlowCase): Removed exec parameter.
+        * runtime/JSString.h:
+
 2011-11-14  Adam Barth  <abarth@webkit.org>
 

trunk/Source/JavaScriptCore/runtime/JSString.cpp

@@ -65 +65 @@
     if (is8Bit()) {
         LChar* buffer;
-        if (PassRefPtr<StringImpl> newImpl = StringImpl::tryCreateUninitialized(m_length, buffer))
-            m_value = newImpl;
+        if (RefPtr<StringImpl> newImpl = StringImpl::tryCreateUninitialized(m_length, buffer))
+            m_value = newImpl.release();
         else {
             outOfMemory(exec);
@@ -74 +74 @@
         for (size_t i = 0; i < s_maxInternalRopeLength && m_fibers[i]; ++i) {
             if (m_fibers[i]->isRope())
-                return resolveRopeSlowCase(exec, buffer);
+                return resolveRopeSlowCase8(buffer);
         }
 
@@ -92 +92 @@
 
     UChar* buffer;
-    if (PassRefPtr<StringImpl> newImpl = StringImpl::tryCreateUninitialized(m_length, buffer))
-        m_value = newImpl;
+    if (RefPtr<StringImpl> newImpl = StringImpl::tryCreateUninitialized(m_length, buffer))
+        m_value = newImpl.release();
     else {
         outOfMemory(exec);
@@ -101 +101 @@
     for (size_t i = 0; i < s_maxInternalRopeLength && m_fibers[i]; ++i) {
         if (m_fibers[i]->isRope())
-            return resolveRopeSlowCase(exec, buffer);
+            return resolveRopeSlowCase(buffer);
     }
 
@@ -126 +126 @@
 // only fill the queue with the number of substrings at any given level in a
 // rope-of-ropes.)    
-void JSString::resolveRopeSlowCase(ExecState* exec, LChar* buffer) const
-{
-    UNUSED_PARAM(exec);
-
+void JSString::resolveRopeSlowCase8(LChar* buffer) const
+{
     LChar* position = buffer + m_length; // We will be working backwards over the rope.
     Vector<JSString*, 32> workQueue; // Putting strings into a Vector is only OK because there are no GC points in this method.
@@ -159 +157 @@
 }
 
-void JSString::resolveRopeSlowCase(ExecState* exec, UChar* buffer) const
-{
-    UNUSED_PARAM(exec);
-
+void JSString::resolveRopeSlowCase(UChar* buffer) const
+{
     UChar* position = buffer + m_length; // We will be working backwards over the rope.
     Vector<JSString*, 32> workQueue; // These strings are kept alive by the parent rope, so using a Vector is OK.

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -249 +249 @@
 
         void resolveRope(ExecState*) const;
-        void resolveRopeSlowCase(ExecState*, LChar*) const;
-        void resolveRopeSlowCase(ExecState*, UChar*) const;
+        void resolveRopeSlowCase8(LChar*) const;
+        void resolveRopeSlowCase(UChar*) const;
         void outOfMemory(ExecState*) const;