<!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>[195220] releases/WebKitGTK/webkit-2.10</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/195220">195220</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-18 05:31:20 -0800 (Mon, 18 Jan 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194710">r194710</a> - Incorrect position: fixed; rendering when child of position:relative/sticky.
https://bugs.webkit.org/show_bug.cgi?id=147284

Reviewed by Simon Fraser and David Hyatt.

Computing logical left for positioned objects should take the relative positioned ancestors' offset
into account.

Source/WebCore:

Tests: fast/block/positioning/fixed-container-with-relative-parent.html
       fast/block/positioning/fixed-container-with-sticky-parent.html

* rendering/RenderBox.cpp:
(WebCore::computeInlineStaticDistance):

LayoutTests:

* fast/block/positioning/fixed-container-with-relative-parent-expected.html: Added.
* fast/block/positioning/fixed-container-with-relative-parent.html: Added.
* fast/block/positioning/fixed-container-with-sticky-parent-expected.html: Added.
* fast/block/positioning/fixed-container-with-sticky-parent.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsChangeLog">releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBoxcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastblockpositioningfixedcontainerwithrelativeparentexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-relative-parent-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastblockpositioningfixedcontainerwithrelativeparenthtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-relative-parent.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastblockpositioningfixedcontainerwithstickyparentexpectedhtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-sticky-parent-expected.html</a></li>
<li><a href="#releasesWebKitGTKwebkit210LayoutTestsfastblockpositioningfixedcontainerwithstickyparenthtml">releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-sticky-parent.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210LayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog (195219 => 195220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2016-01-18 13:27:15 UTC (rev 195219)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/ChangeLog        2016-01-18 13:31:20 UTC (rev 195220)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-01-07  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Incorrect position: fixed; rendering when child of position:relative/sticky.
+        https://bugs.webkit.org/show_bug.cgi?id=147284
+
+        Reviewed by Simon Fraser and David Hyatt.
+
+        Computing logical left for positioned objects should take the relative positioned ancestors' offset
+        into account.
+
+        * fast/block/positioning/fixed-container-with-relative-parent-expected.html: Added.
+        * fast/block/positioning/fixed-container-with-relative-parent.html: Added.
+        * fast/block/positioning/fixed-container-with-sticky-parent-expected.html: Added.
+        * fast/block/positioning/fixed-container-with-sticky-parent.html: Added.
+
</ins><span class="cx"> 2016-01-07  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Directly-composited animated GIFs never resume once scrolled offscreen
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastblockpositioningfixedcontainerwithrelativeparentexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-relative-parent-expected.html (0 => 195220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-relative-parent-expected.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-relative-parent-expected.html        2016-01-18 13:31:20 UTC (rev 195220)
</span><span class="lines">@@ -0,0 +1,25 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;It tests that fixed (auto)positioned element is placed properly when the parent element is relative positioned.&lt;/title&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;position: relative; left: 10px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;position: relative; left: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;position: relative; left: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;position: relative; left: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;position: relative; left: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;position: relative; left: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;position: relative; left: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;position: relative; left: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+
+&lt;div dir=rtl style=&quot;position: absolute; right: 8px; top: 99px;&quot;&gt;
+  &lt;div style=&quot;position: relative; right: 10px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;div style=&quot;position: relative; right: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;div style=&quot;position: relative; right: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;div style=&quot;position: relative; right: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;div style=&quot;position: relative; right: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;div style=&quot;position: relative; right: 10px; margin-top: 1px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastblockpositioningfixedcontainerwithrelativeparenthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-relative-parent.html (0 => 195220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-relative-parent.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-relative-parent.html        2016-01-18 13:31:20 UTC (rev 195220)
</span><span class="lines">@@ -0,0 +1,85 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;It tests that fixed (auto)positioned element is placed properly when the parent element is relative positioned.&lt;/title&gt;
+&lt;script&gt;
+    if (window.testRunner)
+            testRunner.waitUntilDone();
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;position: relative; left: 10px; width: 20px; height: 20px; border: 1px solid green;&quot;&gt;
+  &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
+
+&lt;div style=&quot;-webkit-writing-mode: vertical-lr; margin-top: 1px; position: relative; left: 10px; width: 20px; height: 20px; border: 1px solid green;&quot;&gt;
+  &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
+
+&lt;div style=&quot;position: relative; left: 10px; width: 20px; height: 20px; margin-top: 1px; border: 1px solid green;&quot;&gt;
+  &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
+
+&lt;div style=&quot;-webkit-writing-mode: vertical-lr; position: relative; left: 10px; width: 20px; height: 20px; margin-top: 1px; border: 1px solid green;&quot;&gt;
+  &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
+
+&lt;div style=&quot;position: absolute; left: 13px; margin-top: 1px;&quot;&gt;
+  &lt;div style=&quot;position: relative; left: 5px; width: 20px; height: 20px; border: 1px solid green;&quot;&gt;
+    &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;/div&gt;
+&lt;/div&gt;
+
+&lt;div style=&quot;position: absolute; margin-top: 24px; left: 8px;&quot;&gt;
+  &lt;span style=&quot;position: relative; left: 10px;&quot;&gt;
+    &lt;div class=fixed style=&quot;width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;/span&gt;
+  &lt;span style=&quot;position: relative; left: 10px; margin: 1px;&quot;&gt;
+    &lt;div class=fixed style=&quot;width: 22px; height: 22px; background-color: green; margin-top: 5px;&quot;&gt;&lt;/div&gt;
+  &lt;/span&gt;
+  &lt;div style=&quot;position: absolute; left: 5px;&quot;&gt;
+    &lt;span style=&quot;position: relative; left: 5px;&quot;&gt;
+      &lt;div class=fixed style=&quot;width: 22px; height: 22px; margin-top: 10px; background-color: green;&quot;&gt;&lt;/div&gt;
+    &lt;/span&gt;
+  &lt;/div&gt;
+&lt;/div&gt;
+
+&lt;div dir=rtl&gt;
+  &lt;div style=&quot;position: relative; top: 0px; right: 10px; width: 20px; height: 20px; border: 1px solid green;&quot;&gt;
+    &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;/div&gt;
+
+  &lt;div style=&quot;position: relative; right: 10px; width: 20px; height: 20px; margin-top: 1px; border: 1px solid green;&quot;&gt;
+    &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;/div&gt;
+
+  &lt;div style=&quot;position: absolute; margin-top: 1px;&quot;&gt;
+    &lt;div style=&quot;position: relative; right: 10px; width: 20px; height: 20px; border: 1px solid green;&quot;&gt;
+      &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+    &lt;/div&gt;
+  &lt;/div&gt;
+  &lt;span style=&quot;position: relative; right: 10px; top: 24px;&quot;&gt;
+      &lt;div class=fixed style=&quot;width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;/span&gt;
+
+  &lt;span style=&quot;position: relative; right: 10px; top: 47px&quot;&gt;
+      &lt;div class=fixed style=&quot;width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+  &lt;/span&gt;
+
+  &lt;div style=&quot;position: absolute; right: 13px;&quot;&gt;
+    &lt;span style=&quot;position: relative; right: 5px; top: 70px;&quot;&gt;
+      &lt;div class=fixed style=&quot;width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+    &lt;/span&gt;
+  &lt;/div&gt;
+&lt;/div&gt;
+&lt;script&gt;
+setTimeout(function() {
+    var elements = document.getElementsByClassName(&quot;fixed&quot;);
+    for (var i = 0; i &lt; elements.length; ++i)
+        elements[i].style.position = &quot;fixed&quot;;
+    if (window.testRunner)
+        testRunner.notifyDone();
+}, 0);
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastblockpositioningfixedcontainerwithstickyparentexpectedhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-sticky-parent-expected.html (0 => 195220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-sticky-parent-expected.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-sticky-parent-expected.html        2016-01-18 13:31:20 UTC (rev 195220)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;It tests that fixed (auto)positioned element is placed properly when the parent element is sticky positioned.&lt;/title&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;position: relative; left: 42px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;div style=&quot;position: relative; left: 42px; margin-top: 5px; width: 22px; height: 22px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210LayoutTestsfastblockpositioningfixedcontainerwithstickyparenthtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-sticky-parent.html (0 => 195220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-sticky-parent.html                                (rev 0)
+++ releases/WebKitGTK/webkit-2.10/LayoutTests/fast/block/positioning/fixed-container-with-sticky-parent.html        2016-01-18 13:31:20 UTC (rev 195220)
</span><span class="lines">@@ -0,0 +1,28 @@
</span><ins>+&lt;!DOCTYPE html&gt;
+&lt;html&gt;
+&lt;head&gt;
+&lt;title&gt;It tests that fixed (auto)positioned element is placed properly when the parent element is sticky positioned.&lt;/title&gt;
+&lt;script&gt;
+    if (window.testRunner)
+            testRunner.waitUntilDone();
+&lt;/script&gt;
+&lt;/head&gt;
+&lt;body&gt;
+&lt;div style=&quot;position: -webkit-sticky; left: 50px; width: 20px; height: 20px; border: 1px solid green;&quot;&gt;
+  &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
+&lt;div style=&quot;position: -webkit-sticky; left: 50px; width: 20px; height: 20px; margin: 5px; border: 1px solid green;&quot;&gt;
+  &lt;div class=fixed style=&quot;width: 20px; height: 20px; background-color: green;&quot;&gt;&lt;/div&gt;
+&lt;/div&gt;
+
+&lt;script&gt;
+setTimeout(function() {
+    var elements = document.getElementsByClassName(&quot;fixed&quot;);
+    for (var i = 0; i &lt; elements.length; ++i)
+        elements[i].style.position = &quot;fixed&quot;;
+    if (window.testRunner)
+        testRunner.notifyDone();
+}, 0);
+&lt;/script&gt;
+&lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (195219 => 195220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-01-18 13:27:15 UTC (rev 195219)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-01-18 13:31:20 UTC (rev 195220)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-07  Zalan Bujtas  &lt;zalan@apple.com&gt;
+
+        Incorrect position: fixed; rendering when child of position:relative/sticky.
+        https://bugs.webkit.org/show_bug.cgi?id=147284
+
+        Reviewed by Simon Fraser and David Hyatt.
+
+        Computing logical left for positioned objects should take the relative positioned ancestors' offset
+        into account.
+
+        Tests: fast/block/positioning/fixed-container-with-relative-parent.html
+               fast/block/positioning/fixed-container-with-sticky-parent.html
+
+        * rendering/RenderBox.cpp:
+        (WebCore::computeInlineStaticDistance):
+
</ins><span class="cx"> 2016-01-07  Chris Dumez  &lt;cdumez@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Directly-composited animated GIFs never resume once scrolled offscreen
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp (195219 => 195220)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp        2016-01-18 13:27:15 UTC (rev 195219)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/rendering/RenderBox.cpp        2016-01-18 13:31:20 UTC (rev 195220)
</span><span class="lines">@@ -3292,25 +3292,32 @@
</span><span class="cx">     if (child-&gt;parent()-&gt;style().direction() == LTR) {
</span><span class="cx">         LayoutUnit staticPosition = child-&gt;layer()-&gt;staticInlinePosition() - containerBlock-&gt;borderLogicalLeft();
</span><span class="cx">         for (auto* current = child-&gt;parent(); current &amp;&amp; current != containerBlock; current = current-&gt;container()) {
</span><del>-            if (is&lt;RenderBox&gt;(*current)) {
-                staticPosition += downcast&lt;RenderBox&gt;(*current).logicalLeft();
-                if (region &amp;&amp; is&lt;RenderBlock&gt;(*current)) {
-                    const RenderBlock&amp; currentBlock = downcast&lt;RenderBlock&gt;(*current);
-                    region = currentBlock.clampToStartAndEndRegions(region);
-                    RenderBoxRegionInfo* boxInfo = currentBlock.renderBoxRegionInfo(region);
-                    if (boxInfo)
-                        staticPosition += boxInfo-&gt;logicalLeft();
-                }
</del><ins>+            if (!is&lt;RenderBox&gt;(*current))
+                continue;
+            const auto&amp; renderBox = downcast&lt;RenderBox&gt;(*current);
+            staticPosition += renderBox.logicalLeft();
+            if (renderBox.isInFlowPositioned())
+                staticPosition += renderBox.isHorizontalWritingMode() ? renderBox.offsetForInFlowPosition().width() : renderBox.offsetForInFlowPosition().height();
+            if (region &amp;&amp; is&lt;RenderBlock&gt;(*current)) {
+                const RenderBlock&amp; currentBlock = downcast&lt;RenderBlock&gt;(*current);
+                region = currentBlock.clampToStartAndEndRegions(region);
+                RenderBoxRegionInfo* boxInfo = currentBlock.renderBoxRegionInfo(region);
+                if (boxInfo)
+                    staticPosition += boxInfo-&gt;logicalLeft();
</ins><span class="cx">             }
</span><span class="cx">         }
</span><span class="cx">         logicalLeft.setValue(Fixed, staticPosition);
</span><span class="cx">     } else {
</span><del>-        RenderBox&amp; enclosingBox = child-&gt;parent()-&gt;enclosingBox();
</del><ins>+        const RenderBox&amp; enclosingBox = child-&gt;parent()-&gt;enclosingBox();
</ins><span class="cx">         LayoutUnit staticPosition = child-&gt;layer()-&gt;staticInlinePosition() + containerLogicalWidth + containerBlock-&gt;borderLogicalLeft();
</span><del>-        for (RenderElement* current = &amp;enclosingBox; current; current = current-&gt;container()) {
</del><ins>+        for (const RenderElement* current = &amp;enclosingBox; current; current = current-&gt;container()) {
</ins><span class="cx">             if (is&lt;RenderBox&gt;(*current)) {
</span><del>-                if (current != containerBlock)
-                    staticPosition -= downcast&lt;RenderBox&gt;(*current).logicalLeft();
</del><ins>+                if (current != containerBlock) {
+                    const auto&amp; renderBox = downcast&lt;RenderBox&gt;(*current);
+                    staticPosition -= renderBox.logicalLeft();
+                    if (renderBox.isInFlowPositioned())
+                        staticPosition -= renderBox.isHorizontalWritingMode() ? renderBox.offsetForInFlowPosition().width() : renderBox.offsetForInFlowPosition().height();
+                }
</ins><span class="cx">                 if (current == &amp;enclosingBox)
</span><span class="cx">                     staticPosition -= enclosingBox.logicalWidth();
</span><span class="cx">                 if (region &amp;&amp; is&lt;RenderBlock&gt;(*current)) {
</span><span class="lines">@@ -3666,8 +3673,13 @@
</span><span class="cx">     // FIXME: The static distance computation has not been patched for mixed writing modes.
</span><span class="cx">     LayoutUnit staticLogicalTop = child-&gt;layer()-&gt;staticBlockPosition() - containerBlock-&gt;borderBefore();
</span><span class="cx">     for (RenderElement* container = child-&gt;parent(); container &amp;&amp; container != containerBlock; container = container-&gt;container()) {
</span><del>-        if (is&lt;RenderBox&gt;(*container) &amp;&amp; !is&lt;RenderTableRow&gt;(*container))
-            staticLogicalTop += downcast&lt;RenderBox&gt;(*container).logicalTop();
</del><ins>+        if (!is&lt;RenderBox&gt;(*container))
+            continue;
+        const auto&amp; renderBox = downcast&lt;RenderBox&gt;(*container);
+        if (!is&lt;RenderTableRow&gt;(renderBox))
+            staticLogicalTop += renderBox.logicalTop();
+        if (renderBox.isInFlowPositioned())
+            staticLogicalTop += renderBox.isHorizontalWritingMode() ? renderBox.offsetForInFlowPosition().height() : renderBox.offsetForInFlowPosition().width();
</ins><span class="cx">     }
</span><span class="cx">     logicalTop.setValue(Fixed, staticLogicalTop);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>

</body>
</html>