<!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>[192213] releases/WebKitGTK/webkit-2.10</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/192213">192213</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-11-10 00:58:28 -0800 (Tue, 10 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/191608">r191608</a> - Null dereference loading Blink layout test editing/execCommand/insert-image-changing-visibility-crash.html
https://bugs.webkit.org/show_bug.cgi?id=150208
<rdar://problem/23137109>
Patch by Jiewen Tan <jiewen_tan@apple.com> on 2015-10-26
Reviewed by Chris Dumez.
Source/WebCore:
This is a merge from Blink <a href="http://trac.webkit.org/projects/webkit/changeset/168502">r168502</a>:
https://codereview.chromium.org/183893018
Test: editing/execCommand/insert-image-changing-visibility-crash.html
* editing/ReplaceSelectionCommand.cpp:
(WebCore::ReplaceSelectionCommand::doApply):
We should check again the visibility of the inserted position again since
the replacement might change the visibility.
LayoutTests:
* editing/execCommand/insert-image-changing-visibility-crash-expected.txt: Added.
* editing/execCommand/insert-image-changing-visibility-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreeditingReplaceSelectionCommandcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/ReplaceSelectionCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestseditingexecCommandinsertimagechangingvisibilitycrashexpectedtxt">releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/insert-image-changing-visibility-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestseditingexecCommandinsertimagechangingvisibilitycrashhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/insert-image-changing-visibility-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (192212 => 192213)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-10 08:57:06 UTC (rev 192212)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog 2015-11-10 08:58:28 UTC (rev 192213)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2015-10-26 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><ins>+ Null dereference loading Blink layout test editing/execCommand/insert-image-changing-visibility-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=150208
+ <rdar://problem/23137109>
+
+ Reviewed by Chris Dumez.
+
+ * editing/execCommand/insert-image-changing-visibility-crash-expected.txt: Added.
+ * editing/execCommand/insert-image-changing-visibility-crash.html: Added.
+
+2015-10-26 Jiewen Tan <jiewen_tan@apple.com>
+
</ins><span class="cx"> Null dereference loading Blink layout test editing/execCommand/insert-ordered-list-crash.html
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150209
</span><span class="cx"> <rdar://problem/23137198>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestseditingexecCommandinsertimagechangingvisibilitycrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/insert-image-changing-visibility-crash-expected.txt (0 => 192213)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/insert-image-changing-visibility-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/insert-image-changing-visibility-crash-expected.txt 2015-11-10 08:58:28 UTC (rev 192213)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Passes if it does not crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestseditingexecCommandinsertimagechangingvisibilitycrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/insert-image-changing-visibility-crash.html (0 => 192213)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/insert-image-changing-visibility-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/editing/execCommand/insert-image-changing-visibility-crash.html 2015-11-10 08:58:28 UTC (rev 192213)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<style>
+table {
+ visibility: collapse;
+}
+
+*:only-child {
+ visibility: visible;
+}
+</style>
+</head>
+<body contenteditable="true">
+<script>
+window.onload = function () {
+ var table = document.getElementById('table');
+ table.insertAdjacentHTML('afterbegin', '<svg></svg><div><div id=\'div\'>text</div>');
+
+ var div = document.getElementById('div');
+ var selection = window.getSelection();
+ selection.collapse(div.firstChild, 0);
+ document.execCommand('InsertImage', false, 'about:blank');
+
+ document.write("Passes if it does not crash.");
+};
+
+if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+<table id="table" ></table>
+<div></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (192212 => 192213)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 08:57:06 UTC (rev 192212)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog 2015-11-10 08:58:28 UTC (rev 192213)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2015-10-26 Jiewen Tan <jiewen_tan@apple.com>
</span><span class="cx">
</span><ins>+ Null dereference loading Blink layout test editing/execCommand/insert-image-changing-visibility-crash.html
+ https://bugs.webkit.org/show_bug.cgi?id=150208
+ <rdar://problem/23137109>
+
+ Reviewed by Chris Dumez.
+
+ This is a merge from Blink r168502:
+ https://codereview.chromium.org/183893018
+
+ Test: editing/execCommand/insert-image-changing-visibility-crash.html
+
+ * editing/ReplaceSelectionCommand.cpp:
+ (WebCore::ReplaceSelectionCommand::doApply):
+ We should check again the visibility of the inserted position again since
+ the replacement might change the visibility.
+
+2015-10-26 Jiewen Tan <jiewen_tan@apple.com>
+
</ins><span class="cx"> Null dereference loading Blink layout test editing/execCommand/insert-ordered-list-crash.html
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150209
</span><span class="cx"> <rdar://problem/23137198>
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreeditingReplaceSelectionCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/ReplaceSelectionCommand.cpp (192212 => 192213)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2015-11-10 08:57:06 UTC (rev 192212)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/editing/ReplaceSelectionCommand.cpp 2015-11-10 08:58:28 UTC (rev 192213)
</span><span class="lines">@@ -1144,7 +1144,7 @@
</span><span class="cx">
</span><span class="cx"> // We inserted before the insertionBlock to prevent nesting, and the content before the insertionBlock wasn't in its own block and
</span><span class="cx"> // didn't have a br after it, so the inserted content ended up in the same paragraph.
</span><del>- if (insertionBlock && insertionPos.deprecatedNode() == insertionBlock->parentNode() && (unsigned)insertionPos.deprecatedEditingOffset() < insertionBlock->computeNodeIndex() && !isStartOfParagraph(startOfInsertedContent))
</del><ins>+ if (!startOfInsertedContent.isNull() && insertionBlock && insertionPos.deprecatedNode() == insertionBlock->parentNode() && (unsigned)insertionPos.deprecatedEditingOffset() < insertionBlock->computeNodeIndex() && !isStartOfParagraph(startOfInsertedContent))
</ins><span class="cx"> insertNodeAt(createBreakElement(document()), startOfInsertedContent.deepEquivalent());
</span><span class="cx">
</span><span class="cx"> if (endBR && (plainTextFragment || shouldRemoveEndBR(endBR.get(), originalVisPosBeforeEndBR))) {
</span></span></pre>
</div>
</div>
</body>
</html>