<!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>[186610] branches/safari-600.8-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/186610">186610</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-09 14:01:46 -0700 (Thu, 09 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186502">r186502</a>. rdar://problem/21707910</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6008branchLayoutTestsChangeLog">branches/safari-600.8-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6008branchSourceWebCoreChangeLog">branches/safari-600.8-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6008branchSourceWebCorerenderingRenderElementcpp">branches/safari-600.8-branch/Source/WebCore/rendering/RenderElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6008branchLayoutTestsfastblockcrashwhenanonymousblocksaremergedwithsimplelinelayoutexpectedtxt">branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt</a></li>
<li><a href="#branchessafari6008branchLayoutTestsfastblockcrashwhenanonymousblocksaremergedwithsimplelinelayouthtml">branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6008branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/LayoutTests/ChangeLog (186609 => 186610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/ChangeLog 2015-07-09 20:47:58 UTC (rev 186609)
+++ branches/safari-600.8-branch/LayoutTests/ChangeLog 2015-07-09 21:01:46 UTC (rev 186610)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2015-07-09 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r186502. rdar://problem/21707910
+
+ 2015-07-07 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r184577. rdar://problem/21708263
+
+ 2015-05-19 Zalan Bujtas <zalan@apple.com>
+
+ Merged anonymous blocks should invalidate simple line layout path.
+ https://bugs.webkit.org/show_bug.cgi?id=145104
+ rdar://problem/20980930
+
+ Reviewed by Antti Koivisto.
+
+ When anonymous blocks are merged together, it's not guaranteed that the final block can use simple line layout.
+ This patch ensures that the flow block, where the other block's content gets moved to, is no longer on simple line layout path.
+ Whether the final flow block ends up using inline boxes or simple line layout will be determined during the next layout.
+
+ * fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt: Added.
+ * fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html: Added.
+
</ins><span class="cx"> 2015-06-16 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Add expectations for a couple flaky tests:
</span></span></pre></div>
<a id="branchessafari6008branchLayoutTestsfastblockcrashwhenanonymousblocksaremergedwithsimplelinelayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt (0 => 186610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout-expected.txt 2015-07-09 21:01:46 UTC (rev 186610)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Pass if no crash or assert in debug.
+foo
</ins></span></pre></div>
<a id="branchessafari6008branchLayoutTestsfastblockcrashwhenanonymousblocksaremergedwithsimplelinelayouthtml"></a>
<div class="addfile"><h4>Added: branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html (0 => 186610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html (rev 0)
+++ branches/safari-600.8-branch/LayoutTests/fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html 2015-07-09 21:01:46 UTC (rev 186610)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests when 2 anonymous blocks are merged and the 'to' block has simple line layout path.</title>
+</head>
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+</script>
+</head>
+<body>
+<div>Pass if no crash or assert in debug.</div>foo<div id="removethis"></div><span>
+<script>
+ document.body.offsetWidth;
+ var elem = document.getElementById("removethis");
+ elem.parentNode.removeChild(elem);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6008branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebCore/ChangeLog (186609 => 186610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-09 20:47:58 UTC (rev 186609)
+++ branches/safari-600.8-branch/Source/WebCore/ChangeLog 2015-07-09 21:01:46 UTC (rev 186610)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2015-07-09 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r186502. rdar://problem/21707910
+
+ 2015-07-07 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r184577. rdar://problem/21708263
+
+ 2015-05-19 Zalan Bujtas <zalan@apple.com>
+
+ Merged anonymous blocks should invalidate simple line layout path.
+ https://bugs.webkit.org/show_bug.cgi?id=145104
+ rdar://problem/20980930
+
+ Reviewed by Antti Koivisto.
+
+ When anonymous blocks are merged together, it's not guaranteed that the final block can use simple line layout.
+ This patch ensures that the flow block, where the other block's content gets moved to, is no longer on simple line layout path.
+ Whether the final flow block ends up using inline boxes or simple line layout will be determined during the next layout.
+
+ Test: fast/block/crash-when-anonymous-blocks-are-merged-with-simple-line-layout.html
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::insertChildInternal):
+
</ins><span class="cx"> 2015-06-08 Babak Shafiei <bshafiei@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r183682.
</span></span></pre></div>
<a id="branchessafari6008branchSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.8-branch/Source/WebCore/rendering/RenderElement.cpp (186609 => 186610)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.8-branch/Source/WebCore/rendering/RenderElement.cpp 2015-07-09 20:47:58 UTC (rev 186609)
+++ branches/safari-600.8-branch/Source/WebCore/rendering/RenderElement.cpp 2015-07-09 21:01:46 UTC (rev 186610)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx">
</span><span class="cx"> bool RenderElement::s_affectsParentBlock = false;
</span><span class="cx"> bool RenderElement::s_noLongerAffectsParentBlock = false;
</span><del>-
</del><ins>+
</ins><span class="cx"> static HashMap<const RenderObject*, ControlStates*>& controlStatesRendererMap()
</span><span class="cx"> {
</span><span class="cx"> static NeverDestroyed<HashMap<const RenderObject*, ControlStates*>> map;
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> else if (diff < StyleDifferenceRecompositeLayer)
</span><span class="cx"> diff = StyleDifferenceRecompositeLayer;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> #if ENABLE(CSS_FILTERS)
</span><span class="cx"> if ((contextSensitiveProperties & ContextSensitivePropertyFilter) && hasLayer()) {
</span><span class="cx"> RenderLayer* layer = toRenderLayerModelObject(this)->layer();
</span><span class="lines">@@ -284,7 +284,7 @@
</span><span class="cx"> diff = StyleDifferenceRecompositeLayer;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
</del><ins>+
</ins><span class="cx"> // The answer to requiresLayer() for plugins, iframes, and canvas can change without the actual
</span><span class="cx"> // style changing, since it depends on whether we decide to composite these elements. When the
</span><span class="cx"> // layer status of one of these elements changes, we need to force a layout.
</span><span class="lines">@@ -321,7 +321,7 @@
</span><span class="cx"> // Optimize the common case
</span><span class="cx"> if (oldLayers && !oldLayers->next() && newLayers && !newLayers->next() && (oldLayers->image() == newLayers->image()))
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> // Go through the new layers and addClients first, to avoid removing all clients of an image.
</span><span class="cx"> for (const FillLayer* currNew = newLayers; currNew; currNew = currNew->next()) {
</span><span class="cx"> if (currNew->image())
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx"> // Now that the layer (if any) has been updated, we need to adjust the diff again,
</span><span class="cx"> // check whether we should layout now, and decide if we need to repaint.
</span><span class="cx"> StyleDifference updatedDiff = adjustStyleDifference(diff, contextSensitiveProperties);
</span><del>-
</del><ins>+
</ins><span class="cx"> if (diff <= StyleDifferenceLayoutPositionedMovementOnly) {
</span><span class="cx"> if (updatedDiff == StyleDifferenceLayout)
</span><span class="cx"> setNeedsLayoutAndPrefWidthsRecalc();
</span><span class="lines">@@ -579,6 +579,8 @@
</span><span class="cx">
</span><span class="cx"> if (AXObjectCache* cache = document().axObjectCache())
</span><span class="cx"> cache->childrenChanged(this, newChild);
</span><ins>+ if (this->isRenderBlockFlow())
+ toRenderBlockFlow(*this).invalidateLineLayoutPath();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderObject* RenderElement::removeChildInternal(RenderObject& oldChild, NotifyChildrenType notifyChildren)
</span><span class="lines">@@ -618,7 +620,7 @@
</span><span class="cx"> // WARNING: There should be no code running between willBeRemovedFromTree and the actual removal below.
</span><span class="cx"> // This is needed to avoid race conditions where willBeRemovedFromTree would dirty the tree's structure
</span><span class="cx"> // and the code running here would force an untimely rebuilding, leaving |oldChild| dangling.
</span><del>-
</del><ins>+
</ins><span class="cx"> RenderObject* nextSibling = oldChild.nextSibling();
</span><span class="cx">
</span><span class="cx"> if (oldChild.previousSibling())
</span><span class="lines">@@ -642,7 +644,7 @@
</span><span class="cx">
</span><span class="cx"> if (AXObjectCache* cache = document().existingAXObjectCache())
</span><span class="cx"> cache->childrenChanged(this);
</span><del>-
</del><ins>+
</ins><span class="cx"> return nextSibling;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -750,7 +752,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> parentRenderer = parentRenderer->parent();
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -919,7 +921,7 @@
</span><span class="cx">
</span><span class="cx"> if (!m_parent)
</span><span class="cx"> return;
</span><del>-
</del><ins>+
</ins><span class="cx"> if (diff == StyleDifferenceLayout || diff == StyleDifferenceSimplifiedLayout) {
</span><span class="cx"> RenderCounter::rendererStyleChanged(this, oldStyle, &m_style.get());
</span><span class="cx">
</span><span class="lines">@@ -1382,7 +1384,7 @@
</span><span class="cx"> return current;
</span><span class="cx"> if (!current->isRenderInline() || current->isRubyText())
</span><span class="cx"> return nullptr;
</span><del>-
</del><ins>+
</ins><span class="cx"> const RenderStyle& styleToUse = firstLine ? current->firstLineStyle() : current->style();
</span><span class="cx"> if (styleToUse.textDecoration() & textDecoration)
</span><span class="cx"> return current;
</span></span></pre>
</div>
</div>
</body>
</html>