<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[165101] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/165101">165101</a></dd>
<dt>Author</dt> <dd>g.czajkowski@samsung.com</dd>
<dt>Date</dt> <dd>2014-03-05 02:20:23 -0800 (Wed, 05 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactoring spelling-insert-html.html to use asynchronous spellchecking
https://bugs.webkit.org/show_bug.cgi?id=129422
Reviewed by Ryosuke Niwa.
Use asynchronous text checking in spelling-insert-html.html.
Add more logs to the test expectation so that it becomes
more descriptive.
Additionally, the word "foo" was changed to "moo" due to
only Mac had recognized this word as spelled correctly.
* editing/spelling/spelling-insert-html-expected.txt:
* editing/spelling/spelling-insert-html.html:
* platform/efl/TestExpectations:
Remove failing expectation for EFL.
* platform/gtk-wk2/TestExpectations:
* platform/gtk/TestExpectations:
Skip the tests for GTK+ because of missing asynchronous spellchecking.
* platform/mac-wk2/TestExpectations:
Ditto.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingspellingspellinginserthtmlexpectedtxt">trunk/LayoutTests/editing/spelling/spelling-insert-html-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingspellingspellinginserthtmlhtml">trunk/LayoutTests/editing/spelling/spelling-insert-html.html</a></li>
<li><a href="#trunkLayoutTestsplatformeflTestExpectations">trunk/LayoutTests/platform/efl/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkTestExpectations">trunk/LayoutTests/platform/gtk/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformgtkwk2TestExpectations">trunk/LayoutTests/platform/gtk-wk2/TestExpectations</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (165100 => 165101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-05 09:13:24 UTC (rev 165100)
+++ trunk/LayoutTests/ChangeLog 2014-03-05 10:20:23 UTC (rev 165101)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-03-05 Grzegorz Czajkowski <g.czajkowski@samsung.com>
+
+ Refactoring spelling-insert-html.html to use asynchronous spellchecking
+ https://bugs.webkit.org/show_bug.cgi?id=129422
+
+ Reviewed by Ryosuke Niwa.
+
+ Use asynchronous text checking in spelling-insert-html.html.
+ Add more logs to the test expectation so that it becomes
+ more descriptive.
+
+ Additionally, the word "foo" was changed to "moo" due to
+ only Mac had recognized this word as spelled correctly.
+
+ * editing/spelling/spelling-insert-html-expected.txt:
+ * editing/spelling/spelling-insert-html.html:
+
+ * platform/efl/TestExpectations:
+ Remove failing expectation for EFL.
+
+ * platform/gtk-wk2/TestExpectations:
+ * platform/gtk/TestExpectations:
+ Skip the tests for GTK+ because of missing asynchronous spellchecking.
+
+ * platform/mac-wk2/TestExpectations:
+ Ditto.
+
</ins><span class="cx"> 2014-03-04 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> DFG and FTL should specialize for and support CompareStrictEq over Misc (i.e. boolean, undefined, or null)
</span></span></pre></div>
<a id="trunkLayoutTestseditingspellingspellinginserthtmlexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/spelling-insert-html-expected.txt (165100 => 165101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/spelling-insert-html-expected.txt 2014-03-05 09:13:24 UTC (rev 165100)
+++ trunk/LayoutTests/editing/spelling/spelling-insert-html-expected.txt 2014-03-05 10:20:23 UTC (rev 165101)
</span><span class="lines">@@ -1,10 +1,19 @@
</span><del>-The spellchecker shouldn't mark substrings of words after pasting.
</del><ins>+The spellchecker shouldn't mark substrings of words after pasting. This test succeeds if only 'zz' is marked as misspelled.
</ins><span class="cx">
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><del>-PASS markedText is "zz"
</del><ins>+
+[object Text]
+moo zz
+PASS internals.markerCountForNode(currentNode, 'spelling') became 1
+PASS internals.markerRangeForNode(currentNode, 'spelling', 0).toString() is "zz"
+[object HTMLBRElement]
+PASS internals.markerCountForNode(currentNode, 'spelling') became 0
+[object Text]
+food.
+PASS internals.markerCountForNode(currentNode, 'spelling') became 0
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-foo zz
</del><ins>+moo zz
</ins><span class="cx"> food.
</span></span></pre></div>
<a id="trunkLayoutTestseditingspellingspellinginserthtmlhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/spelling-insert-html.html (165100 => 165101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/spelling-insert-html.html 2014-03-05 09:13:24 UTC (rev 165100)
+++ trunk/LayoutTests/editing/spelling/spelling-insert-html.html 2014-03-05 10:20:23 UTC (rev 165101)
</span><span class="lines">@@ -4,15 +4,21 @@
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<pre id="description"></pre>
-<pre id="console"></pre>
</del><span class="cx"> <div id="container">
</span><del>- <div id="destination" contentEditable>food.</div>
</del><ins>+<div id="destination" contentEditable>mood.</div>
</ins><span class="cx"> </div>
</span><span class="cx">
</span><span class="cx"> <script>
</span><del>-description("The spellchecker shouldn't mark substrings of words after pasting.");
</del><ins>+description("The spellchecker shouldn't mark substrings of words after pasting. "
+ + "This test succeeds if only 'zz' is marked as misspelled.");
</ins><span class="cx">
</span><ins>+jsTestIsAsync = true;
+
+if (window.internals) {
+ internals.settings.setUnifiedTextCheckerEnabled(true);
+ internals.settings.setAsynchronousSpellCheckingEnabled(true);
+}
+
</ins><span class="cx"> var sel = window.getSelection();
</span><span class="cx"> var destination = document.getElementById("destination");
</span><span class="cx"> var destinationText = destination.firstChild;
</span><span class="lines">@@ -20,22 +26,37 @@
</span><span class="cx">
</span><span class="cx"> document.execCommand("InsertHTML", false, "<div>o zz</div><div>fo</div>");
</span><span class="cx">
</span><del>-if (window.internals) {
- // The destination node has multiple text nodes,
- // so we need concatenate the marked text.
- var texts = destination.childNodes;
- var markedText = "";
- for (var i = 0; i < texts.length; ++i) {
- var marked = internals.markerRangeForNode(texts[i], "spelling", 0);
- if (marked)
- markedText += marked.toString()
- }
</del><ins>+var hasSpellingMarkerForNode = [
+ true, // moo zz
+ false, // <br>
+ false // food.
+];
</ins><span class="cx">
</span><del>- // The first "foo" isn't checked because it crosses the pasted and base html.
- // See http://webkit.org/b/66450.
- shouldBeEqualToString("markedText", "zz");
</del><ins>+var hasSpellingMarker;
+var currentNode;
+
+function verifySpellingMarkersFor(node)
+{
+ hasSpellingMarker = hasSpellingMarkerForNode.shift();
+ currentNode = node;
+ if (!currentNode)
+ return finishJSTest();
+
+ debug(currentNode);
+ if (currentNode instanceof Text)
+ debug(currentNode.nodeValue);
+
+ shouldBecomeEqual("internals.markerCountForNode(currentNode, 'spelling')", hasSpellingMarker ? "1" : "0", function() {
+ if (hasSpellingMarker)
+ shouldBeEqualToString("internals.markerRangeForNode(currentNode, 'spelling', 0).toString()", "zz");
+
+ verifySpellingMarkersFor(node.nextSibling);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+if (window.internals)
+ verifySpellingMarkersFor(destination.firstChild);
+
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformeflTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/efl/TestExpectations (165100 => 165101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/efl/TestExpectations 2014-03-05 09:13:24 UTC (rev 165100)
+++ trunk/LayoutTests/platform/efl/TestExpectations 2014-03-05 10:20:23 UTC (rev 165101)
</span><span class="lines">@@ -493,7 +493,6 @@
</span><span class="cx">
</span><span class="cx"> # Sometimes hit !m_hasAXObject assertion in RenderObject destructor
</span><span class="cx"> webkit.org/b/105879 editing/pasteboard/4806874.html [ Pass Crash ]
</span><del>-webkit.org/b/105879 editing/spelling/spelling-insert-html.html [ Pass Crash ]
</del><span class="cx">
</span><span class="cx"> # Media regressions after updating to gstreamer 1.0.
</span><span class="cx"> webkit.org/b/104809 media/video-src.html [ Crash Pass ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (165100 => 165101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-03-05 09:13:24 UTC (rev 165100)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-03-05 10:20:23 UTC (rev 165101)
</span><span class="lines">@@ -1141,6 +1141,7 @@
</span><span class="cx">
</span><span class="cx"> # Missing asynchronous spellchecking implementation.
</span><span class="cx"> Bug(GTK) editing/spelling/design-mode-spellcheck-off.html [ Skip ]
</span><ins>+Bug(GTK) editing/spelling/spelling-insert-html.html [ Skip ]
</ins><span class="cx"> Bug(GTK) editing/spelling/spelling-hasspellingmarker.html [ Skip ]
</span><span class="cx">
</span><span class="cx"> # testRunner.overridePreference("WebKitDefaultFontSize"...) does not take into account screen DPI
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk-wk2/TestExpectations (165100 => 165101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2014-03-05 09:13:24 UTC (rev 165100)
+++ trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2014-03-05 10:20:23 UTC (rev 165101)
</span><span class="lines">@@ -370,7 +370,6 @@
</span><span class="cx"> Bug(GTK) editing/selection/5136696.html [ Failure ]
</span><span class="cx"> Bug(GTK) editing/selection/inactive-selection.html [ Failure ]
</span><span class="cx"> Bug(GTK) editing/selection/programmatic-selection-on-mac-is-directionless.html [ Failure ]
</span><del>-Bug(GTK) editing/spelling/spelling-insert-html.html [ Failure ]
</del><span class="cx"> Bug(GTK) fast/css/bidi-override-in-anonymous-block.html [ Failure ]
</span><span class="cx"> Bug(GTK) fast/css/disabled-author-styles.html [ Failure ]
</span><span class="cx"> Bug(GTK) fast/dom/rtl-scroll-to-leftmost-and-resize.html [ Failure ]
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (165100 => 165101)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-03-05 09:13:24 UTC (rev 165100)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2014-03-05 10:20:23 UTC (rev 165101)
</span><span class="lines">@@ -378,6 +378,7 @@
</span><span class="cx"> editing/spelling/spellcheck-async.html
</span><span class="cx"> editing/spelling/spellcheck-queue.html
</span><span class="cx"> editing/spelling/spellcheck-sequencenum.html
</span><ins>+editing/spelling/spelling-insert-html.html
</ins><span class="cx"> editing/spelling/spelling-marker-description.html
</span><span class="cx">
</span><span class="cx"> ### END OF (2) Classified failures without bug reports (yet)
</span></span></pre>
</div>
</div>
</body>
</html>