Changeset 152289 in webkit

Timestamp:

Jul 2, 2013 6:36:09 AM (11 years ago)

Author:

mikhail.pozdnyakov@intel.com

Message:

Avoid code duplication inside String::append()
​https://bugs.webkit.org/show_bug.cgi?id=118290

Reviewed by Anders Carlsson.

The implementation of 'append(UChar)' had been repeated inside 'append(LChar)',
this duplication is obviated now.

• wtf/text/WTFString.cpp:

(WTF::String::appendInternal):
(WTF::String::append):

• wtf/text/WTFString.h:

Location:

trunk/Source/WTF

Files:

• ChangeLog (modified) (1 diff)
• wtf/text/WTFString.cpp (modified) (2 diffs)
• wtf/text/WTFString.h (modified) (1 diff)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2013-07-02  Mikhail Pozdnyakov  <mikhail.pozdnyakov@intel.com>
+
+        Avoid code duplication inside String::append()
+        https://bugs.webkit.org/show_bug.cgi?id=118290
+
+        Reviewed by Anders Carlsson.
+
+        The implementation of 'append(UChar)' had been repeated inside 'append(LChar)',
+        this duplication is obviated now.
+
+        * wtf/text/WTFString.cpp:
+        (WTF::String::appendInternal):
+        (WTF::String::append):
+        * wtf/text/WTFString.h:
+
 2013-06-28  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WTF/wtf/text/WTFString.cpp

@@ -120 +120 @@
 }
 
-void String::append(LChar c)
+template <typename CharacterType>
+inline void String::appendInternal(CharacterType c)
 {
     // FIXME: This is extremely inefficient. So much so that we might want to take this
@@ -138 +139 @@
 }
 
+void String::append(LChar c)
+{
+    appendInternal(c);
+}
+
 void String::append(UChar c)
 {
-    // FIXME: This is extremely inefficient. So much so that we might want to take this
-    // out of String's API. We can make it better by optimizing the case where exactly
-    // one String is pointing at this StringImpl, but even then it's going to require a
-    // call to fastMalloc every single time.
-    if (m_impl) {
-        UChar* data;
-        if (m_impl->length() >= numeric_limits<unsigned>::max())
-            CRASH();
-        RefPtr<StringImpl> newImpl = StringImpl::createUninitialized(m_impl->length() + 1, data);
-        memcpy(data, m_impl->characters(), m_impl->length() * sizeof(UChar));
-        data[m_impl->length()] = c;
-        m_impl = newImpl.release();
-    } else
-        m_impl = StringImpl::create(&c, 1);
+    appendInternal(c);
 }
 

trunk/Source/WTF/wtf/text/WTFString.h

@@ -495 +495 @@
     template <typename CharacterType>
     void removeInternal(const CharacterType*, unsigned, int);
+
+    template <typename CharacterType>
+    void appendInternal(CharacterType);
 
     RefPtr<StringImpl> m_impl;