<!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>[168013] branches/safari-537.76-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/168013">168013</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-04-30 07:02:36 -0700 (Wed, 30 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge 166457. <rdar://problem/16701904></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestsChangeLog">branches/safari-537.76-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCoreChangeLog">branches/safari-537.76-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari53776branchSourceWebCoreeditingFrameSelectioncpp">branches/safari-537.76-branch/Source/WebCore/editing/FrameSelection.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari53776branchLayoutTestseditingselectionlayoutduringmoveselectioncrashexpectedtxt">branches/safari-537.76-branch/LayoutTests/editing/selection/layout-during-move-selection-crash-expected.txt</a></li>
<li><a href="#branchessafari53776branchLayoutTestseditingselectionlayoutduringmoveselectioncrashhtml">branches/safari-537.76-branch/LayoutTests/editing/selection/layout-during-move-selection-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari53776branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/LayoutTests/ChangeLog (168012 => 168013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 13:59:44 UTC (rev 168012)
+++ branches/safari-537.76-branch/LayoutTests/ChangeLog 2014-04-30 14:02:36 UTC (rev 168013)
</span><span class="lines">@@ -1,5 +1,33 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r166457
+
+ 2014-03-29 David Kilzer <ddkilzer@apple.com>
+
+ Preserve selection end positions in directionOfSelection
+ <http://webkit.org/b/104813>
+ <rdar://problem/13666417>
+
+ Reviewed by Brent Fulgham.
+
+ Merged from Blink (patch by kenrb@chromium.org):
+ https://src.chromium.org/viewvc/blink?revision=150621&view=revision
+ http://crbug.com/164263
+
+ VisibleSelection::visibleStart() and VisibleSelection::visibleEnd()
+ can both cause layouts, which has the potential to invalidate any
+ rendertree-based objects. This was causing a problem in
+ FrameSelection::directionOfSelection(), where a reference to a
+ lineBox was being held across a call to visibleEnd().
+
+ This patch ensures that the any layout is completed before linebox
+ references are retrieved.
+
+ * editing/selection/layout-during-move-selection-crash-expected.txt: Added.
+ * editing/selection/layout-during-move-selection-crash.html: Added.
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r166428
</span><span class="cx">
</span><span class="cx"> 2014-03-28 Radu Stavila <stavila@adobe.com>
</span></span></pre></div>
<a id="branchessafari53776branchLayoutTestseditingselectionlayoutduringmoveselectioncrashexpectedtxtfromrev166457trunkLayoutTestseditingselectionlayoutduringmoveselectioncrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/editing/selection/layout-during-move-selection-crash-expected.txt (from rev 166457, trunk/LayoutTests/editing/selection/layout-during-move-selection-crash-expected.txt) (0 => 168013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/editing/selection/layout-during-move-selection-crash-expected.txt (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/editing/selection/layout-during-move-selection-crash-expected.txt 2014-04-30 14:02:36 UTC (rev 168013)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+button PASS, if no crash or assert in debug
+
</ins></span></pre></div>
<a id="branchessafari53776branchLayoutTestseditingselectionlayoutduringmoveselectioncrashhtmlfromrev166457trunkLayoutTestseditingselectionlayoutduringmoveselectioncrashhtml"></a>
<div class="copfile"><h4>Copied: branches/safari-537.76-branch/LayoutTests/editing/selection/layout-during-move-selection-crash.html (from rev 166457, trunk/LayoutTests/editing/selection/layout-during-move-selection-crash.html) (0 => 168013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/LayoutTests/editing/selection/layout-during-move-selection-crash.html (rev 0)
+++ branches/safari-537.76-branch/LayoutTests/editing/selection/layout-during-move-selection-crash.html 2014-04-30 14:02:36 UTC (rev 168013)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<span id=span1></span><button id=button1>button</button>
+<style>
+ .embedStyle { min-height: 13pc; -webkit-transition: 10s; }
+</style>
+<script>
+ function runTest() {
+ div1 = document.createElement("div");
+ document.body.appendChild(div1);
+ embed1 = document.createElementNS("http://www.w3.org/1999/xhtml", "embed");
+ document.body.offsetTop;
+ embed1.setAttribute("class", "embedStyle");
+ span1.appendChild(embed1);
+ embed1.setAttribute("type", "block");
+ document.body.offsetTop;
+ r = document.createRange();
+ r.setStart(button1, 0);
+ r.setEnd(div1, div1.childNodes.length);
+ window.getSelection().addRange(r);
+ o = r.extractContents();
+ document.body.appendChild(o);
+ window.getSelection().modify("move", "Right", "character");
+
+ if (window.testRunner) testRunner.dumpAsText();
+ }
+ document.addEventListener("DOMContentLoaded", runTest, false);
+</script>PASS, if no crash or assert in debug
+</html>
</ins></span></pre></div>
<a id="branchessafari53776branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/ChangeLog (168012 => 168013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 13:59:44 UTC (rev 168012)
+++ branches/safari-537.76-branch/Source/WebCore/ChangeLog 2014-04-30 14:02:36 UTC (rev 168013)
</span><span class="lines">@@ -1,5 +1,35 @@
</span><span class="cx"> 2014-04-30 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r166457
+
+ 2014-03-29 David Kilzer <ddkilzer@apple.com>
+
+ Preserve selection end positions in directionOfSelection
+ <http://webkit.org/b/104813>
+ <rdar://problem/13666417>
+
+ Reviewed by Brent Fulgham.
+
+ Merged from Blink (patch by kenrb@chromium.org):
+ https://src.chromium.org/viewvc/blink?revision=150621&view=revision
+ http://crbug.com/164263
+
+ VisibleSelection::visibleStart() and VisibleSelection::visibleEnd()
+ can both cause layouts, which has the potential to invalidate any
+ rendertree-based objects. This was causing a problem in
+ FrameSelection::directionOfSelection(), where a reference to a
+ lineBox was being held across a call to visibleEnd().
+
+ This patch ensures that the any layout is completed before linebox
+ references are retrieved.
+
+ Test: editing/selection/layout-during-move-selection-crash.html
+
+ * editing/FrameSelection.cpp:
+ (WebCore::FrameSelection::directionOfSelection):
+
+2014-04-30 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r166428
</span><span class="cx">
</span><span class="cx"> 2014-03-28 Radu Stavila <stavila@adobe.com>
</span></span></pre></div>
<a id="branchessafari53776branchSourceWebCoreeditingFrameSelectioncpp"></a>
<div class="modfile"><h4>Modified: branches/safari-537.76-branch/Source/WebCore/editing/FrameSelection.cpp (168012 => 168013)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-537.76-branch/Source/WebCore/editing/FrameSelection.cpp 2014-04-30 13:59:44 UTC (rev 168012)
+++ branches/safari-537.76-branch/Source/WebCore/editing/FrameSelection.cpp 2014-04-30 14:02:36 UTC (rev 168013)
</span><span class="lines">@@ -500,10 +500,14 @@
</span><span class="cx"> InlineBox* startBox = 0;
</span><span class="cx"> InlineBox* endBox = 0;
</span><span class="cx"> int unusedOffset;
</span><del>- if (m_selection.start().isNotNull())
- m_selection.visibleStart().getInlineBoxAndOffset(startBox, unusedOffset);
- if (m_selection.end().isNotNull())
- m_selection.visibleEnd().getInlineBoxAndOffset(endBox, unusedOffset);
</del><ins>+ // Cache the VisiblePositions because visibleStart() and visibleEnd()
+ // can cause layout, which has the potential to invalidate lineboxes.
+ VisiblePosition startPosition = m_selection.visibleStart();
+ VisiblePosition endPosition = m_selection.visibleEnd();
+ if (startPosition.isNotNull())
+ startPosition.getInlineBoxAndOffset(startBox, unusedOffset);
+ if (endPosition.isNotNull())
+ endPosition.getInlineBoxAndOffset(endBox, unusedOffset);
</ins><span class="cx"> if (startBox && endBox && startBox->direction() == endBox->direction())
</span><span class="cx"> return startBox->direction();
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>