Changeset 202506 in webkit

Timestamp:

Jun 27, 2016 12:11:33 PM (8 years ago)

Author:

commit-queue@webkit.org

Message:

Remove now unused WTF::findNextLineStart
​https://bugs.webkit.org/show_bug.cgi?id=159157

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2016-06-27
Reviewed by Mark Lam.

Unused after r202498.

• wtf/text/StringImpl.cpp:

(WTF::StringImpl::findNextLineStart): Deleted.

• wtf/text/StringImpl.h:

(WTF::findNextLineStart): Deleted.

• wtf/text/WTFString.h:

(WTF::String::findNextLineStart): Deleted.

Location:

trunk/Source/WTF

Files:

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

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-06-27  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Remove now unused WTF::findNextLineStart
+        https://bugs.webkit.org/show_bug.cgi?id=159157
+
+        Reviewed by Mark Lam.
+
+        Unused after r202498.
+
+        * wtf/text/StringImpl.cpp:
+        (WTF::StringImpl::findNextLineStart): Deleted.
+        * wtf/text/StringImpl.h:
+        (WTF::findNextLineStart): Deleted.
+        * wtf/text/WTFString.h:
+        (WTF::String::findNextLineStart): Deleted.
+
 2016-06-21  Anders Carlsson  <andersca@apple.com>
 

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

@@ -1263 +1263 @@
         return notFound;
     return ::WTF::findIgnoringASCIICase(*this, *matchString, startOffset);
-}
-
-size_t StringImpl::findNextLineStart(unsigned index)
-{
-    if (is8Bit())
-        return WTF::findNextLineStart(characters8(), m_length, index);
-    return WTF::findNextLineStart(characters16(), m_length, index);
 }
 

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

@@ -710 +710 @@
     WTF_EXPORT_STRING_API size_t findIgnoringASCIICase(const StringImpl*, unsigned startOffset) const;
 
-    WTF_EXPORT_STRING_API size_t findNextLineStart(unsigned index = UINT_MAX);
-
     WTF_EXPORT_STRING_API size_t reverseFind(UChar, unsigned index = UINT_MAX);
     WTF_EXPORT_STRING_API size_t reverseFind(StringImpl*, unsigned index = UINT_MAX);
@@ -976 +974 @@
 
 template<typename CharacterType>
-inline size_t findNextLineStart(const CharacterType* characters, unsigned length, unsigned index = 0)
-{
-    while (index < length) {
-        CharacterType c = characters[index++];
-        if ((c != '\n') && (c != '\r'))
-            continue;
-
-        // There can only be a start of a new line if there are more characters
-        // beyond the current character.
-        if (index < length) {
-            // The 3 common types of line terminators are 1. \r\n (Windows), 
-            // 2. \r (old MacOS) and 3. \n (Unix'es).
-
-            if (c == '\n')
-                return index; // Case 3: just \n.
-
-            CharacterType c2 = characters[index];
-            if (c2 != '\n')
-                return index; // Case 2: just \r.
-
-            // Case 1: \r\n.
-            // But, there's only a start of a new line if there are more
-            // characters beyond the \r\n.
-            if (++index < length)
-                return index; 
-        }
-    }
-    return notFound;
-}
-
-template<typename CharacterType>
 inline size_t reverseFindLineTerminator(const CharacterType* characters, unsigned length, unsigned index = UINT_MAX)
 {

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

@@ -230 +230 @@
     size_t find(const LChar* str, unsigned start = 0) const
         { return m_impl ? m_impl->find(str, start) : notFound; }
-
-    size_t findNextLineStart(unsigned start = 0) const
-        { return m_impl ? m_impl->findNextLineStart(start) : notFound; }
 
     // Find the last instance of a single character or string.