Attachment 115680 Details for Bug 72655 – Patch

[patch] Patch

bug-72655-20111118072519.patch (text/plain), 5.96 KB, created by Shinya Kawanaka on 2011-11-17 14:25:20 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Shinya Kawanaka

Created: 2011-11-17 14:25:20 PST

Size: 5.96 KB

patch

obsolete

>Subversion Revision: 100620
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 6e61db271f7d8fb128cf273cf08a1d8f41d0d4f8..7ab75992f668699c2ec434dd387c3eb62e75ac09 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,15 @@
>+2011-11-17 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 NOBODY (OOPS!).
>+
>+ Fixed the calculation of offset.
>+
>+ * DumpRenderTree/chromium/WebViewHost.cpp:
>+ (WebViewHost::finishLastTextCheck):
>+
> 2011-11-17 Adam Roben <aroben@apple.com>
> 
> Ignore some leaks in frameworks we link against on Lion
>diff --git a/Tools/DumpRenderTree/chromium/WebViewHost.cpp b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
>index 4816c390d6a828ca0fc85f2f0c4c90ef11d22bbc..6553122e048405765f7694b63fb58e4de2e341bf 100644
>--- a/Tools/DumpRenderTree/chromium/WebViewHost.cpp
>+++ b/Tools/DumpRenderTree/chromium/WebViewHost.cpp
>@@ -458,7 +458,7 @@ void WebViewHost::finishLastTextCheck()
> break;
> results.append(WebTextCheckingResult(WebTextCheckingResult::ErrorSpelling, offset + misspelledPosition, misspelledLength));
> text = text.substring(misspelledPosition + misspelledLength);
>- offset += misspelledPosition;
>+ offset += misspelledPosition + misspelledLength;
> }
> 
> m_lastRequestedTextCheckingCompletion->didFinishCheckingText(results);
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 6ff9382daf5624fda5bdcc8b50a470facd1053d6..d2c0ee3e8c9876a6c8b9618e1bc35b8f366cbcf1 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,18 @@
>+2011-11-17 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 NOBODY (OOPS!).
>+
>+ 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-17 Steve Block <steveblock@google.com>
> 
> ASSERTION FAILED: fontCache()->generation() == m_generation (running new-run-webkit-tests)
>diff --git a/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js b/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>index 013d2b0946c11c363009be8d37815fac17157a0b..3cdd3b481ca9b92c5dfdf3f1e346e6e1fb77a759 100644
>--- a/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>+++ b/LayoutTests/editing/spelling/script-tests/spellcheck-paste.js
>@@ -25,6 +25,11 @@ var testSourceDecorated = document.createElement("div");
> testSourceDecorated.innerHTML = "foo bar";
> testRoot.appendChild(testSourceDecorated);
> 
>+var testSourceMulti = document.createElement("div");
>+testSourceMulti.innerHTML = "zz zz zz";
>+testRoot.appendChild(testSourceMulti);
>+
>+
> var sel = window.getSelection();
> 
> var tests = [];
>@@ -45,7 +50,11 @@ function verifyMarker(node, expectedMarked)
> } else {
> 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;
> }
> 
> function pasteAndVerify(source, dest, expectedMarked)
>@@ -87,12 +96,15 @@ function pasteAndVerify(source, dest, expectedMarked)
> if (window.layoutTestController)
> 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();
> 
> var successfullyParsed = true;
>diff --git a/LayoutTests/editing/spelling/spellcheck-paste-expected.txt b/LayoutTests/editing/spelling/spellcheck-paste-expected.txt
>index ee3a8730b52f24ec445bbeea4235f4fd588a1bb6..591f09217b085f8ea858a5adc0952f763b3897bb 100644
>--- a/LayoutTests/editing/spelling/spellcheck-paste-expected.txt
>+++ b/LayoutTests/editing/spelling/spellcheck-paste-expected.txt
>@@ -8,8 +8,11 @@ PASS successfullyParsed is true
> TEST COMPLETE
> PASS INPUT has a marker on 'foo bar'
> PASS INPUT has a marker on 'foo bar'
>+PASS INPUT has a marker on 'zz zz zz'
> PASS TEXTAREA has a marker on 'foo bar'
> PASS TEXTAREA has a marker on 'foo bar'
>+PASS TEXTAREA has a marker on 'zz zz zz'
> PASS DIV has a marker on 'foo bar'
> PASS DIV has a marker on 'foo bar'
>+PASS DIV has a marker on 'zz zz zz'
>

Actions: View | Formatted Diff | Diff

Attachments on bug 72655: 115680 | 115682