Changeset 100887 in webkit

Timestamp:

Nov 20, 2011 10:28:06 PM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[Chromium] Layout test does not return correct misspelling positions if there are multiple misspelled words.
​https://bugs.webkit.org/show_bug.cgi?id=72655

Patch by Shinya Kawanaka <​shinyak@google.com> on 2011-11-20
Reviewed by Hajime Morita.

Tools:

Fixed the calculation of offset.

• DumpRenderTree/chromium/WebViewHost.cpp:

(WebViewHost::finishLastTextCheck):

LayoutTests:

Fixed the calculation of offset, and added test cases having multiple misspelled words.

• editing/spelling/script-tests/spellcheck-paste.js: Added test cases having multiple misspelled words.

(verifyMarker):
(tests):

• editing/spelling/spellcheck-paste-expected.txt: Recreated.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/editing/spelling/script-tests/spellcheck-paste.js (modified) (3 diffs)
• LayoutTests/editing/spelling/spellcheck-paste-expected.txt (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/DumpRenderTree/chromium/WebViewHost.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-11-20  Shinya Kawanaka  <shinyak@google.com>
+
+        [Chromium] Layout test does not return correct misspelling positions if there are multiple misspelled words.
+        https://bugs.webkit.org/show_bug.cgi?id=72655
+
+        Reviewed by Hajime Morita.
+
+        Fixed the calculation of offset, and added test cases having multiple misspelled words.
+
+        * editing/spelling/script-tests/spellcheck-paste.js:
+          Added test cases having multiple misspelled words.
+        (verifyMarker):
+        (tests):
+        * editing/spelling/spellcheck-paste-expected.txt: Recreated.
+
 2011-11-20  Kenichi Ishibashi  <bashi@chromium.org>
 

trunk/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js

@@ -26 +26 @@
 testRoot.appendChild(testSourceDecorated);
 
+var testSourceMulti = document.createElement("div");
+testSourceMulti.innerHTML = "zz zz zz";
+testRoot.appendChild(testSourceMulti);
+
 var sel = window.getSelection();
 
@@ -46 +50 @@
         sel.selectAllChildren(node);
     }
-    return layoutTestController.hasSpellingMarker(expectedMarked[0], expectedMarked[1]);
+
+    var ok = true;
+    for (var i = 0; ok && i < expectedMarked.length; ++i)
+        ok = layoutTestController.hasSpellingMarker(expectedMarked[i][0], expectedMarked[i][1]);
+    return ok;
 }
 
@@ -88 +96 @@
     layoutTestController.setAsynchronousSpellCheckingEnabled(true);
 
-tests.push(function() { pasteAndVerify(testSourcePlain, testInput, [0, 3]); });
-tests.push(function() { pasteAndVerify(testSourceDecorated, testInput, [0, 3]); });
-tests.push(function() { pasteAndVerify(testSourcePlain, testTextArea, [0, 3]); });
-tests.push(function() { pasteAndVerify(testSourceDecorated, testTextArea, [0, 3]); });
-tests.push(function() { pasteAndVerify(testSourcePlain, testEditable, [0, 3]); });
-tests.push(function() { pasteAndVerify(testSourceDecorated, testEditable, [0, 2]); }); // To check "fo" part of foo.
+tests.push(function() { pasteAndVerify(testSourcePlain, testInput, [[0, 3]]); });
+tests.push(function() { pasteAndVerify(testSourceDecorated, testInput, [[0, 3]]); });
+tests.push(function() { pasteAndVerify(testSourceMulti, testInput, [[0, 2], [3, 2]]); });
+tests.push(function() { pasteAndVerify(testSourcePlain, testTextArea, [[0, 3]]); });
+tests.push(function() { pasteAndVerify(testSourceDecorated, testTextArea, [[0, 3]]); });
+tests.push(function() { pasteAndVerify(testSourceMulti, testTextArea, [[0, 2], [3, 2]]); });
+tests.push(function() { pasteAndVerify(testSourcePlain, testEditable, [[0, 3]]); });
+tests.push(function() { pasteAndVerify(testSourceDecorated, testEditable, [[0, 2]]); }); // To check "fo" part of foo.
+tests.push(function() { pasteAndVerify(testSourceMulti, testEditable, [[0, 2], [3, 2]]); });
 done();
 

trunk/LayoutTests/editing/spelling/spellcheck-paste-expected.txt

@@ -9 +9 @@
 PASS INPUT has a marker on 'foo bar'
 PASS INPUT has a marker on 'fo<b>o ba</b>r'
+PASS INPUT has a marker on 'zz zz zz'
 PASS TEXTAREA has a marker on 'foo bar'
 PASS TEXTAREA has a marker on 'fo<b>o ba</b>r'
+PASS TEXTAREA has a marker on 'zz zz zz'
 PASS DIV has a marker on 'foo bar'
 PASS DIV has a marker on 'fo<b>o ba</b>r'
+PASS DIV has a marker on 'zz zz zz'
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-11-20  Shinya Kawanaka  <shinyak@google.com>
+
+        [Chromium] Layout test does not return correct misspelling positions if there are multiple misspelled words.
+        https://bugs.webkit.org/show_bug.cgi?id=72655
+
+        Reviewed by Hajime Morita.
+
+        Fixed the calculation of offset.
+
+        * DumpRenderTree/chromium/WebViewHost.cpp:
+        (WebViewHost::finishLastTextCheck):
+
 2011-11-20  Ojan Vafai  <ojan@chromium.org>
 

trunk/Tools/DumpRenderTree/chromium/WebViewHost.cpp

@@ -459 +459 @@
         results.append(WebTextCheckingResult(WebTextCheckingResult::ErrorSpelling, offset + misspelledPosition, misspelledLength));
         text = text.substring(misspelledPosition + misspelledLength);
-        offset += misspelledPosition;
+        offset += misspelledPosition + misspelledLength;
     }