<!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>[166495] 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/166495">166495</a></dd>
<dt>Author</dt> <dd>abucur@adobe.com</dd>
<dt>Date</dt> <dd>2014-03-31 04:22:42 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Wrong layout while animating content in regions
https://bugs.webkit.org/show_bug.cgi?id=125086
Reviewed by David Hyatt.
Source/WebCore:
The region to layer and regions to layer mappings should be cleared when the region chain changes.
Test: fast/regions/layers/region-removed-during-animation.html
* rendering/RenderFlowThread.cpp:
(WebCore::RenderFlowThread::invalidateRegions): Clear the two maps and flag them for recomputation.
(WebCore::RenderFlowThread::cachedRegionForCompositedLayer): Assert that the returned region exists.
LayoutTests:
Add a test verifying the layout and painting of animated content inside regions
is correct.
* fast/regions/layers/region-removed-during-animation-expected.html: Added.
* fast/regions/layers/region-removed-during-animation.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="#trunkSourceWebCorerenderingRenderFlowThreadcpp">trunk/Source/WebCore/rendering/RenderFlowThread.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastregionslayersregionremovedduringanimationexpectedhtml">trunk/LayoutTests/fast/regions/layers/region-removed-during-animation-expected.html</a></li>
<li><a href="#trunkLayoutTestsfastregionslayersregionremovedduringanimationhtml">trunk/LayoutTests/fast/regions/layers/region-removed-during-animation.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (166494 => 166495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-31 11:04:37 UTC (rev 166494)
+++ trunk/LayoutTests/ChangeLog 2014-03-31 11:22:42 UTC (rev 166495)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2014-03-31 Andrei Bucur <abucur@adobe.com>
+
+ Wrong layout while animating content in regions
+ https://bugs.webkit.org/show_bug.cgi?id=125086
+
+ Reviewed by David Hyatt.
+
+ Add a test verifying the layout and painting of animated content inside regions
+ is correct.
+
+ * fast/regions/layers/region-removed-during-animation-expected.html: Added.
+ * fast/regions/layers/region-removed-during-animation.html: Added.
+
</ins><span class="cx"> 2014-03-30 Gyuyoung Kim <gyuyoung.kim@samsung.com>
</span><span class="cx">
</span><span class="cx"> Move test cases of navigator content utils in own directory
</span></span></pre></div>
<a id="trunkLayoutTestsfastregionslayersregionremovedduringanimationexpectedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/layers/region-removed-during-animation-expected.html (0 => 166495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/layers/region-removed-during-animation-expected.html (rev 0)
+++ trunk/LayoutTests/fast/regions/layers/region-removed-during-animation-expected.html 2014-03-31 11:22:42 UTC (rev 166495)
</span><span class="lines">@@ -0,0 +1,19 @@
</span><ins>+<html>
+<head>
+ <style>
+ .content {
+ width: 100px;
+ height: 100px;
+ background-color: green;
+
+ position: relative;
+ left: 300px;
+ }
+ </style>
+</head>
+<body>
+ <p>Test for the bug <a href="https://bugs.webkit.org/show_bug.cgi?id=125086">125086</a>.</p>
+ <p>You should see a green square scaling down and back. During the animation, it should shift to the left.</p>
+ <div class="content"></div>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsfastregionslayersregionremovedduringanimationhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/regions/layers/region-removed-during-animation.html (0 => 166495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/regions/layers/region-removed-during-animation.html (rev 0)
+++ trunk/LayoutTests/fast/regions/layers/region-removed-during-animation.html 2014-03-31 11:22:42 UTC (rev 166495)
</span><span class="lines">@@ -0,0 +1,60 @@
</span><ins>+<html>
+<head>
+ <style>
+ .region {
+ -webkit-flow-from: flow;
+ width: 100px;
+ }
+ .content {
+ -webkit-flow-into: flow;
+ width: 100px;
+ height: 100px;
+ background-color: green;
+
+ -webkit-animation-name: spin;
+ -webkit-animation-duration: 0.1s;
+ -webkit-animation-timing-function: linear;
+ }
+ @-webkit-keyframes spin {
+ from { -webkit-transform: rotateX(0deg); }
+ to { -webkit-transform: rotateX(180deg); }
+ }
+ </style>
+</head>
+<body>
+ <p>Test for the bug <a href="https://bugs.webkit.org/show_bug.cgi?id=125086">125086</a>.</p>
+ <p>You should see a green square scaling down and back. During the animation, it should shift to the left.</p>
+ <div id="region" class="region"></div>
+ <div id="content" class="content"></div>
+ <script type="text/javascript">
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ var r = document.getElementById("region");
+ function remover() {
+ document.body.removeChild(r);
+ setTimeout(adder, 20);
+ }
+
+ function adder() {
+ r.style.position = "relative";
+ r.style.left = "300px";
+ document.body.appendChild(r);
+ }
+
+ function animation_end() {
+ setTimeout(done, 50);
+ }
+
+ function done() {
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+
+ var content = document.getElementById("content");
+ content.addEventListener("webkitAnimationEnd", animation_end, false);
+
+ setTimeout(remover, 20);
+ </script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (166494 => 166495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-31 11:04:37 UTC (rev 166494)
+++ trunk/Source/WebCore/ChangeLog 2014-03-31 11:22:42 UTC (rev 166495)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-31 Andrei Bucur <abucur@adobe.com>
+
+ Wrong layout while animating content in regions
+ https://bugs.webkit.org/show_bug.cgi?id=125086
+
+ Reviewed by David Hyatt.
+
+ The region to layer and regions to layer mappings should be cleared when the region chain changes.
+
+ Test: fast/regions/layers/region-removed-during-animation.html
+
+ * rendering/RenderFlowThread.cpp:
+ (WebCore::RenderFlowThread::invalidateRegions): Clear the two maps and flag them for recomputation.
+ (WebCore::RenderFlowThread::cachedRegionForCompositedLayer): Assert that the returned region exists.
+
</ins><span class="cx"> 2014-03-31 Dániel Bátyai <dbatyai.u-szeged@partner.samsung.com>
</span><span class="cx">
</span><span class="cx"> Remove hostThisRegister() and hostThisValue()
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderFlowThreadcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderFlowThread.cpp (166494 => 166495)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-03-31 11:04:37 UTC (rev 166494)
+++ trunk/Source/WebCore/rendering/RenderFlowThread.cpp 2014-03-31 11:22:42 UTC (rev 166495)
</span><span class="lines">@@ -120,6 +120,11 @@
</span><span class="cx"> m_regionRangeMap.clear();
</span><span class="cx"> m_breakBeforeToRegionMap.clear();
</span><span class="cx"> m_breakAfterToRegionMap.clear();
</span><ins>+ if (m_layerToRegionMap)
+ m_layerToRegionMap->clear();
+ if (m_regionToLayerListMap)
+ m_regionToLayerListMap->clear();
+ m_layersToRegionMappingsDirty = true;
</ins><span class="cx"> setNeedsLayout();
</span><span class="cx">
</span><span class="cx"> m_regionsInvalidated = true;
</span><span class="lines">@@ -273,7 +278,9 @@
</span><span class="cx"> RenderNamedFlowFragment* RenderFlowThread::cachedRegionForCompositedLayer(RenderLayer& childLayer) const
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_layerToRegionMap);
</span><del>- return m_layerToRegionMap->get(&childLayer);
</del><ins>+ RenderNamedFlowFragment* namedFlowFragment = m_layerToRegionMap->get(&childLayer);
+ ASSERT(!namedFlowFragment || m_regionList.contains(namedFlowFragment));
+ return namedFlowFragment;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RenderFlowThread::updateLayerToRegionMappings(RenderLayer& layer, LayerToRegionMap& layerToRegionMap, RegionToLayerListMap& regionToLayerListMap, bool& needsLayerUpdate)
</span></span></pre>
</div>
</div>
</body>
</html>