<!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>[180047] branches/safari-600.1.4.15-branch/Source/WebCore</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/180047">180047</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-02-13 09:02:15 -0800 (Fri, 13 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/179750">r179750</a>. rdar://problem/19719085</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001415branchSourceWebCoreChangeLog">branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001415branchSourceWebCorerenderingRenderLineBoxListcpp">branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLineBoxList.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001415branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog (180046 => 180047)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-13 17:02:11 UTC (rev 180046)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/ChangeLog 2015-02-13 17:02:15 UTC (rev 180047)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r179750. rdar://problem/19719085
+
+ 2015-02-06 Maciej Stachowiak <mjs@apple.com>
+
+ REGRESSION(r179706): Caused memory corruption on some tests (Requested by _ap_ on #webkit).
+ https://bugs.webkit.org/show_bug.cgi?id=141324
+
+ Reviewed by Alexey Proskuryakov.
+
+ No new tests. This is caught by existing tests under ASAN, and I don't know how to reproduce
+ it without ASAN.
+
+ * rendering/RenderLineBoxList.cpp:
+ (WebCore::RenderLineBoxList::dirtyLinesFromChangedChild): Give up
+ and just always invalidate the next line. It's too hard to come up
+ with the condition that catches all needed cases, doesn't itself
+ cause a crash, and isn't overzealous. And we do this for the
+ previous line anyway. Also clean up the code a bit since it
+ confusingly reuses a variable, and declares it uninitialized, for
+ no good reason.
+
+2015-02-13 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r179706. rdar://problem/19719085
</span><span class="cx">
</span><span class="cx"> 2015-02-05 Maciej Stachowiak <mjs@apple.com>
</span></span></pre></div>
<a id="branchessafari6001415branchSourceWebCorerenderingRenderLineBoxListcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLineBoxList.cpp (180046 => 180047)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLineBoxList.cpp 2015-02-13 17:02:11 UTC (rev 180046)
+++ branches/safari-600.1.4.15-branch/Source/WebCore/rendering/RenderLineBoxList.cpp 2015-02-13 17:02:15 UTC (rev 180047)
</span><span class="lines">@@ -378,7 +378,6 @@
</span><span class="cx">
</span><span class="cx"> // If we found a line box, then dirty it.
</span><span class="cx"> if (box) {
</span><del>- RootInlineBox* adjacentBox;
</del><span class="cx"> box->markDirty();
</span><span class="cx">
</span><span class="cx"> // dirty the adjacent lines that might be affected
</span><span class="lines">@@ -388,17 +387,13 @@
</span><span class="cx"> // calls setLineBreakInfo with the result of findNextLineBreak. findNextLineBreak,
</span><span class="cx"> // despite the name, actually returns the first RenderObject after the BR.
</span><span class="cx"> // <rdar://problem/3849947> "Typing after pasting line does not appear until after window resize."
</span><del>- adjacentBox = box->prevRootBox();
- if (adjacentBox)
- adjacentBox->markDirty();
- adjacentBox = box->nextRootBox();
- // If |child| has been inserted before the first element in the linebox, but after collapsed leading
- // space, the search for |child|'s linebox will go past the leading space to the previous linebox and select that
- // one as |box|. If we hit that situation here, dirty the |box| actually containing the child too.
- bool insertedAfterLeadingSpace = box->lineBreakObj() == child->previousSibling();
- if (adjacentBox && (adjacentBox->lineBreakObj()->isDescendantOf(&child) || child->isBR() || (curr && curr->isBR())
- || insertedAfterLeadingSpace || isIsolated(container->style().unicodeBidi())))
- adjacentBox->markDirty();
</del><ins>+ if (RootInlineBox* prevBox = box->prevRootBox())
+ prevBox->markDirty();
+
+ // FIXME: We shouldn't need to always dirty the next line. This is only strictly
+ // necessary some of the time, in situations involving BRs.
+ if (RootInlineBox* nextBox = box->nextRootBox())
+ nextBox->markDirty();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>