<!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>[186393] 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/186393">186393</a></dd>
<dt>Author</dt> <dd>akling@apple.com</dd>
<dt>Date</dt> <dd>2015-07-06 18:37:40 -0700 (Mon, 06 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Crash when setting text direction via MakeTextWritingDirection* editing commands.
<https://webkit.org/b/146665>
<rdar://problem/20835477>
Reviewed by Ryosuke Niwa.
Source/WebCore:
Fix two buggy clients of enclosingBlock(node) that would fail if the returned
element is the same as the node passed in.
Test: editing/style/change-text-direction-crash.html
* editing/ApplyStyleCommand.cpp:
(WebCore::ApplyStyleCommand::splitAncestorsWithUnicodeBidi):
(WebCore::ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock):
LayoutTests:
Add a test that covers some very simple MakeTextWritingDirection* command usage.
* editing/style/change-text-direction-crash-expected.txt: Added.
* editing/style/change-text-direction-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreeditingApplyStyleCommandcpp">trunk/Source/WebCore/editing/ApplyStyleCommand.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestseditingstylechangetextdirectioncrashexpectedtxt">trunk/LayoutTests/editing/style/change-text-direction-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestseditingstylechangetextdirectioncrashhtml">trunk/LayoutTests/editing/style/change-text-direction-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (186392 => 186393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-07-07 01:16:24 UTC (rev 186392)
+++ trunk/LayoutTests/ChangeLog 2015-07-07 01:37:40 UTC (rev 186393)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-07-06 Andreas Kling <akling@apple.com>
+
+ Crash when setting text direction via MakeTextWritingDirection* editing commands.
+ <https://webkit.org/b/146665>
+ <rdar://problem/20835477>
+
+ Reviewed by Ryosuke Niwa.
+
+ Add a test that covers some very simple MakeTextWritingDirection* command usage.
+
+ * editing/style/change-text-direction-crash-expected.txt: Added.
+ * editing/style/change-text-direction-crash.html: Added.
+
</ins><span class="cx"> 2015-07-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert use of SVG <mask> elements for -webkit-mask-image (r176798, r177494, r186180)
</span></span></pre></div>
<a id="trunkLayoutTestseditingstylechangetextdirectioncrashexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/style/change-text-direction-crash-expected.txt (0 => 186393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/style/change-text-direction-crash-expected.txt (rev 0)
+++ trunk/LayoutTests/editing/style/change-text-direction-crash-expected.txt 2015-07-07 01:37:40 UTC (rev 186393)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+This test verifies that programmatically setting the text direction using editing commands doesn't crash.
+
+MakeTextWritingDirectionLeftToRight:
+| "foo"
+| <div>
+| <span>
+| id="bar"
+| style="unicode-bidi: embed;"
+| "<#selection-anchor>aתbc"
+| <div>
+| <#selection-focus>
+| "baz"
+
+MakeTextWritingDirectionRightToLeft:
+| "foo"
+| <div>
+| <span>
+| id="bar"
+| style="unicode-bidi: embed; direction: rtl;"
+| "<#selection-anchor>aתbc"
+| <div>
+| <#selection-focus>
+| "baz"
+
+MakeTextWritingDirectionNatural:
+| "foo"
+| <div>
+| <span>
+| id="bar"
+| "<#selection-anchor>aתbc"
+| <div>
+| <#selection-focus>
+| "baz"
</ins></span></pre></div>
<a id="trunkLayoutTestseditingstylechangetextdirectioncrashhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/editing/style/change-text-direction-crash.html (0 => 186393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/editing/style/change-text-direction-crash.html (rev 0)
+++ trunk/LayoutTests/editing/style/change-text-direction-crash.html 2015-07-07 01:37:40 UTC (rev 186393)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<html>
+<script src="../../resources/dump-as-markup.js"></script>
+<body>
+</body>
+<script>
+Markup.description("This test verifies that programmatically setting the text direction using editing commands doesn't crash.");
+
+function testCommand(command) {
+ document.body.innerHTML = '<div id="foo" contenteditable>foo<div><span id="bar">aתbc</span></div><div>baz</div></div>';
+
+ var range = document.createRange();
+ var barSpan = document.getElementById("bar");
+ range.setStartBefore(barSpan);
+ range.setEndAfter(barSpan.parentNode)
+ var sel = window.getSelection();
+ sel.removeAllRanges();
+ sel.addRange(range);
+
+ window.testRunner.execCommand(command, false, true);
+ Markup.dump("foo", command);
+}
+
+testCommand("MakeTextWritingDirectionLeftToRight");
+testCommand("MakeTextWritingDirectionRightToLeft");
+testCommand("MakeTextWritingDirectionNatural");
+</script>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (186392 => 186393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-07-07 01:16:24 UTC (rev 186392)
+++ trunk/Source/WebCore/ChangeLog 2015-07-07 01:37:40 UTC (rev 186393)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-06 Andreas Kling <akling@apple.com>
+
+ Crash when setting text direction via MakeTextWritingDirection* editing commands.
+ <https://webkit.org/b/146665>
+ <rdar://problem/20835477>
+
+ Reviewed by Ryosuke Niwa.
+
+ Fix two buggy clients of enclosingBlock(node) that would fail if the returned
+ element is the same as the node passed in.
+
+ Test: editing/style/change-text-direction-crash.html
+
+ * editing/ApplyStyleCommand.cpp:
+ (WebCore::ApplyStyleCommand::splitAncestorsWithUnicodeBidi):
+ (WebCore::ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock):
+
</ins><span class="cx"> 2015-07-06 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Revert use of SVG <mask> elements for -webkit-mask-image (r176798, r177494)
</span></span></pre></div>
<a id="trunkSourceWebCoreeditingApplyStyleCommandcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/editing/ApplyStyleCommand.cpp (186392 => 186393)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2015-07-07 01:16:24 UTC (rev 186392)
+++ trunk/Source/WebCore/editing/ApplyStyleCommand.cpp 2015-07-07 01:37:40 UTC (rev 186393)
</span><span class="lines">@@ -443,8 +443,8 @@
</span><span class="cx"> {
</span><span class="cx"> // We are allowed to leave the highest ancestor with unicode-bidi unsplit if it is unicode-bidi: embed and direction: allowedDirection.
</span><span class="cx"> // In that case, we return the unsplit ancestor. Otherwise, we return 0.
</span><del>- Node* block = enclosingBlock(node);
- if (!block)
</del><ins>+ Element* block = enclosingBlock(node);
+ if (!block || block == node)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> Node* highestAncestorWithUnicodeBidi = 0;
</span><span class="lines">@@ -492,8 +492,8 @@
</span><span class="cx">
</span><span class="cx"> void ApplyStyleCommand::removeEmbeddingUpToEnclosingBlock(Node* node, Node* unsplitAncestor)
</span><span class="cx"> {
</span><del>- Node* block = enclosingBlock(node);
- if (!block)
</del><ins>+ Element* block = enclosingBlock(node);
+ if (!block || block == node)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> Node* parent = nullptr;
</span></span></pre>
</div>
</div>
</body>
</html>