Changeset 166507 in webkit

Timestamp:

Mar 31, 2014 9:32:25 AM (10 years ago)

Author:

ap@apple.com

Message:

Remove special handling of soft hyphens in search code
​https://bugs.webkit.org/show_bug.cgi?id=130940

Reviewed by Anders Carlsson.

ICU knows to ignore soft hyphens, so we don't need to replace them before searching.

Covered by existing tests.

• editing/TextIterator.cpp:

(WebCore::foldQuoteMark):
(WebCore::foldQuoteMarks):
(WebCore::SearchBuffer::SearchBuffer):
(WebCore::SearchBuffer::append):
(WebCore::foldQuoteMarkOrSoftHyphen): Deleted.
(WebCore::foldQuoteMarksAndSoftHyphens): Deleted.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/TextIterator.cpp (modified) (8 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-03-31  Alexey Proskuryakov  <ap@apple.com>
+
+        Remove special handling of soft hyphens in search code
+        https://bugs.webkit.org/show_bug.cgi?id=130940
+
+        Reviewed by Anders Carlsson.
+
+        ICU knows to ignore soft hyphens, so we don't need to replace them before searching.
+
+        Covered by existing tests.
+
+        * editing/TextIterator.cpp:
+        (WebCore::foldQuoteMark):
+        (WebCore::foldQuoteMarks):
+        (WebCore::SearchBuffer::SearchBuffer):
+        (WebCore::SearchBuffer::append):
+        (WebCore::foldQuoteMarkOrSoftHyphen): Deleted.
+        (WebCore::foldQuoteMarksAndSoftHyphens): Deleted.
+
 2014-03-31  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -1622 +1622 @@
 // --------
 
-static inline UChar foldQuoteMarkOrSoftHyphen(UChar c)
+static inline UChar foldQuoteMark(UChar c)
 {
     switch (c) {
@@ -1633 +1633 @@
         case rightSingleQuotationMark:
             return '\'';
-        case softHyphen:
-            // Replace soft hyphen with an ignorable character so that their presence or absence will
-            // not affect string comparison.
-            return 0;
         default:
             return c;
@@ -1645 +1641 @@
 // of doing it in a separate replacement pass here, but ICU doesn't offer a way
 // to add tailoring on top of the locale-specific tailoring as of this writing.
-static inline String foldQuoteMarksAndSoftHyphens(String string)
+static inline String foldQuoteMarks(String string)
 {
     string.replace(hebrewPunctuationGeresh, '\'');
@@ -1653 +1649 @@
     string.replace(rightDoubleQuotationMark, '"');
     string.replace(rightSingleQuotationMark, '\'');
-
-    // Replace soft hyphens with an ignorable character so that presence or absence will not affect string comparison.
-    string.replace(softHyphen, 0);
 
     return string;
@@ -1941 +1934 @@
 
 inline SearchBuffer::SearchBuffer(const String& target, FindOptions options)
-    : m_target(foldQuoteMarksAndSoftHyphens(target))
+    : m_target(foldQuoteMarks(target))
     , m_targetCharacters(StringView(m_target).upconvertedCharacters())
     , m_options(options)
@@ -2031 +2024 @@
     m_buffer.grow(oldLength + usableLength);
     for (unsigned i = 0; i < usableLength; ++i)
-        m_buffer[oldLength + i] = foldQuoteMarkOrSoftHyphen(text[i]);
+        m_buffer[oldLength + i] = foldQuoteMark(text[i]);
     return usableLength;
 }
@@ -2268 +2261 @@
     ASSERT(!m_target.isEmpty());
     m_target.replace(noBreakSpace, ' ');
-    foldQuoteMarksAndSoftHyphens(m_target);
+    foldQuoteMarks(m_target);
 }
 
@@ -2288 +2281 @@
 inline void SearchBuffer::append(UChar c, bool isStart)
 {
-    m_buffer[m_cursor] = c == noBreakSpace ? ' ' : foldQuoteMarkOrSoftHyphen(c);
+    m_buffer[m_cursor] = c == noBreakSpace ? ' ' : foldQuoteMark(c);
     m_isCharacterStartBuffer[m_cursor] = isStart;
     if (++m_cursor == m_target.length()) {