<!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>[201271] releases/WebKitGTK/webkit-2.12</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/201271">201271</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-05-23 04:10:42 -0700 (Mon, 23 May 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/200736">r200736</a> - Absolute positioned element is not placed properly when parent becomes the containing block.
https://bugs.webkit.org/show_bug.cgi?id=157455
<rdar://problem/26212568>
Reviewed by Simon Fraser.
When a container becomes a containing block, we need to check if there are any positioned boxes in its subtree
in order to "re-parent" them. It basically means that we remove them from RenderBlock::positionedDescendants map
and they'll get re-inserted during the next layout correctly.
This patch fixes the case when a container becomes the containing block by setting the transform property and its positioned
child gets misplaced.
Source/WebCore:
Test: fast/block/containing-block-changes.html
* rendering/RenderBlock.cpp:
(WebCore::RenderBlock::removePositionedObjectsIfNeeded):
(WebCore::RenderBlock::styleWillChange):
* rendering/RenderBlock.h:
LayoutTests:
* fast/block/containing-block-changes-expected.html: Added.
* fast/block/containing-block-changes.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingRenderBlockcpp">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlock.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceWebCorerenderingRenderBlockh">releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlock.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastblockcontainingblockchangesexpectedhtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/containing-block-changes-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit212LayoutTestsfastblockcontainingblockchangeshtml">releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/containing-block-changes.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog (201270 => 201271)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-23 11:03:44 UTC (rev 201270)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog 2016-05-23 11:10:42 UTC (rev 201271)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-05-11 Zalan Bujtas <zalan@apple.com>
+
+ Absolute positioned element is not placed properly when parent becomes the containing block.
+ https://bugs.webkit.org/show_bug.cgi?id=157455
+ <rdar://problem/26212568>
+
+ Reviewed by Simon Fraser.
+
+ When a container becomes a containing block, we need to check if there are any positioned boxes in its subtree
+ in order to "re-parent" them. It basically means that we remove them from RenderBlock::positionedDescendants map
+ and they'll get re-inserted during the next layout correctly.
+ This patch fixes the case when a container becomes the containing block by setting the transform property and its positioned
+ child gets misplaced.
+
+ * fast/block/containing-block-changes-expected.html: Added.
+ * fast/block/containing-block-changes.html: Added.
+
</ins><span class="cx"> 2016-05-11 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] accessibility/aria-readonly.html is failing
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastblockcontainingblockchangesexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/containing-block-changes-expected.html (0 => 201271)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/containing-block-changes-expected.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/containing-block-changes-expected.html 2016-05-23 11:10:42 UTC (rev 201271)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we properly reparent containing block descendants.</title>
+<style>
+.container {
+ position: relative;
+ height: 20px;
+ width: 20px;
+ border: 10px solid gray;
+}
+
+.indented {
+ left: 10px;
+}
+
+.box {
+ left: 0px;
+ top: 0px;
+ height: 10px;
+ width: 10px;
+ background-color: blue;
+}
+</style>
+</head>
+<body>
+<div class=box style="position: absolute"></div>
+<div class="container indented"><div class=box></div></div>
+<div class=container><div class=box></div></div>
+<div class="container indented"><div class=box></div></div>
+<div class="container indented"><div class=box></div></div>
+<div class="container indented"><div class=box></div></div>
+<div class=container><div class=box></div></div>
+<div class=container></div>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212LayoutTestsfastblockcontainingblockchangeshtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/containing-block-changes.html (0 => 201271)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/containing-block-changes.html (rev 0)
+++ releases/WebKitGTK/webkit-2.12/LayoutTests/fast/block/containing-block-changes.html 2016-05-23 11:10:42 UTC (rev 201271)
</span><span class="lines">@@ -0,0 +1,74 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<title>This tests that we properly reparent containing block descendants.</title>
+<style>
+ .translate {
+ transform: translateX(10px);
+ }
+
+ .positioned {
+ position: relative;
+ }
+
+ .container {
+ height: 20px;
+ width: 20px;
+ border: 10px solid gray;
+ }
+
+ .box {
+ position: absolute;
+ left: 0px;
+ top: 0px;
+ height: 10px;
+ width: 10px;
+ background-color: blue;
+ }
+</style>
+</head>
+<body>
+<div class="container"><div class="box"></div></div>
+<div class="container"><div class="box"></div></div>
+<div class="container"><div class="box"></div></div>
+<div class="container"><div class="box"></div></div>
+<div class="container"><div class="box"></div></div>
+<div class="container"><div class="box"></div></div>
+<div class="container"><div class="box"></div></div>
+<script>
+if (window.testRunner)
+ testRunner.waitUntilDone();
+
+setTimeout(function() {
+ document.getElementsByClassName("container")[0].classList.toggle("translate");
+ document.getElementsByClassName("container")[1].classList.toggle("positioned");
+ document.getElementsByClassName("container")[2].classList.toggle("translate");
+ document.getElementsByClassName("container")[3].classList.toggle("positioned");
+ document.getElementsByClassName("container")[4].classList.toggle("positioned");
+ document.getElementsByClassName("container")[5].classList.toggle("translate");
+ document.getElementsByClassName("container")[6].classList.toggle("translate");
+ document.body.offsetHeight;
+ setTimeout(function() {
+ document.getElementsByClassName("container")[2].classList.toggle("positioned");
+ document.getElementsByClassName("container")[3].classList.toggle("translate");
+ document.getElementsByClassName("container")[4].classList.toggle("translate");
+ document.getElementsByClassName("container")[5].classList.toggle("positioned");
+ document.getElementsByClassName("container")[6].classList.toggle("positioned");
+ document.body.offsetHeight;
+ setTimeout(function() {
+ document.getElementsByClassName("container")[4].classList.toggle("positioned");
+ document.getElementsByClassName("container")[5].classList.toggle("translate");
+ document.getElementsByClassName("container")[6].classList.toggle("translate");
+ document.body.offsetHeight;
+ setTimeout(function() {
+ document.getElementsByClassName("container")[6].classList.toggle("positioned");
+ document.body.offsetHeight;
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0);
+ }, 0);
+ }, 0);
+}, 0);
+</script>
+</body>
+</html>
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog (201270 => 201271)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 11:03:44 UTC (rev 201270)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/ChangeLog 2016-05-23 11:10:42 UTC (rev 201271)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-05-11 Zalan Bujtas <zalan@apple.com>
+
+ Absolute positioned element is not placed properly when parent becomes the containing block.
+ https://bugs.webkit.org/show_bug.cgi?id=157455
+ <rdar://problem/26212568>
+
+ Reviewed by Simon Fraser.
+
+ When a container becomes a containing block, we need to check if there are any positioned boxes in its subtree
+ in order to "re-parent" them. It basically means that we remove them from RenderBlock::positionedDescendants map
+ and they'll get re-inserted during the next layout correctly.
+ This patch fixes the case when a container becomes the containing block by setting the transform property and its positioned
+ child gets misplaced.
+
+ Test: fast/block/containing-block-changes.html
+
+ * rendering/RenderBlock.cpp:
+ (WebCore::RenderBlock::removePositionedObjectsIfNeeded):
+ (WebCore::RenderBlock::styleWillChange):
+ * rendering/RenderBlock.h:
+
</ins><span class="cx"> 2016-05-11 Joanmarie Diggs <jdiggs@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] accessibility/aria-readonly.html is failing
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingRenderBlockcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlock.cpp (201270 => 201271)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlock.cpp 2016-05-23 11:03:44 UTC (rev 201270)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlock.cpp 2016-05-23 11:10:42 UTC (rev 201271)
</span><span class="lines">@@ -237,38 +237,45 @@
</span><span class="cx"> return gRareDataMap ? gRareDataMap->contains(this) : false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
</del><ins>+void RenderBlock::removePositionedObjectsIfNeeded(const RenderStyle& oldStyle, const RenderStyle& newStyle)
</ins><span class="cx"> {
</span><del>- const RenderStyle* oldStyle = hasInitializedStyle() ? &style() : nullptr;
</del><ins>+ bool hadTransform = oldStyle.hasTransformRelatedProperty();
+ bool willHaveTransform = newStyle.hasTransformRelatedProperty();
+ if (oldStyle.position() == newStyle.position() && hadTransform == willHaveTransform)
+ return;
</ins><span class="cx">
</span><del>- setReplaced(newStyle.isDisplayInlineType());
-
- if (oldStyle && oldStyle->hasTransformRelatedProperty() && !newStyle.hasTransformRelatedProperty())
</del><ins>+ // We are no longer a containing block.
+ if (newStyle.position() == StaticPosition && !willHaveTransform) {
+ // Clear our positioned objects list. Our absolutely positioned descendants will be
+ // inserted into our containing block's positioned objects list during layout.
</ins><span class="cx"> removePositionedObjects(nullptr, NewContainingBlock);
</span><del>-
- if (oldStyle && parent() && diff == StyleDifferenceLayout && oldStyle->position() != newStyle.position()) {
- if (newStyle.position() == StaticPosition)
- // Clear our positioned objects list. Our absolutely positioned descendants will be
- // inserted into our containing block's positioned objects list during layout.
- removePositionedObjects(nullptr, NewContainingBlock);
- else if (oldStyle->position() == StaticPosition) {
- // Remove our absolutely positioned descendants from their current containing block.
- // They will be inserted into our positioned objects list during layout.
- auto containingBlock = parent();
- while (containingBlock && !is<RenderView>(*containingBlock)
- && (containingBlock->style().position() == StaticPosition || (containingBlock->isInline() && !containingBlock->isReplaced()))) {
- if (containingBlock->style().position() == RelativePosition && containingBlock->isInline() && !containingBlock->isReplaced()) {
- containingBlock = containingBlock->containingBlock();
- break;
- }
- containingBlock = containingBlock->parent();
</del><ins>+ return;
+ }
+
+ // We are a new containing block.
+ if (oldStyle.position() == StaticPosition && !hadTransform) {
+ // Remove our absolutely positioned descendants from their current containing block.
+ // They will be inserted into our positioned objects list during layout.
+ auto* containingBlock = parent();
+ while (containingBlock && !is<RenderView>(*containingBlock)
+ && (containingBlock->style().position() == StaticPosition || (containingBlock->isInline() && !containingBlock->isReplaced()))) {
+ if (containingBlock->style().position() == RelativePosition && containingBlock->isInline() && !containingBlock->isReplaced()) {
+ containingBlock = containingBlock->containingBlock();
+ break;
</ins><span class="cx"> }
</span><del>-
- if (is<RenderBlock>(*containingBlock))
- downcast<RenderBlock>(*containingBlock).removePositionedObjects(this, NewContainingBlock);
</del><ins>+ containingBlock = containingBlock->parent();
</ins><span class="cx"> }
</span><ins>+ if (containingBlock && is<RenderBlock>(*containingBlock))
+ downcast<RenderBlock>(*containingBlock).removePositionedObjects(this, NewContainingBlock);
</ins><span class="cx"> }
</span><ins>+}
</ins><span class="cx">
</span><ins>+void RenderBlock::styleWillChange(StyleDifference diff, const RenderStyle& newStyle)
+{
+ const RenderStyle* oldStyle = hasInitializedStyle() ? &style() : nullptr;
+ setReplaced(newStyle.isDisplayInlineType());
+ if (oldStyle)
+ removePositionedObjectsIfNeeded(*oldStyle, newStyle);
</ins><span class="cx"> RenderBox::styleWillChange(diff, newStyle);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceWebCorerenderingRenderBlockh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlock.h (201270 => 201271)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlock.h 2016-05-23 11:03:44 UTC (rev 201270)
+++ releases/WebKitGTK/webkit-2.12/Source/WebCore/rendering/RenderBlock.h 2016-05-23 11:10:42 UTC (rev 201271)
</span><span class="lines">@@ -489,6 +489,8 @@
</span><span class="cx">
</span><span class="cx"> RenderFlowThread* updateCachedFlowThreadContainingBlock(RenderFlowThread*) const;
</span><span class="cx">
</span><ins>+ void removePositionedObjectsIfNeeded(const RenderStyle& oldStyle, const RenderStyle& newStyle);
+
</ins><span class="cx"> private:
</span><span class="cx"> bool hasRareData() const;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>