<!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>[167223] releases/WebKitGTK/webkit-2.4</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/167223">167223</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-14 02:00:56 -0700 (Mon, 14 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/164170">r164170</a> - ASSERT_WITH_SECURITY_IMPLICATION in WebCore::toElement
https://bugs.webkit.org/show_bug.cgi?id=128810
Patch by Renata Hodovan <rhodovan.u-szeged@partner.samsung.com> on 2014-02-15
Reviewed by Ryosuke Niwa.
Source/WebCore:
Make CompositeEditCommand::cloneParagraphUnderNewElement() to work when |outerNode|
doesn't contain |start|.
Before this patch, CompositeEditCommand::cloneParagraphUnderNewElement() tried to copy
ancestry nodes from |start| to Document node when |start| position isn't in |outerNode|. This
patch changes CompositeEditCommand::cloneParagraphUnderNewElement() to copy |start| to
|outerNode| only if |outerNode| contains |start| position.
Merged from Blink https://src.chromium.org/viewvc/blink?revision=161762&view=revision by yosin@chromium.org.
Test: editing/execCommand/indent-with-uneditable-crash.html
* editing/CompositeEditCommand.cpp:
(WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):
LayoutTests:
* editing/execCommand/indent-with-uneditable-crash-expected.txt: Added.
* editing/execCommand/indent-with-uneditable-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebCoreeditingCompositeEditCommandcpp">releases/WebKitGTK/webkit-2.4/Source/WebCore/editing/CompositeEditCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestseditingexecCommandindentwithuneditablecrashexpectedtxt">releases/WebKitGTK/webkit-2.4/LayoutTests/editing/execCommand/indent-with-uneditable-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit24LayoutTestseditingexecCommandindentwithuneditablecrashhtml">releases/WebKitGTK/webkit-2.4/LayoutTests/editing/execCommand/indent-with-uneditable-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog (167222 => 167223)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-04-14 08:53:17 UTC (rev 167222)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/ChangeLog 2014-04-14 09:00:56 UTC (rev 167223)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-02-15 Renata Hodovan <rhodovan.u-szeged@partner.samsung.com>
+
+ ASSERT_WITH_SECURITY_IMPLICATION in WebCore::toElement
+ https://bugs.webkit.org/show_bug.cgi?id=128810
+
+ Reviewed by Ryosuke Niwa.
+
+ * editing/execCommand/indent-with-uneditable-crash-expected.txt: Added.
+ * editing/execCommand/indent-with-uneditable-crash.html: Added.
+
</ins><span class="cx"> 2014-02-06 Jeffrey Pfau <jpfau@apple.com>
</span><span class="cx">
</span><span class="cx"> loadSubframe can return null in SubframeLoader::loadOrRedirectSubframe
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestseditingexecCommandindentwithuneditablecrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/editing/execCommand/indent-with-uneditable-crash-expected.txt (0 => 167223)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/editing/execCommand/indent-with-uneditable-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/editing/execCommand/indent-with-uneditable-crash-expected.txt 2014-04-14 09:00:56 UTC (rev 167223)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+Test passes if it does not crash.
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24LayoutTestseditingexecCommandindentwithuneditablecrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.4/LayoutTests/editing/execCommand/indent-with-uneditable-crash.html (0 => 167223)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/LayoutTests/editing/execCommand/indent-with-uneditable-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.4/LayoutTests/editing/execCommand/indent-with-uneditable-crash.html 2014-04-14 09:00:56 UTC (rev 167223)
</span><span class="lines">@@ -0,0 +1,15 @@
</span><ins>+<body contenteditable="true">
+ <select></select>
+ <form>
+ <i contenteditable="false"></i>
+ <dfn></dfn></form><hr>
+
+ <script type="text/javascript">
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ document.execCommand("selectall");
+ document.execCommand("indent");
+ document.body.innerHTML = "Test passes if it does not crash.";
+ </script>
+</body>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (167222 => 167223)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-14 08:53:17 UTC (rev 167222)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2014-04-14 09:00:56 UTC (rev 167223)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-02-15 Renata Hodovan <rhodovan.u-szeged@partner.samsung.com>
+
+ ASSERT_WITH_SECURITY_IMPLICATION in WebCore::toElement
+ https://bugs.webkit.org/show_bug.cgi?id=128810
+
+ Reviewed by Ryosuke Niwa.
+
+ Make CompositeEditCommand::cloneParagraphUnderNewElement() to work when |outerNode|
+ doesn't contain |start|.
+
+ Before this patch, CompositeEditCommand::cloneParagraphUnderNewElement() tried to copy
+ ancestry nodes from |start| to Document node when |start| position isn't in |outerNode|. This
+ patch changes CompositeEditCommand::cloneParagraphUnderNewElement() to copy |start| to
+ |outerNode| only if |outerNode| contains |start| position.
+
+ Merged from Blink https://src.chromium.org/viewvc/blink?revision=161762&view=revision by yosin@chromium.org.
+
+ Test: editing/execCommand/indent-with-uneditable-crash.html
+
+ * editing/CompositeEditCommand.cpp:
+ (WebCore::CompositeEditCommand::cloneParagraphUnderNewElement):
+
</ins><span class="cx"> 2014-02-06 Jeffrey Pfau <jpfau@apple.com>
</span><span class="cx">
</span><span class="cx"> loadSubframe can return null in SubframeLoader::loadOrRedirectSubframe
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebCoreeditingCompositeEditCommandcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/editing/CompositeEditCommand.cpp (167222 => 167223)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.4/Source/WebCore/editing/CompositeEditCommand.cpp 2014-04-14 08:53:17 UTC (rev 167222)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/editing/CompositeEditCommand.cpp 2014-04-14 09:00:56 UTC (rev 167223)
</span><span class="lines">@@ -1061,7 +1061,7 @@
</span><span class="cx"> appendNode(lastNode, blockElement);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (start.deprecatedNode() != outerNode && lastNode->isElementNode()) {
</del><ins>+ if (start.deprecatedNode() != outerNode && lastNode->isElementNode() && start.anchorNode()->isDescendantOf(outerNode.get())) {
</ins><span class="cx"> Vector<RefPtr<Node>> ancestors;
</span><span class="cx">
</span><span class="cx"> // Insert each node from innerNode to outerNode (excluded) in a list.
</span></span></pre>
</div>
</div>
</body>
</html>