<!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>[210874] branches/safari-603-branch</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/210874">210874</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-18 12:43:20 -0800 (Wed, 18 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210831">r210831</a>. rdar://problem/29057611</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreeditingVisibleUnitscpp">branches/safari-603-branch/Source/WebCore/editing/VisibleUnits.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestseditingrtltoltreditingwordmovespinexpectedtxt">branches/safari-603-branch/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestseditingrtltoltreditingwordmovespinhtml">branches/safari-603-branch/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210873 => 210874)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-18 20:43:17 UTC (rev 210873)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-18 20:43:20 UTC (rev 210874)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210831. rdar://problem/29057611
+
+ 2017-01-17 Zalan Bujtas <zalan@apple.com>
+
+ Editing nested RTL-LTR content makes the process unresponsive.
+ https://bugs.webkit.org/show_bug.cgi?id=167140
+ rdar://problem/29057611
+
+ Reviewed by Ryosuke Niwa.
+
+ * editing/rtl-to-ltr-editing-word-move-spin-expected.txt: Added.
+ * editing/rtl-to-ltr-editing-word-move-spin.html: Added.
+
+2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210827. rdar://problem/28620865
</span><span class="cx">
</span><span class="cx"> 2017-01-17 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestseditingrtltoltreditingwordmovespinexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt (0 => 210874)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt (rev 0)
+++ branches/safari-603-branch/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin-expected.txt 2017-01-18 20:43:20 UTC (rev 210874)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+Pass if no hang.
+‫ foobar foobar‫
+
+
</ins></span></pre></div>
<a id="branchessafari603branchLayoutTestseditingrtltoltreditingwordmovespinhtml"></a>
<div class="addfile"><h4>Added: branches/safari-603-branch/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html (0 => 210874)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html (rev 0)
+++ branches/safari-603-branch/LayoutTests/editing/rtl-to-ltr-editing-word-move-spin.html 2017-01-18 20:43:20 UTC (rev 210874)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This test that we can jump word by word over rtl-ltr content.</title>
+<meta http-equiv="Content-type" content="text/html; charset=utf-8">
+</head>
+<body contenteditable="true";>
+Pass if no hang.
+<div style="direction: rtl;">&#x202B foobar foobar&#x202B</div></br>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+ getSelection().setPosition(document.querySelector('div').firstChild, 2);
+ getSelection().modify('move', 'right', 'word');
+ getSelection().modify('move', 'right', 'word');
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210873 => 210874)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-18 20:43:17 UTC (rev 210873)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-18 20:43:20 UTC (rev 210874)
</span><span class="lines">@@ -1,5 +1,25 @@
</span><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210831. rdar://problem/29057611
+
+ 2017-01-17 Zalan Bujtas <zalan@apple.com>
+
+ Editing nested RTL-LTR content makes the process unresponsive.
+ https://bugs.webkit.org/show_bug.cgi?id=167140
+ rdar://problem/29057611
+
+ Reviewed by Ryosuke Niwa.
+
+ Break out of the loop if we keep coming back to the same position.
+ This is a workaround for the underlying editing/position bug -> webkit.org/b/167138.
+
+ Test: editing/rtl-to-ltr-editing-word-move-spin.html
+
+ * editing/VisibleUnits.cpp:
+ (WebCore::visualWordPosition):
+
+2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210795. rdar://problem/24457632
</span><span class="cx">
</span><span class="cx"> 2017-01-16 Antti Koivisto <antti@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreeditingVisibleUnitscpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/editing/VisibleUnits.cpp (210873 => 210874)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/editing/VisibleUnits.cpp 2017-01-18 20:43:17 UTC (rev 210873)
+++ branches/safari-603-branch/Source/WebCore/editing/VisibleUnits.cpp 2017-01-18 20:43:20 UTC (rev 210874)
</span><span class="lines">@@ -352,6 +352,7 @@
</span><span class="cx"> TextDirection blockDirection = directionOfEnclosingBlock(visiblePosition.deepEquivalent());
</span><span class="cx"> InlineBox* previouslyVisitedBox = nullptr;
</span><span class="cx"> VisiblePosition current = visiblePosition;
</span><ins>+ std::optional<VisiblePosition> previousPosition;
</ins><span class="cx"> UBreakIterator* iter = nullptr;
</span><span class="cx">
</span><span class="cx"> CachedLogicallyOrderedLeafBoxes leafBoxes;
</span><span class="lines">@@ -361,6 +362,9 @@
</span><span class="cx"> VisiblePosition adjacentCharacterPosition = direction == MoveRight ? current.right(true) : current.left(true);
</span><span class="cx"> if (adjacentCharacterPosition == current || adjacentCharacterPosition.isNull())
</span><span class="cx"> return VisiblePosition();
</span><ins>+ // FIXME: This is a workaround for webkit.org/b/167138.
+ if (previousPosition && adjacentCharacterPosition == previousPosition.value())
+ return VisiblePosition();
</ins><span class="cx">
</span><span class="cx"> InlineBox* box;
</span><span class="cx"> int offsetInBox;
</span><span class="lines">@@ -409,6 +413,7 @@
</span><span class="cx"> if (isWordBreak)
</span><span class="cx"> return adjacentCharacterPosition;
</span><span class="cx">
</span><ins>+ previousPosition = current;
</ins><span class="cx"> current = adjacentCharacterPosition;
</span><span class="cx"> }
</span><span class="cx"> return VisiblePosition();
</span></span></pre>
</div>
</div>
</body>
</html>