Changeset 127404 in webkit

Timestamp:

Sep 3, 2012 1:16:16 AM (12 years ago)

Author:

g.czajkowski@samsung.com

Message:

[GTK][EFL] 'dictIter' iterator is not initialized for an inner loop
​https://bugs.webkit.org/show_bug.cgi?id=95436

Reviewed by Gustavo Noronha Silva.

Source/WebCore:

The 'checkSpellingOfString' method assumes that the given string is concatenation of words.
To properly handle spellchecking of each word we need to iterate over the all available
dictionaries ('dictIter').

To allow spellchecking for multiple words, 'dictIter' should be initialized at the beginning
of vector while spellchecking of the word. This ensures performing of spelling for word based on
at least one dictionary.

• platform/text/enchant/TextCheckerEnchant.cpp:

(TextCheckerEnchant::checkSpellingOfString): Moved initialization of 'dictIter' to an inner loop.

LayoutTests:

'checkSpellingOfString' from the TextCheckerEnchant class can not mark multiplie words that are misspelled.
It's possible to mark misspeled string only by defining its location and length.

• platform/gtk/TestExpectations: Added spelling-backspace-between-lines.html to TestExpectations.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/gtk/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2012-09-03  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [GTK][EFL] 'dictIter' iterator is not initialized for an inner loop
+        https://bugs.webkit.org/show_bug.cgi?id=95436
+
+        Reviewed by Gustavo Noronha Silva.
+
+        'checkSpellingOfString' from the TextCheckerEnchant class can not mark multiplie words that are misspelled.
+        It's possible to mark misspeled string only by defining its location and length.
+
+        * platform/gtk/TestExpectations: Added spelling-backspace-between-lines.html to TestExpectations.
+
 2012-09-03  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/LayoutTests/platform/gtk/TestExpectations

@@ -1026 +1026 @@
 BUGWKGTK SKIP : editing/spelling/grammar-paste.html = TEXT
 
+// TextCheckerEnchant::checkSpellingOfString doesn't return misspelled location and length for multiple words.
+BUGWKGTK : editing/spelling/spelling-backspace-between-lines.html = TEXT
+
 // testRunner::setTextDirection() is not implemented.
 BUGWKGTK : fast/html/set-text-direction.html = TEXT

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-09-03  Grzegorz Czajkowski  <g.czajkowski@samsung.com>
+
+        [GTK][EFL] 'dictIter' iterator is not initialized for an inner loop
+        https://bugs.webkit.org/show_bug.cgi?id=95436
+
+        Reviewed by Gustavo Noronha Silva.
+
+        The 'checkSpellingOfString' method assumes that the given string is concatenation of words.
+        To properly handle spellchecking of each word we need to iterate over the all available
+        dictionaries ('dictIter').
+
+        To allow spellchecking for multiple words, 'dictIter' should be initialized at the beginning
+        of vector while spellchecking of the word. This ensures performing of spelling for word based on
+        at least one dictionary.
+
+        * platform/text/enchant/TextCheckerEnchant.cpp:
+        (TextCheckerEnchant::checkSpellingOfString): Moved initialization of 'dictIter' to an inner loop.
+
 2012-09-02  Yoshifumi Inoue  <yosin@chromium.org>
 

trunk/Source/WebCore/platform/text/enchant/TextCheckerEnchant.cpp

@@ -79 +79 @@
     CString utf8String = string.utf8();
     const char* cString = utf8String.data();
-    Vector<EnchantDict*>::const_iterator dictIter = m_enchantDictionaries.begin();
 
     for (size_t i = 0; i < numberOfCharacters + 1; i++) {
@@ -101 +100 @@
             int numberOfBytes = static_cast<int>(g_utf8_offset_to_pointer(cString, end) - cstart);
 
-            for (; dictIter != m_enchantDictionaries.end(); ++dictIter) {
+            for (Vector<EnchantDict*>::const_iterator dictIter = m_enchantDictionaries.begin(); dictIter != m_enchantDictionaries.end(); ++dictIter) {
                 if (enchant_dict_check(*dictIter, cstart, numberOfBytes)) {
                     misspellingLocation = start;