<!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>[184077] releases/WebKitGTK/webkit-2.8</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/184077">184077</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-11 04:06:25 -0700 (Mon, 11 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/182835">r182835</a> - Make inline continuation style change logic consistent.
https://bugs.webkit.org/show_bug.cgi?id=143737
rdar://problem/20486596
Reviewed by Simon Fraser.
Do not force RenderBlock type-casting on the first sibling of the continuation's container.
The first sibling of the container of a continuation should be handled as the rest of the siblings.
Source/WebCore:
Test: fast/inline/inline-with-column-span-and-remove-block-child-crash.html
* rendering/RenderInline.cpp:
(WebCore::updateStyleOfAnonymousBlockContinuations):
(WebCore::RenderInline::styleDidChange):
LayoutTests:
* fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt: Added.
* fast/inline/inline-with-column-span-and-remove-block-child-crash.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit28SourceWebCorerenderingRenderInlinecpp">releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderInline.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastinlineinlinewithcolumnspanandremoveblockchildcrashexpectedtxt">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit28LayoutTestsfastinlineinlinewithcolumnspanandremoveblockchildcrashhtml">releases/WebKitGTK/webkit-2.8/LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit28LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog (184076 => 184077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-11 11:04:08 UTC (rev 184076)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/ChangeLog 2015-05-11 11:06:25 UTC (rev 184077)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-04-14 Zalan Bujtas <zalan@apple.com>
+
+ Make inline continuation style change logic consistent.
+ https://bugs.webkit.org/show_bug.cgi?id=143737
+ rdar://problem/20486596
+
+ Reviewed by Simon Fraser.
+
+ Do not force RenderBlock type-casting on the first sibling of the continuation's container.
+ The first sibling of the container of a continuation should be handled as the rest of the siblings.
+
+ * fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt: Added.
+ * fast/inline/inline-with-column-span-and-remove-block-child-crash.html: Added.
+
</ins><span class="cx"> 2015-04-13 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix LayoutTests/http/tests/canvas/canvas-tainted-after-draw-image.html on all bots
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastinlineinlinewithcolumnspanandremoveblockchildcrashexpectedtxt"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt (0 => 184077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash-expected.txt 2015-05-11 11:06:25 UTC (rev 184077)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+Pass if no crash or assert in debug.
+
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28LayoutTestsfastinlineinlinewithcolumnspanandremoveblockchildcrashhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.8/LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash.html (0 => 184077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash.html (rev 0)
+++ releases/WebKitGTK/webkit-2.8/LayoutTests/fast/inline/inline-with-column-span-and-remove-block-child-crash.html 2015-05-11 11:06:25 UTC (rev 184077)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+ <title>This test that when the block element is removed from an inline element when column span is present, we do not crash.</title>
+ <style>
+ #container {
+ -webkit-column-count: 2;
+ }
+ #after {
+ -webkit-column-span: all;
+ }
+ </style>
+</head>
+<body>
+<div id=container>
+ <span id=outer>Pass if no crash or assert in debug.
+ <div id=removethis></div>
+ </span>
+ <div id=after></div>
+</div>
+</body>
+
+<script>
+ if (window.testRunner)
+ testRunner.dumpAsText();
+
+ document.execCommand("SelectAll");
+
+ var elem = document.getElementById("removethis");
+ elem.parentNode.removeChild(elem);
+
+ document.getElementById("outer").style.position = "relative";
+</script>
+</html>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog (184076 => 184077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 11:04:08 UTC (rev 184076)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/ChangeLog 2015-05-11 11:06:25 UTC (rev 184077)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-04-14 Zalan Bujtas <zalan@apple.com>
+
+ Make inline continuation style change logic consistent.
+ https://bugs.webkit.org/show_bug.cgi?id=143737
+ rdar://problem/20486596
+
+ Reviewed by Simon Fraser.
+
+ Do not force RenderBlock type-casting on the first sibling of the continuation's container.
+ The first sibling of the container of a continuation should be handled as the rest of the siblings.
+
+ Test: fast/inline/inline-with-column-span-and-remove-block-child-crash.html
+
+ * rendering/RenderInline.cpp:
+ (WebCore::updateStyleOfAnonymousBlockContinuations):
+ (WebCore::RenderInline::styleDidChange):
+
</ins><span class="cx"> 2015-04-14 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Media elements not in a page shouldn't load.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit28SourceWebCorerenderingRenderInlinecpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderInline.cpp (184076 => 184077)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderInline.cpp 2015-05-11 11:04:08 UTC (rev 184076)
+++ releases/WebKitGTK/webkit-2.8/Source/WebCore/rendering/RenderInline.cpp 2015-05-11 11:06:25 UTC (rev 184077)
</span><span class="lines">@@ -138,9 +138,10 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void updateStyleOfAnonymousBlockContinuations(RenderBlock& block, const RenderStyle* newStyle, const RenderStyle* oldStyle)
</del><ins>+static void updateStyleOfAnonymousBlockContinuations(const RenderBlock& block, const RenderStyle* newStyle, const RenderStyle* oldStyle)
</ins><span class="cx"> {
</span><del>- for (RenderBox* box = &block; box && box->isAnonymousBlock(); box = box->nextSiblingBox()) {
</del><ins>+ // If any descendant blocks exist then they will be in the next anonymous block and its siblings.
+ for (RenderBox* box = block.nextSiblingBox(); box && box->isAnonymousBlock(); box = box->nextSiblingBox()) {
</ins><span class="cx"> if (box->style().position() == newStyle->position())
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="lines">@@ -184,13 +185,8 @@
</span><span class="cx"> // If an inline's in-flow positioning has changed and it is part of an active continuation as a descendant of an anonymous containing block,
</span><span class="cx"> // then any descendant blocks will need to change their in-flow positioning accordingly.
</span><span class="cx"> // Do this by updating the position of the descendant blocks' containing anonymous blocks - there may be more than one.
</span><del>- if (containingBlock()->isAnonymousBlock() && oldStyle && newStyle.position() != oldStyle->position() && (newStyle.hasInFlowPosition() || oldStyle->hasInFlowPosition())) {
- // If any descendant blocks exist then they will be in the next anonymous block and its siblings.
- ASSERT(containingBlock()->nextSibling());
- RenderBlock& block = downcast<RenderBlock>(*containingBlock()->nextSibling());
- ASSERT(block.isAnonymousBlock());
- updateStyleOfAnonymousBlockContinuations(block, &newStyle, oldStyle);
- }
</del><ins>+ if (containingBlock()->isAnonymousBlock() && oldStyle && newStyle.position() != oldStyle->position() && (newStyle.hasInFlowPosition() || oldStyle->hasInFlowPosition()))
+ updateStyleOfAnonymousBlockContinuations(*containingBlock(), &newStyle, oldStyle);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!alwaysCreateLineBoxes()) {
</span></span></pre>
</div>
</div>
</body>
</html>