<!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>[174751] branches/safari-600.1-branch/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/174751">174751</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-10-15 17:28:08 -0700 (Wed, 15 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/173674">r173674</a>. </pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchLayoutTestseditingspellingcontextmenusuggestionshtml">branches/safari-600.1-branch/LayoutTests/editing/spelling/context-menu-suggestions.html</a></li>
<li><a href="#branchessafari6001branchLayoutTestseditingspellingspellingwithpunctuationselectionexpectedtxt">branches/safari-600.1-branch/LayoutTests/editing/spelling/spelling-with-punctuation-selection-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestseditingspellingspellingwithpunctuationselectionhtml">branches/safari-600.1-branch/LayoutTests/editing/spelling/spelling-with-punctuation-selection.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (174750 => 174751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-10-16 00:17:59 UTC (rev 174750)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-10-16 00:28:08 UTC (rev 174751)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-10-15 Lucas Forschler <lforschler@apple.com>
+
+ Merge r173674
+
+ 2014-09-16 Myles C. Maxfield <mmaxfield@apple.com>
+
+ Make spelling tests more reliable by using a word that is misspelled everywhere
+ https://bugs.webkit.org/show_bug.cgi?id=136865
+
+ Reviewed by Simon Fraser.
+
+ Some platforms recognize "wellcome" as spelled correctly.
+
+ * editing/spelling/context-menu-suggestions.html:
+ * editing/spelling/spelling-with-punctuation-selection-expected.txt:
+ * editing/spelling/spelling-with-punctuation-selection.html:
+
</ins><span class="cx"> 2014-08-29 Jon Honeycutt <jhoneycutt@apple.com>
</span><span class="cx">
</span><span class="cx"> Skip some tests that test features disabled on the branch.
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestseditingspellingcontextmenusuggestionshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/editing/spelling/context-menu-suggestions.html (174750 => 174751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/editing/spelling/context-menu-suggestions.html 2014-10-16 00:17:59 UTC (rev 174750)
+++ branches/safari-600.1-branch/LayoutTests/editing/spelling/context-menu-suggestions.html 2014-10-16 00:28:08 UTC (rev 174751)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx">
</span><span class="cx"> var input = document.getElementById("input");
</span><span class="cx"> input.focus();
</span><del>- document.execCommand("InsertText", false, 'wellcome');
</del><ins>+ document.execCommand("InsertText", false, 'welllcome');
</ins><span class="cx"> document.execCommand("InsertText", false, ' ');
</span><span class="cx">
</span><span class="cx"> var x = input.offsetParent.offsetLeft + input.offsetLeft + 4;
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestseditingspellingspellingwithpunctuationselectionexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/editing/spelling/spelling-with-punctuation-selection-expected.txt (174750 => 174751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/editing/spelling/spelling-with-punctuation-selection-expected.txt 2014-10-16 00:17:59 UTC (rev 174750)
+++ branches/safari-600.1-branch/LayoutTests/editing/spelling/spelling-with-punctuation-selection-expected.txt 2014-10-16 00:28:08 UTC (rev 174751)
</span><span class="lines">@@ -4,11 +4,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS internals.markerCountForNode(destination.childNodes[0], "spelling") became different from 0
</span><del>-PASS spellingMarkerRange.toString() is "wellcome"
</del><ins>+PASS spellingMarkerRange.toString() is "welllcome"
</ins><span class="cx"> PASS window.getSelection().toString() is ""
</span><del>-PASS window.getSelection().toString() is "wellcome!"
-PASS spellingMarkerRange.toString() became "wellcome"
</del><ins>+PASS window.getSelection().toString() is "welllcome!"
+PASS spellingMarkerRange.toString() became "welllcome"
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span><del>-wellcome!
</del><ins>+welllcome!
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestseditingspellingspellingwithpunctuationselectionhtml"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/editing/spelling/spelling-with-punctuation-selection.html (174750 => 174751)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/editing/spelling/spelling-with-punctuation-selection.html 2014-10-16 00:17:59 UTC (rev 174750)
+++ branches/safari-600.1-branch/LayoutTests/editing/spelling/spelling-with-punctuation-selection.html 2014-10-16 00:28:08 UTC (rev 174751)
</span><span class="lines">@@ -15,22 +15,22 @@
</span><span class="cx"> + "To test manually, type 'wellcome!' and select 'wellcome!'. "
</span><span class="cx"> + "The test succeeds when 'wellcome' has spelling marker.");
</span><span class="cx">
</span><del>-initSpellTest("destination", "wellcome!", function(textNode) {
</del><ins>+initSpellTest("destination", "welllcome!", function(textNode) {
</ins><span class="cx"> spellingMarkerRange = internals.markerRangeForNode(textNode, "spelling", 0);
</span><del>- shouldBeEqualToString("spellingMarkerRange.toString()", "wellcome");
</del><ins>+ shouldBeEqualToString("spellingMarkerRange.toString()", "welllcome");
</ins><span class="cx"> shouldBeEqualToString("window.getSelection().toString()", "");
</span><span class="cx">
</span><span class="cx"> // Select the text "wellcome!" with the exclamation mark.
</span><span class="cx"> var range = document.createRange();
</span><span class="cx"> range.setStart(textNode, 0);
</span><del>- range.setEnd(textNode, 9);
</del><ins>+ range.setEnd(textNode, 10);
</ins><span class="cx"> window.getSelection().removeAllRanges();
</span><span class="cx"> window.getSelection().addRange(range);
</span><span class="cx">
</span><del>- shouldBeEqualToString("window.getSelection().toString()", "wellcome!");
</del><ins>+ shouldBeEqualToString("window.getSelection().toString()", "welllcome!");
</ins><span class="cx">
</span><span class="cx"> spellingMarkerRange = internals.markerRangeForNode(textNode, "spelling", 0);
</span><del>- shouldBecomeEqualToString("spellingMarkerRange.toString()", "wellcome", finishJSTest);
</del><ins>+ shouldBecomeEqualToString("spellingMarkerRange.toString()", "welllcome", finishJSTest);
</ins><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> </script>
</span></span></pre>
</div>
</div>
</body>
</html>