Changeset 89181 in webkit

Timestamp:

Jun 17, 2011 5:43:15 PM (13 years ago)

Author:

ap@apple.com

Message:

2011-06-17 Alexey Proskuryakov <​ap@apple.com>

Reviewed by Dan Bernstein.

​https://bugs.webkit.org/show_bug.cgi?id=62913
Use ICU search collator when available

<rdar://problem/8830218> Search on a webpage in Safari conflates some Czech characters
<rdar://problem/8468873> Safari search doesn't strip Hamza

This changes behaviors that depend on system language, and isn't practically testable.

• editing/TextIterator.cpp: (WebCore::createSearcher): Ask ICU for search collator, if available.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-17  Alexey Proskuryakov  <ap@apple.com>
+
+        Reviewed by Dan Bernstein.
+
+        https://bugs.webkit.org/show_bug.cgi?id=62913
+        Use ICU search collator when available
+
+        <rdar://problem/8830218> Search on a webpage in Safari conflates some Czech characters
+        <rdar://problem/8468873> Safari search doesn't strip Hamza
+
+        This changes behaviors that depend on system language, and isn't practically testable.
+
+        * editing/TextIterator.cpp: (WebCore::createSearcher): Ask ICU for search collator, if available.
+
 2011-06-17  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebCore/editing/TextIterator.cpp

@@ -1587 +1587 @@
     // without setting both the pattern and the text.
     UErrorCode status = U_ZERO_ERROR;
-    UStringSearch* searcher = usearch_open(&newlineCharacter, 1, &newlineCharacter, 1, currentSearchLocaleID(), 0, &status);
+    String searchCollatorName = makeString(currentSearchLocaleID(), "@collation=search");
+    UStringSearch* searcher = usearch_open(&newlineCharacter, 1, &newlineCharacter, 1, searchCollatorName.utf8().data(), 0, &status);
     ASSERT(status == U_ZERO_ERROR || status == U_USING_FALLBACK_WARNING || status == U_USING_DEFAULT_WARNING);
     return searcher;