Changeset 50046 in webkit

Timestamp:

Oct 25, 2009 1:15:56 PM (14 years ago)

Author:

eric@webkit.org

Message:

2009-10-25 Hironori Bono <​hbono@chromium.org>

Reviewed by Darin Adler.

A quick fix for Bug 29103.
Since String::startsWith() cannot fold non-ASCII characters, this change folds the prefix string
and the option string before calling String::startsWith().
​https://bugs.webkit.org/show_bug.cgi?id=29103

• fast/forms/listbox-typeahead-cyrillic-expected.txt: Added.
• fast/forms/listbox-typeahead-cyrillic.html: Added.
• fast/forms/listbox-typeahead-greek-expected.txt: Added.
• fast/forms/listbox-typeahead-greek.html: Added.

2009-10-25 Hironori Bono <​hbono@chromium.org>

Reviewed by Darin Adler.

A quick fix for Bug 29103.
Since String::startsWith() cannot fold non-ASCII characters, this change folds the prefix string
and the option string before calling String::startsWith().
​https://bugs.webkit.org/show_bug.cgi?id=29103

Tests: fast/forms/listbox-typeahead-cyrillic.html

fast/forms/listbox-typeahead-greek.html

• dom/SelectElement.cpp: (WebCore::SelectElement::typeAheadFind):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/forms/listbox-typeahead-cyrillic-expected.txt (added)
• LayoutTests/fast/forms/listbox-typeahead-cyrillic.html (added)
• LayoutTests/fast/forms/listbox-typeahead-greek-expected.txt (added)
• LayoutTests/fast/forms/listbox-typeahead-greek.html (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/dom/SelectElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-10-25  Hironori Bono  <hbono@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        A quick fix for Bug 29103.
+        Since String::startsWith() cannot fold non-ASCII characters, this change folds the prefix string
+        and the option string before calling String::startsWith().
+        https://bugs.webkit.org/show_bug.cgi?id=29103
+
+        * fast/forms/listbox-typeahead-cyrillic-expected.txt: Added.
+        * fast/forms/listbox-typeahead-cyrillic.html: Added.
+        * fast/forms/listbox-typeahead-greek-expected.txt: Added.
+        * fast/forms/listbox-typeahead-greek.html: Added.
+
 2009-10-25  Sam Weinig  <sam@webkit.org>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-10-25  Hironori Bono  <hbono@chromium.org>
+
+        Reviewed by Darin Adler.
+
+        A quick fix for Bug 29103.
+        Since String::startsWith() cannot fold non-ASCII characters, this change folds the prefix string
+        and the option string before calling String::startsWith().
+        https://bugs.webkit.org/show_bug.cgi?id=29103
+
+        Tests: fast/forms/listbox-typeahead-cyrillic.html
+               fast/forms/listbox-typeahead-greek.html
+
+        * dom/SelectElement.cpp:
+        (WebCore::SelectElement::typeAheadFind):
+
 2009-10-25  Keishi Hattori  <casey.hattori@gmail.com>
 

trunk/WebCore/dom/SelectElement.cpp

@@ -875 +875 @@
     ASSERT(index >= 0);
 
+    // Compute a case-folded copy of the prefix string before beginning the search for
+    // a matching element. This code uses foldCase to work around the fact that
+    // String::startWith does not fold non-ASCII characters. This code can be changed
+    // to use startWith once that is fixed.
+    String prefixWithCaseFolded(prefix.foldCase());
     for (int i = 0; i < itemCount; ++i, index = (index + 1) % itemCount) {
         OptionElement* optionElement = toOptionElement(items[index]);
@@ -880 +885 @@
             continue;
 
+        // Fold the option string and check if its prefix is equal to the folded prefix.
         String text = optionElement->textIndentedToRespectGroupLabel();
-        if (stripLeadingWhiteSpace(text).startsWith(prefix, false)) {
+        if (stripLeadingWhiteSpace(text).foldCase().startsWith(prefixWithCaseFolded)) {
             setSelectedIndex(data, element, listToOptionIndex(data, element, index));
             if (!data.usesMenuList())