<!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>[207834] trunk</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/207834">207834</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-10-25 12:22:12 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/207578">r207578</a>.
https://bugs.webkit.org/show_bug.cgi?id=163962
Broke quip.com so that user can no longer type a space
(Requested by rniwa on #webkit).
Reverted changeset:
"Add a plain space instead of &nbsp; between text nodes"
https://bugs.webkit.org/show_bug.cgi?id=123163
http://trac.webkit.org/changeset/207578</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacfindandreplacematchcapitalizationexpectedtxt">trunk/LayoutTests/accessibility/mac/find-and-replace-match-capitalization-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacfindandreplacematchcapitalizationhtml">trunk/LayoutTests/accessibility/mac/find-and-replace-match-capitalization.html</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacselecttextselecttext135575expectedtxt">trunk/LayoutTests/accessibility/mac/select-text/select-text-135575-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacselecttextselecttext7expectedtxt">trunk/LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacselecttextselecttext8expectedtxt">trunk/LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilitymacselecttextselecttext9expectedtxt">trunk/LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingmacspellingautocorrectionblockquotecrashexpectedtxt">trunk/LayoutTests/editing/mac/spelling/autocorrection-blockquote-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingpasteboardpastetext003expectedtxt">trunk/LayoutTests/editing/pasteboard/paste-text-003-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkeditingexecCommandpaste1expectedtxt">trunk/LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkeditingpasteboardpaste2expectedtxt">trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformgtkeditingpasteboardunrenderedbrexpectedtxt">trunk/LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaceditingexecCommandpaste1expectedtxt">trunk/LayoutTests/platform/mac/editing/execCommand/paste-1-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaceditingpasteboardpaste2expectedtxt">trunk/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmaceditingpasteboardunrenderedbrexpectedtxt">trunk/LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingCompositeEditCommandcpp">trunk/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingcpp">trunk/Source/WebCore/editing/htmlediting.cpp</a></li>
<li><a href="#trunkSourceWebCoreeditinghtmleditingh">trunk/Source/WebCore/editing/htmlediting.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/ChangeLog 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-25 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r207578.
+ https://bugs.webkit.org/show_bug.cgi?id=163962
+
+ Broke quip.com so that user can no longer type a space
+ (Requested by rniwa on #webkit).
+
+ Reverted changeset:
+
+ "Add a plain space instead of &nbsp; between text nodes"
+ https://bugs.webkit.org/show_bug.cgi?id=123163
+ http://trac.webkit.org/changeset/207578
+
</ins><span class="cx"> 2016-10-25 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> WebCryptoAPI test gardening after r207809.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacfindandreplacematchcapitalizationexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/find-and-replace-match-capitalization-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/find-and-replace-match-capitalization-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/accessibility/mac/find-and-replace-match-capitalization-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-The Test test TEST.
</del><ins>+The Test test TEST.
</ins><span class="cx">
</span><span class="cx"> This tests that find and replace will match the capitalization of the replaced word.
</span><span class="cx">
</span><span class="lines">@@ -5,9 +5,9 @@
</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 document.getElementById('text').innerHTML is 'The Test&nbsp;jumped high.'
-PASS document.getElementById('text').innerHTML is 'The Test test&nbsp;high.'
-PASS document.getElementById('text').innerHTML is 'The Test test TEST.'
</del><ins>+PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;jumped high.'
+PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;test&nbsp;high.'
+PASS document.getElementById('text').innerHTML is 'The&nbsp;Test&nbsp;test&nbsp;TEST.'
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacfindandreplacematchcapitalizationhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/find-and-replace-match-capitalization.html (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/find-and-replace-match-capitalization.html 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/accessibility/mac/find-and-replace-match-capitalization.html 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -20,15 +20,15 @@
</span><span class="cx">
</span><span class="cx"> // 'Man' is capitalized, so the replaced text should end up capitalized.
</span><span class="cx"> var result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "man", "test");
</span><del>- shouldBe("document.getElementById('text').innerHTML", "'The Test&nbsp;jumped high.'");
</del><ins>+ shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;jumped high.'");
</ins><span class="cx">
</span><span class="cx"> // 'jumped' is not capitalized so the text should not be capitalized.
</span><span class="cx"> result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "jumped", "Test");
</span><del>- shouldBe("document.getElementById('text').innerHTML", "'The Test test&nbsp;high.'");
</del><ins>+ shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;test&nbsp;high.'");
</ins><span class="cx">
</span><span class="cx"> // The replacement text was all caps, so don't change based on the existing text.
</span><span class="cx"> result = text.selectTextWithCriteria("AXSelectTextAmbiguityResolutionClosestToSelection", "high", "TEST");
</span><del>- shouldBe("document.getElementById('text').innerHTML", "'The Test test TEST.'");
</del><ins>+ shouldBe("document.getElementById('text').innerHTML", "'The&nbsp;Test&nbsp;test&nbsp;TEST.'");
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacselecttextselecttext135575expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/select-text/select-text-135575-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/select-text/select-text-135575-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/accessibility/mac/select-text/select-text-135575-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> The quick brown fox jumps over the lazy dog.
</span><span class="cx">
</span><del>-TEXT2: THE quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
</del><ins>+TEXT2: THE quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
</ins><span class="cx">
</span><span class="cx"> This tests the ability to select and replace text with respect to selection.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacselecttextselecttext7expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/accessibility/mac/select-text/select-text-7-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-The slow brown fox jumps over the lazy dog.
</del><ins>+The slow brown fox jumps over the lazy dog.
</ins><span class="cx">
</span><span class="cx"> TEXT2: The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacselecttextselecttext8expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/accessibility/mac/select-text/select-text-8-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-The quick brown cat jumps over the lazy dog.
</del><ins>+The quick brown cat jumps over the lazy dog.
</ins><span class="cx">
</span><span class="cx"> TEXT2: The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilitymacselecttextselecttext9expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/accessibility/mac/select-text/select-text-9-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-The quick Brown fox jumps over the lazy dog.
</del><ins>+The quick Brown fox jumps over the lazy dog.
</ins><span class="cx">
</span><span class="cx"> TEXT2: The quick brown fox jumps over the lazy dog. The quick brown fox jumps over the lazy dog.
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestseditingmacspellingautocorrectionblockquotecrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/mac/spelling/autocorrection-blockquote-crash-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/mac/spelling/autocorrection-blockquote-crash-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/editing/mac/spelling/autocorrection-blockquote-crash-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> TEST COMPLETE
</span><span class="cx">
</span><span class="cx"> would this
</span><del>-test notational
</del><ins>+test notational
</ins><span class="cx"> make a difference?
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestseditingpasteboardpastetext003expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/editing/pasteboard/paste-text-003-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/pasteboard/paste-text-003-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/editing/pasteboard/paste-text-003-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> This test copies and pastes "is a tide in the affairs of men,\nWhich taken at the flood leads on to fortune.\nOmitted" twice.
</span><span class="cx">
</span><del>-There is a tide in the affairs of men,
</del><ins>+There is a tide in the affairs of men,
</ins><span class="cx"> Which taken at the flood leads on to fortune.
</span><span class="cx"> Omittedis a tide in the affairs of men,
</span><span class="cx"> Which taken at the flood leads on to fortune.
</span><span class="lines">@@ -113,5 +113,5 @@
</span><span class="cx"> Omitted, all the voyage of their life,
</span><span class="cx"> Is bound in shallows and in miseries.
</span><span class="cx"> execCopyCommand: <div id="test" class="editing">There is a tide in the affairs of men, <div class="editing">Which taken at the flood leads on to fortune. <div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
</span><del>-execPasteCommand: <div id="test" class="editing">There is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
-execPasteCommand: <div id="test" class="editing">There is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omittedis a tide in the affairs of men,</div><div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
</del><ins>+execPasteCommand: <div id="test" class="editing">There&nbsp;is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
+execPasteCommand: <div id="test" class="editing">There&nbsp;is a tide in the affairs of men,<div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing"><div class="editing">Omittedis a tide in the affairs of men,</div><div class="editing">Which taken at the flood leads on to fortune.</div><div class="editing">Omitted, all the voyage of their life, <div class="editing">Is bound in shallows and in miseries. </div> </div> </div> </div>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformgtkeditingexecCommandpaste1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/platform/gtk/editing/execCommand/paste-1-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -10,9 +10,8 @@
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
</span><ins>+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
</ins><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><del>-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</del><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkeditingpasteboardpaste2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/paste-2-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -10,9 +10,8 @@
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
</span><ins>+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
</ins><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><del>-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</del><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span></span></pre></div>
<a id="trunkLayoutTestsplatformgtkeditingpasteboardunrenderedbrexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/platform/gtk/editing/pasteboard/unrendered-br-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -2,9 +2,8 @@
</span><span class="cx"> EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><ins>+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > DIV > BODY > HTML > #document to 17 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
</ins><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><del>-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > DIV > BODY > HTML > #document to 17 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</del><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaceditingexecCommandpaste1expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/editing/execCommand/paste-1-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/editing/execCommand/paste-1-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/platform/mac/editing/execCommand/paste-1-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -10,9 +10,8 @@
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
</span><ins>+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
</ins><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><del>-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</del><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaceditingpasteboardpaste2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/paste-2-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -10,9 +10,8 @@
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> EDITING DELEGATE: shouldInsertNode:#document-fragment replacingDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document givenAction:WebViewInsertActionPasted
</span><ins>+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 8 of #text > BODY > HTML > #document to 8 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
</ins><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><del>-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 7 of #text > BODY > HTML > #document to 7 of #text > BODY > HTML > #document toDOMRange:range from 11 of #text > BODY > HTML > #document to 11 of #text > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</del><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmaceditingpasteboardunrenderedbrexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.txt (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.txt 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/LayoutTests/platform/mac/editing/pasteboard/unrendered-br-expected.txt 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -2,9 +2,8 @@
</span><span class="cx"> EDITING DELEGATE: webViewDidBeginEditing:WebViewDidBeginEditingNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><ins>+EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 6 of #text > DIV > BODY > HTML > #document to 6 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > DIV > BODY > HTML > #document to 17 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
</ins><span class="cx"> EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</span><del>-EDITING DELEGATE: shouldChangeSelectedDOMRange:range from 5 of #text > DIV > BODY > HTML > #document to 5 of #text > DIV > BODY > HTML > #document toDOMRange:range from 17 of #text > DIV > DIV > BODY > HTML > #document to 17 of #text > DIV > DIV > BODY > HTML > #document affinity:NSSelectionAffinityDownstream stillSelecting:FALSE
-EDITING DELEGATE: webViewDidChangeSelection:WebViewDidChangeSelectionNotification
</del><span class="cx"> EDITING DELEGATE: webViewDidChange:WebViewDidChangeNotification
</span><span class="cx"> layer at (0,0) size 800x600
</span><span class="cx"> RenderView at (0,0) size 800x600
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-10-25 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r207578.
+ https://bugs.webkit.org/show_bug.cgi?id=163962
+
+ Broke quip.com so that user can no longer type a space
+ (Requested by rniwa on #webkit).
+
+ Reverted changeset:
+
+ "Add a plain space instead of &nbsp; between text nodes"
+ https://bugs.webkit.org/show_bug.cgi?id=123163
+ http://trac.webkit.org/changeset/207578
+
</ins><span class="cx"> 2016-10-25 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> LOG_WITH_STREAM() macro should not have a semi colon at the end
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/CompositeEditCommand.cpp (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/Source/WebCore/editing/CompositeEditCommand.cpp 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -918,15 +918,13 @@
</span><span class="cx">
</span><span class="cx"> VisiblePosition visibleUpstreamPos(Position(textNode, upstream));
</span><span class="cx"> VisiblePosition visibleDownstreamPos(Position(textNode, downstream));
</span><del>-
- Node* nextSibling = textNode->nextSibling();
</del><ins>+
</ins><span class="cx"> String string = text.substring(upstream, length);
</span><span class="cx"> String rebalancedString = stringWithRebalancedWhitespace(string,
</span><span class="cx"> // FIXME: Because of the problem mentioned at the top of this function, we must also use nbsps at the start/end of the string because
</span><span class="cx"> // this function doesn't get all surrounding whitespace, just the whitespace in the current text node.
</span><del>- isStartOfParagraph(visibleUpstreamPos) || !upstream,
- (isEndOfParagraph(visibleDownstreamPos) || (unsigned)downstream == text.length())
- && !(nextSibling && nextSibling->isTextNode() && downcast<Text>(nextSibling)->data().at(0) != ' '));
</del><ins>+ isStartOfParagraph(visibleUpstreamPos) || upstream == 0,
+ isEndOfParagraph(visibleDownstreamPos) || (unsigned)downstream == text.length());
</ins><span class="cx">
</span><span class="cx"> if (string != rebalancedString)
</span><span class="cx"> replaceTextInNodePreservingMarkers(WTFMove(textNode), upstream, length, rebalancedString);
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.cpp (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.cpp 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/Source/WebCore/editing/htmlediting.cpp 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -397,7 +397,7 @@
</span><span class="cx"> return character == '\'' || character == '@' || character == rightSingleQuotationMark || character == hebrewPunctuationGershayim;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-String stringWithRebalancedWhitespace(const String& string, bool startIsStartOfParagraph, bool shouldEmitNonBreakingSpaceBeforeEnd)
</del><ins>+String stringWithRebalancedWhitespace(const String& string, bool startIsStartOfParagraph, bool endIsEndOfParagraph)
</ins><span class="cx"> {
</span><span class="cx"> StringBuilder rebalancedString;
</span><span class="cx">
</span><span class="lines">@@ -410,8 +410,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> LChar selectedWhitespaceCharacter;
</span><del>- // We need to ensure there is no next sibling text node. See https://bugs.webkit.org/show_bug.cgi?id=123163
- if (previousCharacterWasSpace || (!i && startIsStartOfParagraph) || (i == length - 1 && shouldEmitNonBreakingSpaceBeforeEnd)) {
</del><ins>+ if (previousCharacterWasSpace || (!i && startIsStartOfParagraph) || (i == length - 1 && endIsEndOfParagraph)) {
</ins><span class="cx"> selectedWhitespaceCharacter = noBreakSpace;
</span><span class="cx"> previousCharacterWasSpace = false;
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="trunkSourceWebCoreeditinghtmleditingh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/htmlediting.h (207833 => 207834)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/htmlediting.h 2016-10-25 19:20:59 UTC (rev 207833)
+++ trunk/Source/WebCore/editing/htmlediting.h 2016-10-25 19:22:12 UTC (rev 207834)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx">
</span><span class="cx"> bool isAmbiguousBoundaryCharacter(UChar);
</span><span class="cx">
</span><del>-String stringWithRebalancedWhitespace(const String&, bool startIsStartOfParagraph, bool shouldEmitNonBreakingSpaceBeforeEnd);
</del><ins>+String stringWithRebalancedWhitespace(const String&, bool startIsStartOfParagraph, bool endIsEndOfParagraph);
</ins><span class="cx"> const String& nonBreakingSpaceString();
</span><span class="cx">
</span><span class="cx"> // Miscellaneous functions for caret rendering.
</span></span></pre>
</div>
</div>
</body>
</html>