<!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>[186944] branches/safari-601.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/186944">186944</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2015-07-16 22:33:22 -0700 (Thu, 16 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/186911">r186911</a>. rdar://problem/21822541</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestsChangeLog">branches/safari-601.1-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCoreChangeLog">branches/safari-601.1-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6011branchSourceWebCorerenderingRenderLayerCompositorcpp">branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestscompositingfixedwithfixedlayoutexpectedtxt">branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt</a></li>
<li><a href="#branchessafari6011branchLayoutTestscompositingfixedwithfixedlayouthtml">branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6011branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (186943 => 186944)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:33:18 UTC (rev 186943)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-07-17 05:33:22 UTC (rev 186944)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2015-07-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186911. rdar://problem/21822541
+
+ 2015-07-16 Simon Fraser <simon.fraser@apple.com>
+
+ Fix disappearing position:fixed elements in fixed layout mode
+ https://bugs.webkit.org/show_bug.cgi?id=147019
+
+ Reviewed by Tim Horton.
+
+ Test with four fixed elements in fixed layout mode.
+
+ * compositing/fixed-with-fixed-layout-expected.txt: Added.
+ * compositing/fixed-with-fixed-layout.html: Added.
+
+2015-07-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186868. rdar://problem/21758704
</span><span class="cx">
</span><span class="cx"> 2015-07-15 Dean Jackson <dino@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestscompositingfixedwithfixedlayoutexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt (0 => 186944)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout-expected.txt 2015-07-17 05:33:22 UTC (rev 186944)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+Top Left Right bottom
+(GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 806.00 1616.00)
+ (children 1
+ (GraphicsLayer
+ (anchor 0.00 0.00)
+ (bounds 1008.00 2021.00)
+ (contentsOpaque 1)
+ (transform [0.80 0.00 0.00 0.00] [0.00 0.80 0.00 0.00] [0.00 0.00 1.00 0.00] [0.00 0.00 0.00 1.00])
+ (children 4
+ (GraphicsLayer
+ (bounds 1000.00 100.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 0.00 200.00)
+ (bounds 100.00 100.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 900.00 200.00)
+ (bounds 100.00 100.00)
+ (drawsContent 1)
+ )
+ (GraphicsLayer
+ (position 0.00 1900.00)
+ (bounds 1000.00 100.00)
+ (drawsContent 1)
+ )
+ )
+ )
+ )
+)
+
</ins></span></pre></div>
<a id="branchessafari6011branchLayoutTestscompositingfixedwithfixedlayouthtml"></a>
<div class="addfile"><h4>Added: branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout.html (0 => 186944)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout.html (rev 0)
+++ branches/safari-601.1-branch/LayoutTests/compositing/fixed-with-fixed-layout.html 2015-07-17 05:33:22 UTC (rev 186944)
</span><span class="lines">@@ -0,0 +1,87 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ body {
+ height: 2000px;
+ width: 1000px;
+ }
+
+ .fixed {
+ position: fixed;
+ height: 100px;
+ width: 100px;
+ background-color: rgba(0, 0, 0, 0.5);
+ }
+
+ .top, .bottom {
+ left: 0;
+ width: 100%;
+ }
+
+ .left, .right {
+ top: 200px;
+ }
+
+ .top {
+ top: 0;
+ }
+
+ .bottom {
+ bottom: 0;
+ }
+ .left {
+ left: 0;
+ }
+ .right {
+ right: 0;
+ }
+ </style>
+ <script>
+
+ if (window.testRunner) {
+ testRunner.dumpAsText();
+ testRunner.waitUntilDone();
+ }
+
+ if (window.internals) {
+ internals.settings.setAcceleratedCompositingForFixedPositionEnabled(true);
+ internals.setUseFixedLayout(true);
+ internals.setFixedLayoutSize(1000, 2000);
+ var scale = 800 / 1000;
+ eventSender.scalePageBy(scale, scale);
+ }
+
+ function doTest()
+ {
+ window.setTimeout(function() {
+ document.getElementById("layerTree").innerText = window.internals.layerTreeAsText(document);
+ testRunner.notifyDone();
+ }, 0);
+ }
+
+ window.addEventListener('load', doTest, false);
+ </script>
+</head>
+<body>
+
+<div class="top fixed">
+ Top
+</div>
+
+<div class="left fixed">
+ Left
+</div>
+
+<div class="right fixed">
+ Right
+</div>
+
+<div class="bottom fixed">
+ bottom
+</div>
+
+<pre id="layerTree"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (186943 => 186944)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:18 UTC (rev 186943)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-07-17 05:33:22 UTC (rev 186944)
</span><span class="lines">@@ -1,5 +1,28 @@
</span><span class="cx"> 2015-07-16 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r186911. rdar://problem/21822541
+
+ 2015-07-16 Simon Fraser <simon.fraser@apple.com>
+
+ Fix disappearing position:fixed elements in fixed layout mode
+ https://bugs.webkit.org/show_bug.cgi?id=147019
+
+ Reviewed by Tim Horton.
+
+ Test: compositing/fixed-with-fixed-layout.html
+
+ When in fixed layout mode, and being scaled down, viewportConstrainedVisibleContentRect() is
+ the wrong thing to use to determine if position:fixed elements are clipped out. In this case,
+ use the simpler document bounds (before scaling).
+
+ In the long term, there needs to be an equivalent of viewportConstrainedVisibleContentRect()
+ that gives an appropriate rect that can be used here.
+
+ * rendering/RenderLayerCompositor.cpp:
+ (WebCore::RenderLayerCompositor::requiresCompositingForPosition):
+
+2015-07-16 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r186895. rdar://problem/21692212
</span><span class="cx">
</span><span class="cx"> 2015-07-16 Brady Eidson <beidson@apple.com>
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorerenderingRenderLayerCompositorcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp (186943 => 186944)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-07-17 05:33:18 UTC (rev 186943)
+++ branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerCompositor.cpp 2015-07-17 05:33:22 UTC (rev 186944)
</span><span class="lines">@@ -2739,7 +2739,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Fixed position elements that are invisible in the current view don't get their own layer.
</span><del>- LayoutRect viewBounds = m_renderView.frameView().viewportConstrainedVisibleContentRect();
</del><ins>+ // FIXME: We shouldn't have to check useFixedLayout() here; one of the viewport rects needs to give the correct answer.
+ LayoutRect viewBounds;
+ if (m_renderView.frameView().useFixedLayout())
+ viewBounds = m_renderView.unscaledDocumentRect();
+ else
+ viewBounds = m_renderView.frameView().viewportConstrainedVisibleContentRect();
</ins><span class="cx"> LayoutRect layerBounds = layer.calculateLayerBounds(&layer, LayoutSize(), RenderLayer::UseLocalClipRectIfPossible | RenderLayer::IncludeLayerFilterOutsets | RenderLayer::UseFragmentBoxesExcludingCompositing
</span><span class="cx"> | RenderLayer::ExcludeHiddenDescendants | RenderLayer::DontConstrainForMask | RenderLayer::IncludeCompositedDescendants);
</span><span class="cx"> // Map to m_renderView to ignore page scale.
</span></span></pre>
</div>
</div>
</body>
</html>