<!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>[164100] 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/164100">164100</a></dd>
<dt>Author</dt> <dd>g.czajkowski@samsung.com</dd>
<dt>Date</dt> <dd>2014-02-14 04:26:54 -0800 (Fri, 14 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use asynchronous spellchecking in spelling-hasspellingmarker.js
https://bugs.webkit.org/show_bug.cgi?id=128526
Reviewed by Ryosuke Niwa.
Refactoring spelling-hasspellingmarker.js to use asynchronous spellchecking.
In addition, adds some bits for non-DumpRenderTree users.
* editing/spelling/script-tests/spelling-hasspellingmarker.js:
(addContainer): creates a new div element based on given markup.
(typeMisspelling): types 'zz' to the element.
(verifySpellingMarkers): calls shouldBecomeEqual to verify spelling markers.
(tests): contains test cases.
(done): invokes next test cases if any, otherwise calls finishJSTest().
* editing/spelling/spelling-hasspellingmarker-expected.txt:
Update baseline.
* editing/spelling/spelling-hasspellingmarker.html:
Include editing.js due to the test started using typeCharacterCommand().
* platform/gtk-wk2/TestExpectations:
* platform/gtk/TestExpectations:
Skip spelling-hasspellingmarker.html for GTK (wk1 and wk2).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestseditingspellingscripttestsspellinghasspellingmarkerjs">trunk/LayoutTests/editing/spelling/script-tests/spelling-hasspellingmarker.js</a></li>
<li><a href="#trunkLayoutTestseditingspellingspellinghasspellingmarkerexpectedtxt">trunk/LayoutTests/editing/spelling/spelling-hasspellingmarker-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingspellingspellinghasspellingmarkerhtml">trunk/LayoutTests/editing/spelling/spelling-hasspellingmarker.html</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164099 => 164100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-02-14 11:52:05 UTC (rev 164099)
+++ trunk/LayoutTests/ChangeLog 2014-02-14 12:26:54 UTC (rev 164100)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-02-14 Grzegorz Czajkowski <g.czajkowski@samsung.com>
+
+ Use asynchronous spellchecking in spelling-hasspellingmarker.js
+ https://bugs.webkit.org/show_bug.cgi?id=128526
+
+ Reviewed by Ryosuke Niwa.
+
+ Refactoring spelling-hasspellingmarker.js to use asynchronous spellchecking.
+ In addition, adds some bits for non-DumpRenderTree users.
+
+ * editing/spelling/script-tests/spelling-hasspellingmarker.js:
+ (addContainer): creates a new div element based on given markup.
+ (typeMisspelling): types 'zz' to the element.
+ (verifySpellingMarkers): calls shouldBecomeEqual to verify spelling markers.
+ (tests): contains test cases.
+ (done): invokes next test cases if any, otherwise calls finishJSTest().
+
+ * editing/spelling/spelling-hasspellingmarker-expected.txt:
+ Update baseline.
+
+ * editing/spelling/spelling-hasspellingmarker.html:
+ Include editing.js due to the test started using typeCharacterCommand().
+
+ * platform/gtk-wk2/TestExpectations:
+ * platform/gtk/TestExpectations:
+ Skip spelling-hasspellingmarker.html for GTK (wk1 and wk2).
+
</ins><span class="cx"> 2014-02-13 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Update Windows test expectations.
</span></span></pre></div>
<a id="trunkLayoutTestseditingspellingscripttestsspellinghasspellingmarkerjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/script-tests/spelling-hasspellingmarker.js (164099 => 164100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/script-tests/spelling-hasspellingmarker.js 2014-02-14 11:52:05 UTC (rev 164099)
+++ trunk/LayoutTests/editing/spelling/script-tests/spelling-hasspellingmarker.js 2014-02-14 12:26:54 UTC (rev 164100)
</span><span class="lines">@@ -1,23 +1,63 @@
</span><del>-description('This tests internals.hasSpellingMarker works for differnt type of elements.');
</del><ins>+description('This tests if internals.hasSpellingMarker works for differnt type of elements. '
+ + 'This test succeds when there are four elements having "zz ". '
+ + 'However, only the last one should not contatin spelling marker.');
</ins><span class="cx">
</span><del>-var parent = document.createElement("div");
-document.body.appendChild(parent);
</del><ins>+jsTestIsAsync = true;
</ins><span class="cx">
</span><del>-function hasMarked(markup)
</del><ins>+if (window.internals) {
+ internals.settings.setUnifiedTextCheckerEnabled(true);
+ internals.settings.setAsynchronousSpellCheckingEnabled(true);
+}
+
+var testRoot = document.createElement("div");
+document.body.insertBefore(testRoot, document.body.firstChild);
+
+function addContainer(markup)
</ins><span class="cx"> {
</span><del>- parent.innerHTML = markup;
- document.getElementById('test').focus();
- document.execCommand("InsertText", false, 'z');
- document.execCommand("InsertText", false, 'z');
- document.execCommand("InsertText", false, ' ');
</del><ins>+ var contatiner = document.createElement("div");
+ contatiner.innerHTML = markup;
+ testRoot.appendChild(contatiner);
</ins><span class="cx">
</span><del>- return internals.hasSpellingMarker(0, 2);
</del><ins>+ return contatiner;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-shouldBeTrue("hasMarked(\"<textarea id='test' cols='80' rows='10'></textarea>\");");
-shouldBeTrue("hasMarked(\"<input id='test' type='text'>\");");
-shouldBeTrue("hasMarked(\"<div id='test' contenteditable='true'></div>\");");
-shouldBeFalse("hasMarked(\"<div id='test' contentEditable='true' spellcheck='false'></div>\");");
-parent.innerHTML = "";
</del><ins>+function typeMisspelling(contatiner)
+{
+ contatiner.firstChild.focus();
+ typeCharacterCommand('z');
+ typeCharacterCommand('z');
+ typeCharacterCommand(' ');
+}
</ins><span class="cx">
</span><ins>+function verifySpellingMarkers(element)
+{
+ var div = addContainer(element.containerMarkup);
+ typeMisspelling(div);
+
+ if (window.internals)
+ shouldBecomeEqual("internals.hasSpellingMarker(0, 2)", element.isMisspelled ? "true" : "false", done);
+ else
+ done();
+}
+
+var tests = [
+ function() { verifySpellingMarkers({ containerMarkup: "<textarea></textarea>", isMisspelled: true }); },
+ function() { verifySpellingMarkers({ containerMarkup: "<input type='text'></input>", isMisspelled: true}); },
+ function() { verifySpellingMarkers({ containerMarkup: "<div contenteditable='true'></div>", isMisspelled: true}); },
+ function() { verifySpellingMarkers({ containerMarkup: "<div contentEditable='true' spellcheck='false'></div>", isMisspelled: false}); }
+];
+
+function done()
+{
+ var next = tests.shift();
+ if (next)
+ return setTimeout(next, 0);
+
+ if (window.internals)
+ testRoot.style.display = "none";
+
+ finishJSTest();
+}
+done();
+
</ins><span class="cx"> var successfullyParsed = true;
</span></span></pre></div>
<a id="trunkLayoutTestseditingspellingspellinghasspellingmarkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/spelling-hasspellingmarker-expected.txt (164099 => 164100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/spelling-hasspellingmarker-expected.txt 2014-02-14 11:52:05 UTC (rev 164099)
+++ trunk/LayoutTests/editing/spelling/spelling-hasspellingmarker-expected.txt 2014-02-14 12:26:54 UTC (rev 164100)
</span><span class="lines">@@ -1,12 +1,12 @@
</span><del>-This tests internals.hasSpellingMarker works for differnt type of elements.
</del><ins>+This tests if internals.hasSpellingMarker works for differnt type of elements. This test succeds when there are four elements having "zz ". However, only the last one should not contatin spelling marker.
</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><span class="cx">
</span><del>-PASS hasMarked("<textarea id='test' cols='80' rows='10'></textarea>"); is true
-PASS hasMarked("<input id='test' type='text'>"); is true
-PASS hasMarked("<div id='test' contenteditable='true'></div>"); is true
-PASS hasMarked("<div id='test' contentEditable='true' spellcheck='false'></div>"); is false
</del><ins>+PASS internals.hasSpellingMarker(0, 2) became true
+PASS internals.hasSpellingMarker(0, 2) became true
+PASS internals.hasSpellingMarker(0, 2) became true
+PASS internals.hasSpellingMarker(0, 2) became false
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestseditingspellingspellinghasspellingmarkerhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/spelling/spelling-hasspellingmarker.html (164099 => 164100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/spelling/spelling-hasspellingmarker.html 2014-02-14 11:52:05 UTC (rev 164099)
+++ trunk/LayoutTests/editing/spelling/spelling-hasspellingmarker.html 2014-02-14 12:26:54 UTC (rev 164100)
</span><span class="lines">@@ -2,6 +2,7 @@
</span><span class="cx"> <html>
</span><span class="cx"> <head>
</span><span class="cx"> <script src="../../resources/js-test-pre.js"></script>
</span><ins>+<script src="../editing.js"></script>
</ins><span class="cx"> <script src="resources/js-test-selection-shared.js"></script>
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/TestExpectations (164099 => 164100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/TestExpectations 2014-02-14 11:52:05 UTC (rev 164099)
+++ trunk/LayoutTests/platform/gtk/TestExpectations 2014-02-14 12:26:54 UTC (rev 164100)
</span><span class="lines">@@ -1144,6 +1144,9 @@
</span><span class="cx"> Bug(GTK) editing/spelling/grammar-paste.html [ Skip ]
</span><span class="cx"> Bug(GTK) editing/spelling/markers.html [ Skip ]
</span><span class="cx">
</span><ins>+# Missing asynchronous spellchecking implementation.
+Bug(GTK) editing/spelling/spelling-hasspellingmarker.html [ Skip ]
+
</ins><span class="cx"> # testRunner.overridePreference("WebKitDefaultFontSize"...) does not take into account screen DPI
</span><span class="cx"> webkit.org/b/57160 fast/harness/override-preferences-2.html [ Failure ]
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk-wk2/TestExpectations (164099 => 164100)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2014-02-14 11:52:05 UTC (rev 164099)
+++ trunk/LayoutTests/platform/gtk-wk2/TestExpectations 2014-02-14 12:26:54 UTC (rev 164100)
</span><span class="lines">@@ -166,7 +166,6 @@
</span><span class="cx"> Bug(GTK) editing/spelling/spelling-double-clicked-word.html [ Skip ]
</span><span class="cx"> Bug(GTK) editing/spelling/spelling-exactly-selected-multiple-words.html [ Skip ]
</span><span class="cx"> Bug(GTK) editing/spelling/spelling-exactly-selected-word.html [ Skip ]
</span><del>-Bug(GTK) editing/spelling/spelling-hasspellingmarker.html [ Skip ]
</del><span class="cx"> Bug(GTK) editing/spelling/spelling-linebreak.html [ Skip ]
</span><span class="cx"> Bug(GTK) editing/spelling/spelling-should-select-multiple-words.html [ Skip ]
</span><span class="cx"> Bug(GTK) editing/spelling/spelling-with-punctuation-selection.html [ Skip ]
</span></span></pre>
</div>
</div>
</body>
</html>