Changeset 35227 in webkit for trunk/JavaScriptCore

Timestamp:

Jul 17, 2008, 2:11:04 PM (17 years ago)

Author:

[email protected]

Message:

2008-07-17 Sam Weinig <​[email protected]>

Roll out r35199 as it is causing failures on the PPC build.

Location:

trunk/JavaScriptCore

Files:

• API/JSStringRefCF.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• kjs/StringConstructor.cpp (modified) (1 diff)
• kjs/StringPrototype.cpp (modified) (4 diffs)
• kjs/ustring.cpp (modified) (2 diffs)
• kjs/ustring.h (modified) (4 diffs)

trunk/JavaScriptCore/API/JSStringRefCF.cpp

@@ -45 +45 @@
         CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
         COMPILE_ASSERT(sizeof(UniChar) == sizeof(UChar), unichar_and_uchar_must_be_same_size);
-        rep = UString::adopt(reinterpret_cast<UChar*>(buffer), length).rep()->ref();
+        rep = UString(reinterpret_cast<UChar*>(buffer), length, false).rep()->ref();
     }
     return toRef(rep);

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-07-17  Sam Weinig  <[email protected]>
+
+        Roll out r35199 as it is causing failures on the PPC build.
+
 2008-07-17  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/kjs/StringConstructor.cpp

@@ -38 +38 @@
         for (ArgList::const_iterator it = args.begin(); it != end; ++it)
             *p++ = static_cast<UChar>((*it).toUInt32(exec));
-        s = UString::adopt(buf, args.size());
+        s = UString(buf, args.size(), false);
     } else
         s = "";

trunk/JavaScriptCore/kjs/StringPrototype.cpp

@@ -632 +632 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(exec, UString::adopt(buffer));
+    return jsString(exec, UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -654 +654 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(exec, UString::adopt(buffer));
+    return jsString(exec, UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -678 +678 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(exec, UString::adopt(buffer));
+    return jsString(exec, UString(buffer.releaseBuffer(), length, false));
 }
 
@@ -700 +700 @@
     if (length == ssize && memcmp(buffer.data(), s.data(), length * sizeof(UChar)) == 0)
         return sVal;
-    return jsString(exec, UString::adopt(buffer));
+    return jsString(exec, UString(buffer.releaseBuffer(), length, false));
 }
 

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -455 +455 @@
     else
         m_rep = Rep::createCopying(c, length);
+}
+
+UString::UString(UChar* c, int length, bool copy)
+{
+    if (length == 0)
+        m_rep = &Rep::empty;
+    else if (copy)
+        m_rep = Rep::createCopying(c, length);
+    else
+        m_rep = Rep::create(c, length);
 }
 
@@ -521 +531 @@
 }
 
-UString UString::adopt(UChar* c, int length)
-{
-    if (length == 0)
-        return UString("");
-   return UString(Rep::create(c, length));
-}
-
-UString UString::adopt(Vector<UChar>& buffer)
-{
-    if (buffer.isEmpty())
-        return UString("");
-   return UString(Rep::create(buffer.releaseBuffer(), buffer.size()));
-}
-
 const UString& UString::null()
 {

trunk/JavaScriptCore/kjs/ustring.h

@@ -125 +125 @@
         UString(const char*);
         UString(const UChar*, int length);
+        UString(UChar*, int length, bool copy);
+
+        UString(const UString& s)
+            : m_rep(s.m_rep)
+        {
+        }
+
         UString(const Vector<UChar>& buffer);
 
@@ -130 +137 @@
         UString(const UString&, const UString&);
 
-        UString(const UString& s)
-            : m_rep(s.m_rep)
-        {
-        }
-
-        UString(PassRefPtr<Rep> r)
-            : m_rep(r)
-        {
-            ASSERT(m_rep);
+        ~UString()
+        {
         }
 
@@ -146 +146 @@
         {
         }
-
-        ~UString()
-        {
-        }
-
-        static UString adopt(UChar*, int length);
-        static UString adopt(Vector<UChar>& buffer);
 
         static UString from(int);
@@ -236 +229 @@
         Rep* rep() const { return m_rep.get(); }
 
+        UString(PassRefPtr<Rep> r)
+            : m_rep(r)
+        {
+            ASSERT(m_rep);
+        }
+
         size_t cost() const;