<!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>[194645] trunk</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/194645">194645</a></dd>
<dt>Author</dt> <dd>zalan@apple.com</dd>
<dt>Date</dt> <dd>2016-01-06 10:34:02 -0800 (Wed, 06 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Float with media query positioned incorrectly after window resize.
https://bugs.webkit.org/show_bug.cgi?id=152558
Reviewed by Simon Fraser and David Hyatt.
This patch ensures that when a renderer becomes floated, it is moved
to the right containing block.
When this floated renderer's previous sibling is an anonymous block, it needs
to be reparented so that the float is positioned as if there was no anonymous block at all.
Source/WebCore:
Test: fast/block/float/float-with-anonymous-previous-sibling.html
* rendering/RenderElement.cpp:
(WebCore::RenderElement::styleDidChange):
LayoutTests:
* fast/block/float/float-with-anonymous-previous-sibling-expected.html: Added.
* fast/block/float/float-with-anonymous-previous-sibling.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderElementcpp">trunk/Source/WebCore/rendering/RenderElement.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastblockfloatfloatwithanonymousprevioussiblingexpectedhtml">trunk/LayoutTests/fast/block/float/float-with-anonymous-previous-sibling-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastblockfloatfloatwithanonymousprevioussiblinghtml">trunk/LayoutTests/fast/block/float/float-with-anonymous-previous-sibling.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (194644 => 194645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-06 18:28:40 UTC (rev 194644)
+++ trunk/LayoutTests/ChangeLog 2016-01-06 18:34:02 UTC (rev 194645)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-06 Zalan Bujtas <zalan@apple.com>
+
+ Float with media query positioned incorrectly after window resize.
+ https://bugs.webkit.org/show_bug.cgi?id=152558
+
+ Reviewed by Simon Fraser and David Hyatt.
+
+ This patch ensures that when a renderer becomes floated, it is moved
+ to the right containing block.
+ When this floated renderer's previous sibling is an anonymous block, it needs
+ to be reparented so that the float is positioned as if there was no anonymous block at all.
+
+ * fast/block/float/float-with-anonymous-previous-sibling-expected.html: Added.
+ * fast/block/float/float-with-anonymous-previous-sibling.html: Added.
+
</ins><span class="cx"> 2016-01-06 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Marking webarchive/adopt-attribute-styled-body-webarchive.html as flaky on mac-wk1
</span></span></pre></div>
<a id="trunkLayoutTestsfastblockfloatfloatwithanonymousprevioussiblingexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/float/float-with-anonymous-previous-sibling-expected.html (0 => 194645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/float/float-with-anonymous-previous-sibling-expected.html (rev 0)
+++ trunk/LayoutTests/fast/block/float/float-with-anonymous-previous-sibling-expected.html 2016-01-06 18:34:02 UTC (rev 194645)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that float is positioned properly when it is next to an anonymous block.</title>
+</head>
+<body>
+<span>foo</span>
+<div id="nextSibling"></div>
+<script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ setTimeout(function() {
+ var floatDiv = document.createElement("div");
+ floatDiv.style.float = "right";
+ floatDiv.innerText = "bar";
+ document.body.insertBefore(floatDiv, document.getElementById("nextSibling"));
+ if (window.testRunner)
+ testRunner.notifyDone();
+}, 0);
+</script>
+</body></html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastblockfloatfloatwithanonymousprevioussiblinghtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/block/float/float-with-anonymous-previous-sibling.html (0 => 194645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/block/float/float-with-anonymous-previous-sibling.html (rev 0)
+++ trunk/LayoutTests/fast/block/float/float-with-anonymous-previous-sibling.html 2016-01-06 18:34:02 UTC (rev 194645)
</span><span class="lines">@@ -0,0 +1,20 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that float is positioned properly when it is next to an anonymous block.</title>
+</head>
+<body>
+<span>foo</span>
+<div id="float">bar</div>
+<div></div>
+<script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+ setTimeout(function() {
+ document.getElementById("float").style.float = "right";
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (194644 => 194645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-01-06 18:28:40 UTC (rev 194644)
+++ trunk/Source/WebCore/ChangeLog 2016-01-06 18:34:02 UTC (rev 194645)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2016-01-06 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><ins>+ Float with media query positioned incorrectly after window resize.
+ https://bugs.webkit.org/show_bug.cgi?id=152558
+
+ Reviewed by Simon Fraser and David Hyatt.
+
+ This patch ensures that when a renderer becomes floated, it is moved
+ to the right containing block.
+ When this floated renderer's previous sibling is an anonymous block, it needs
+ to be reparented so that the float is positioned as if there was no anonymous block at all.
+
+ Test: fast/block/float/float-with-anonymous-previous-sibling.html
+
+ * rendering/RenderElement.cpp:
+ (WebCore::RenderElement::styleDidChange):
+
+2016-01-06 Zalan Bujtas <zalan@apple.com>
+
</ins><span class="cx"> isAnonymousInlineBlock() should exclude any ruby content.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=152648
</span><span class="cx"> <rdar://problem/23872549>
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderElement.cpp (194644 => 194645)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderElement.cpp 2016-01-06 18:28:40 UTC (rev 194644)
+++ trunk/Source/WebCore/rendering/RenderElement.cpp 2016-01-06 18:34:02 UTC (rev 194645)
</span><span class="lines">@@ -996,8 +996,13 @@
</span><span class="cx"> if (s_affectsParentBlock)
</span><span class="cx"> handleDynamicFloatPositionChange();
</span><span class="cx">
</span><del>- if (s_noLongerAffectsParentBlock)
</del><ins>+ if (s_noLongerAffectsParentBlock) {
</ins><span class="cx"> removeAnonymousWrappersForInlinesIfNecessary();
</span><ins>+ // Fresh floats need to be reparented if they actually belong to the previous anonymous block.
+ // It copies the logic of RenderBlock::addChildIgnoringContinuation
+ if (style().isFloating() && previousSibling() && previousSibling()->isAnonymousBlock())
+ downcast<RenderBoxModelObject>(*parent()).moveChildTo(&downcast<RenderBoxModelObject>(*previousSibling()), this);
+ }
</ins><span class="cx">
</span><span class="cx"> SVGRenderSupport::styleChanged(*this, oldStyle);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>