<!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>[242477] releases/WebKitGTK/webkit-2.24</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/242477">242477</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2019-03-05 09:21:28 -0800 (Tue, 05 Mar 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/242117">r242117</a> - Remove conditional compile guard for InsertIntoTextNodeCommand::doReapply
https://bugs.webkit.org/show_bug.cgi?id=195067
<rdar://problem/44812080>

Reviewed by Tim Horton.

Source/WebCore:

This iOS-specific override was introduced to fix <rdar://problem/7114425>, in which the last typed character
would be revealed when redoing text input on iOS inside a password field. The associated change fixed this bug
by overriding doReapply on iOS to only insert text (instead of additionally handling password echo); however, it
really makes sense to skip password echo when redoing on all platforms, so we can just remove the platform-
specific guards around this logic.

Doing this allows us to add the `hasEditableStyle()` check on iOS when redoing text insertion, which results in
a very subtle behavior change covered by the new layout test below.

Test: editing/undo/redo-text-insertion-in-non-editable-node.html

* editing/InsertIntoTextNodeCommand.cpp:
(WebCore::InsertIntoTextNodeCommand::doReapply):
* editing/InsertIntoTextNodeCommand.h:

LayoutTests:

Add a new layout test to verify that redoing text insertion in a non-editable element (which was previously
editable) does not mutate the text nodes affected by editing. This test case currently fails on iOS, since we
take a separate codepath when redoing that does not contain this additional check.

* editing/undo/redo-text-insertion-in-non-editable-node-expected.txt: Added.
* editing/undo/redo-text-insertion-in-non-editable-node.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreeditingInsertIntoTextNodeCommandcpp">releases/WebKitGTK/webkit-2.24/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit224SourceWebCoreeditingInsertIntoTextNodeCommandh">releases/WebKitGTK/webkit-2.24/Source/WebCore/editing/InsertIntoTextNodeCommand.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit224LayoutTestseditingundoredotextinsertioninnoneditablenodeexpectedtxt">releases/WebKitGTK/webkit-2.24/LayoutTests/editing/undo/redo-text-insertion-in-non-editable-node-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit224LayoutTestseditingundoredotextinsertioninnoneditablenodehtml">releases/WebKitGTK/webkit-2.24/LayoutTests/editing/undo/redo-text-insertion-in-non-editable-node.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit224LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog (242476 => 242477)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog     2019-03-05 17:21:23 UTC (rev 242476)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/ChangeLog        2019-03-05 17:21:28 UTC (rev 242477)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2019-02-26  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Remove conditional compile guard for InsertIntoTextNodeCommand::doReapply
+        https://bugs.webkit.org/show_bug.cgi?id=195067
+        <rdar://problem/44812080>
+
+        Reviewed by Tim Horton.
+
+        Add a new layout test to verify that redoing text insertion in a non-editable element (which was previously
+        editable) does not mutate the text nodes affected by editing. This test case currently fails on iOS, since we
+        take a separate codepath when redoing that does not contain this additional check.
+
+        * editing/undo/redo-text-insertion-in-non-editable-node-expected.txt: Added.
+        * editing/undo/redo-text-insertion-in-non-editable-node.html: Added.
+
</ins><span class="cx"> 2019-02-25  Sihui Liu  <sihui_liu@apple.com>
</span><span class="cx"> 
</span><span class="cx">         IndexedDB: IDBDatabase and IDBTransaction are leaked in layout tests
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224LayoutTestseditingundoredotextinsertioninnoneditablenodeexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.24/LayoutTests/editing/undo/redo-text-insertion-in-non-editable-node-expected.txt (0 => 242477)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/LayoutTests/editing/undo/redo-text-insertion-in-non-editable-node-expected.txt                            (rev 0)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/editing/undo/redo-text-insertion-in-non-editable-node-expected.txt       2019-03-05 17:21:28 UTC (rev 242477)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+This test verifies that redoing text insertion in a non-editable element is a no-op.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS textNode.data is "Hello"
+PASS textNode.data is ""
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224LayoutTestseditingundoredotextinsertioninnoneditablenodehtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.24/LayoutTests/editing/undo/redo-text-insertion-in-non-editable-node.html (0 => 242477)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/LayoutTests/editing/undo/redo-text-insertion-in-non-editable-node.html                            (rev 0)
+++ releases/WebKitGTK/webkit-2.24/LayoutTests/editing/undo/redo-text-insertion-in-non-editable-node.html       2019-03-05 17:21:28 UTC (rev 242477)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<script src="../../resources/js-test.js"></script>
+</head>
+<body>
+<div id="editor" contenteditable></div>
+</body>
+<script>
+description("This test verifies that redoing text insertion in a non-editable element is a no-op.");
+editor.focus();
+
+document.execCommand("InsertText", true, "Hello");
+const textNode = editor.firstChild;
+shouldBeEqualToString("textNode.data", "Hello");
+
+document.execCommand("Undo");
+editor.setAttribute("contenteditable", "false");
+document.execCommand("Redo");
+
+shouldBeEqualToString("textNode.data", "");
+</script>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog (242476 => 242477)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog  2019-03-05 17:21:23 UTC (rev 242476)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/ChangeLog     2019-03-05 17:21:28 UTC (rev 242477)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2019-02-26  Wenson Hsieh  <wenson_hsieh@apple.com>
+
+        Remove conditional compile guard for InsertIntoTextNodeCommand::doReapply
+        https://bugs.webkit.org/show_bug.cgi?id=195067
+        <rdar://problem/44812080>
+
+        Reviewed by Tim Horton.
+
+        This iOS-specific override was introduced to fix <rdar://problem/7114425>, in which the last typed character
+        would be revealed when redoing text input on iOS inside a password field. The associated change fixed this bug
+        by overriding doReapply on iOS to only insert text (instead of additionally handling password echo); however, it
+        really makes sense to skip password echo when redoing on all platforms, so we can just remove the platform-
+        specific guards around this logic.
+
+        Doing this allows us to add the `hasEditableStyle()` check on iOS when redoing text insertion, which results in
+        a very subtle behavior change covered by the new layout test below.
+
+        Test: editing/undo/redo-text-insertion-in-non-editable-node.html
+
+        * editing/InsertIntoTextNodeCommand.cpp:
+        (WebCore::InsertIntoTextNodeCommand::doReapply):
+        * editing/InsertIntoTextNodeCommand.h:
+
</ins><span class="cx"> 2019-02-26  Keith Miller  <keith_miller@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Code quality cleanup in NeverDestroyed
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreeditingInsertIntoTextNodeCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp (242476 => 242477)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp      2019-03-05 17:21:23 UTC (rev 242476)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/editing/InsertIntoTextNodeCommand.cpp 2019-03-05 17:21:28 UTC (rev 242477)
</span><span class="lines">@@ -65,18 +65,14 @@
</span><span class="cx">     m_node->insertData(m_offset, m_text);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#if PLATFORM(IOS_FAMILY)
-
-// FIXME: Why would reapply be iOS-specific?
</del><span class="cx"> void InsertIntoTextNodeCommand::doReapply()
</span><span class="cx"> {
</span><del>-    // FIXME: Shouldn't this have a hasEditableStyle check?
</del><ins>+    if (!m_node->hasEditableStyle())
+        return;
</ins><span class="cx"> 
</span><span class="cx">     m_node->insertData(m_offset, m_text);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-#endif
-    
</del><span class="cx"> void InsertIntoTextNodeCommand::doUnapply()
</span><span class="cx"> {
</span><span class="cx">     if (!m_node->hasEditableStyle())
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit224SourceWebCoreeditingInsertIntoTextNodeCommandh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.24/Source/WebCore/editing/InsertIntoTextNodeCommand.h (242476 => 242477)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.24/Source/WebCore/editing/InsertIntoTextNodeCommand.h        2019-03-05 17:21:23 UTC (rev 242476)
+++ releases/WebKitGTK/webkit-2.24/Source/WebCore/editing/InsertIntoTextNodeCommand.h   2019-03-05 17:21:28 UTC (rev 242477)
</span><span class="lines">@@ -46,9 +46,7 @@
</span><span class="cx"> private:
</span><span class="cx">     void doApply() override;
</span><span class="cx">     void doUnapply() override;
</span><del>-#if PLATFORM(IOS_FAMILY)
</del><span class="cx">     void doReapply() override;
</span><del>-#endif
</del><span class="cx">     
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx">     void getNodesInCommand(HashSet<Node*>&) override;
</span></span></pre>
</div>
</div>

</body>
</html>