Changeset 59196 in webkit for trunk/JavaScriptCore/wtf/text/WTFString.cpp

Timestamp:

May 11, 2010, 7:25:40 PM (15 years ago)

Author:

[email protected]

Message:

Patch by Gavin Barraclough.

Reviewed by Maciej Stachowiak.

Rest of REGRESSION (r57900-57919): 3% PLT Regression from moving strings into WTF.
​https://bugs.webkit.org/show_bug.cgi?id=38930
<rdar://problem/7937188>

Inline string functions that are commonly used in WTFString, CString, and AtomicString.

• JavaScriptCore.exp: Remove exports of inline functions.
• wtf/text/AtomicString.cpp:

(WebCore::AtomicString::addSlowCase): Rename add to addSlowCase, and inline the fast path

of add.

• wtf/text/AtomicString.h:

(WebCore::AtomicString::add): Inline the fast path of add.

• wtf/text/CString.cpp: Inline implementation of data and length in the header.
• wtf/text/CString.h:

(WTF::CString::data): Inline implementation of data.
(WTF::CString::length): Inline implementation of length.

• wtf/text/WTFString.cpp: Remove implementations of functions to be inlined.
• wtf/text/WTFString.h:

(WebCore::String::String): Inline implementation.
(WebCore::String::length): Ditto.
(WebCore::String::characters): Ditto.
(WebCore::String::operator[]): Ditto.
(WebCore::String::isEmpty): Ditto.

File:

• trunk/JavaScriptCore/wtf/text/WTFString.cpp (modified) (5 diffs)

trunk/JavaScriptCore/wtf/text/WTFString.cpp

@@ -38 +38 @@
 namespace WebCore {
 
-String::String(const UChar* str, unsigned len)
-{
-    if (!str)
-        return;
-    m_impl = StringImpl::create(str, len);
-}
-
 String::String(const UChar* str)
 {
@@ -55 +48 @@
     
     m_impl = StringImpl::create(str, len);
-}
-
-String::String(const char* str)
-{
-    if (!str)
-        return;
-    m_impl = StringImpl::create(str);
-}
-
-String::String(const char* str, unsigned length)
-{
-    if (!str)
-        return;
-    m_impl = StringImpl::create(str, length);
 }
 
@@ -203 +182 @@
 }
 
-UChar String::operator[](unsigned i) const
+UChar32 String::characterStartingAt(unsigned i) const
 {
     if (!m_impl || i >= m_impl->length())
         return 0;
-    return m_impl->characters()[i];
-}
-
-UChar32 String::characterStartingAt(unsigned i) const
-{
-    if (!m_impl || i >= m_impl->length())
-        return 0;
     return m_impl->characterStartingAt(i);
-}
-
-unsigned String::length() const
-{
-    if (!m_impl)
-        return 0;
-    return m_impl->length();
 }
 
@@ -310 +275 @@
     result = charactersToIntStrict(m_impl->characters(), m_impl->length() - 1);
     return true;
-}
-
-const UChar* String::characters() const
-{
-    if (!m_impl)
-        return 0;
-    return m_impl->characters();
 }
 
@@ -592 +550 @@
 }
 
-bool String::isEmpty() const
-{
-    return !m_impl || !m_impl->length();
-}
-
 void String::split(const String& separator, bool allowEmptyEntries, Vector<String>& result) const
 {