<!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>[172572] branches/safari-600.1-branch</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/172572">172572</a></dd>
<dt>Author</dt> <dd>lforschler@apple.com</dd>
<dt>Date</dt> <dd>2014-08-13 21:18:44 -0700 (Wed, 13 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merged <a href="http://trac.webkit.org/projects/webkit/changeset/172534">r172534</a>. <rdar://problem/17942035></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestsChangeLog">branches/safari-600.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCoreChangeLog">branches/safari-600.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6001branchSourceWebCorerenderingRenderLayercpp">branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayer.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6001branchLayoutTestscompositingfixedimageloadingexpectedtxt">branches/safari-600.1-branch/LayoutTests/compositing/fixed-image-loading-expected.txt</a></li>
<li><a href="#branchessafari6001branchLayoutTestscompositingfixedimageloadinghtml">branches/safari-600.1-branch/LayoutTests/compositing/fixed-image-loading.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6001branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (172571 => 172572)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/ChangeLog        2014-08-14 04:16:49 UTC (rev 172571)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog        2014-08-14 04:18:44 UTC (rev 172572)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-08-13 Lucas Forschler <lforschler@apple.com>
+
+ Merge r172534
+
+ 2014-08-13 Simon Fraser <simon.fraser@apple.com>
+
+ [WK1] A fixed-position <img> may not show on page load
+ https://bugs.webkit.org/show_bug.cgi?id=135893
+
+ Reviewed by Tim Horton.
+
+ Test with a position:fixed image. Note that the test has to force layout
+ early on to test the bug.
+
+ * compositing/fixed-image-loading-expected.txt: Added.
+ * compositing/fixed-image-loading.html: Added.
+
</ins><span class="cx"> 2014-08-12 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r172425
</span></span></pre></div>
<a id="branchessafari6001branchLayoutTestscompositingfixedimageloadingexpectedtxtfromrev172534trunkLayoutTestscompositingfixedimageloadingexpectedtxt"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/compositing/fixed-image-loading-expected.txt (from rev 172534, trunk/LayoutTests/compositing/fixed-image-loading-expected.txt) (0 => 172572)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/compositing/fixed-image-loading-expected.txt         (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/compositing/fixed-image-loading-expected.txt        2014-08-14 04:18:44 UTC (rev 172572)
</span><span class="lines">@@ -0,0 +1,18 @@
</span><ins>+
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 800.00 600.00)
+ (children 1
+ (GraphicsLayer
+ (bounds 800.00 600.00)
+ (contentsOpaque 1)
+ (children 1
+ (GraphicsLayer
+ (position 8.00 13.00)
+ (bounds 214.00 232.00)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari6001branchLayoutTestscompositingfixedimageloadinghtmlfromrev172534trunkLayoutTestscompositingfixedimageloadinghtml"></a>
<div class="copfile"><h4>Copied: branches/safari-600.1-branch/LayoutTests/compositing/fixed-image-loading.html (from rev 172534, trunk/LayoutTests/compositing/fixed-image-loading.html) (0 => 172572)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/LayoutTests/compositing/fixed-image-loading.html         (rev 0)
+++ branches/safari-600.1-branch/LayoutTests/compositing/fixed-image-loading.html        2014-08-14 04:18:44 UTC (rev 172572)
</span><span class="lines">@@ -0,0 +1,27 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script>
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ function imageLoaded()
+ {
+ if (window.internals)
+ document.getElementById('layers').innerText = window.internals.layerTreeAsText(document);
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ </script>
+</head>
+<body>
+<img id="image" src="resources/apple.jpg" onload="imageLoaded()" style="position: fixed;"></img>
+<pre id="layers"></pre>
+<script>
+document.body.offsetWidth; // Force layout before the image loads.
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6001branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/ChangeLog (172571 => 172572)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/ChangeLog        2014-08-14 04:16:49 UTC (rev 172571)
+++ branches/safari-600.1-branch/Source/WebCore/ChangeLog        2014-08-14 04:18:44 UTC (rev 172572)
</span><span class="lines">@@ -1,5 +1,31 @@
</span><span class="cx"> 2014-08-13 Lucas Forschler <lforschler@apple.com>
</span><span class="cx">
</span><ins>+ Merge r172534
+
+ 2014-08-13 Simon Fraser <simon.fraser@apple.com>
+
+ [WK1] A fixed-position <img> may not show on page load
+ https://bugs.webkit.org/show_bug.cgi?id=135893
+
+ Reviewed by Tim Horton.
+
+ A position:fixed image could fail to display because we didn't make a
+ compositing layer for it under some circumstances. This can happen if
+ RenderLayerCompositor::requiresCompositingForPosition() runs before the
+ image is loaded, in which cause the layer is zero-sized, so does not get
+ composited.
+
+ When the image loads, there was no code path that ensured that compositing
+ would be re-evaluated (unlike size changes due to style updates). Fix by
+ having RenderLayer::contentChanged() also check for ImageChanged.
+
+ Test: compositing/fixed-image-loading.html
+
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::contentChanged):
+
+2014-08-13 Lucas Forschler <lforschler@apple.com>
+
</ins><span class="cx"> Merge r172507
</span><span class="cx">
</span><span class="cx"> 2014-08-12 Jer Noble <jer.noble@apple.com>
</span></span></pre></div>
<a id="branchessafari6001branchSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayer.cpp (172571 => 172572)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayer.cpp        2014-08-14 04:16:49 UTC (rev 172571)
+++ branches/safari-600.1-branch/Source/WebCore/rendering/RenderLayer.cpp        2014-08-14 04:18:44 UTC (rev 172572)
</span><span class="lines">@@ -298,8 +298,7 @@
</span><span class="cx">
</span><span class="cx"> void RenderLayer::contentChanged(ContentChangeType changeType)
</span><span class="cx"> {
</span><del>- // This can get called when video becomes accelerated, so the layers may change.
- if ((changeType == CanvasChanged || changeType == VideoChanged || changeType == FullScreenChanged) && compositor().updateLayerCompositingState(*this))
</del><ins>+ if ((changeType == CanvasChanged || changeType == VideoChanged || changeType == FullScreenChanged || changeType == ImageChanged) && compositor().updateLayerCompositingState(*this))
</ins><span class="cx"> compositor().setCompositingLayersNeedRebuild();
</span><span class="cx">
</span><span class="cx"> if (m_backing)
</span></span></pre>
</div>
</div>
</body>
</html>