<!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>[188220] 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/188220">188220</a></dd>
<dt>Author</dt> <dd>dburkart@apple.com</dd>
<dt>Date</dt> <dd>2015-08-10 13:32:06 -0700 (Mon, 10 Aug 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/188190">r188190</a>. rdar://problem/22191482</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="#branchessafari6011branchSourceWebCorerenderingRenderBoxcpp">branches/safari-601.1-branch/Source/WebCore/rendering/RenderBox.cpp</a></li>
<li><a href="#branchessafari6011branchSourceWebCorerenderingRenderLayerBackingcpp">branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#branchessafari6011branchLayoutTestscompositingbackgroundsbackgroundimagewithnegativezindexexpectedhtml">branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html</a></li>
<li><a href="#branchessafari6011branchLayoutTestscompositingbackgroundsbackgroundimagewithnegativezindexhtml">branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.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 (188219 => 188220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog 2015-08-10 20:32:06 UTC (rev 188220)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-08-10 Dana Burkart <dburkart@apple.com>
+
+ Merge r188190. rdar://problem/22191482
+
+ 2015-08-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r179871.
+ https://bugs.webkit.org/show_bug.cgi?id=147810
+
+ Breaks product images on http://www.apple.com/shop/buy-
+ mac/macbook (Requested by smfr on #webkit).
+
+ Reverted changeset:
+
+ "Render: properly update body's background image"
+ https://bugs.webkit.org/show_bug.cgi?id=140183
+ http://trac.webkit.org/changeset/179871
+
</ins><span class="cx"> 2015-08-07 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Correct expectations for platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html.
</span></span></pre></div>
<a id="branchessafari6011branchLayoutTestscompositingbackgroundsbackgroundimagewithnegativezindexexpectedhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html (188219 => 188220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html 2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html 2015-08-10 20:32:06 UTC (rev 188220)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-<!doctype html>
-<html>
-<head>
-
-<style>
-body {
- width: 1024px;
- height: 720px;
- left: 0px;
- top: 0px;
- margin: 0px;
- position: absolute;
- background-image: url(../resources/apple.jpg);
-}
-</style>
-
-</head>
-<body>
-<div style="background-color: red; position: relative; top: 32px; left: 32px; width: 200px; height: 200px;">
-<div style="background-color: blue; position: absolute; top: 100px; left: 100px; width: 360px; height: 150px;"></div>
-</div>
-</body>
-</html>
-
</del></span></pre></div>
<a id="branchessafari6011branchLayoutTestscompositingbackgroundsbackgroundimagewithnegativezindexhtml"></a>
<div class="delfile"><h4>Deleted: branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html (188219 => 188220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html 2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html 2015-08-10 20:32:06 UTC (rev 188220)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-<!doctype html>
-<html>
-<head>
-<script language="JavaScript">
-
-function onLoad() {
- document.body.style.background = "url(../resources/apple.jpg)";
-
- var div = document.getElementById("div");
- div.style.zIndex = "-1";
-
- var trans = document.createElement("div");
- trans.style.backgroundColor = "blue";
- trans.style.width = "360px";
- trans.style.height = "150px";
- trans.style.position = "absolute";
- trans.style.top = "100px";
- trans.style.left = "100px";
- trans.style.webkitTransform = "translateZ(0)";
-
- div.appendChild(trans);
-
- if (window.testRunner)
- testRunner.notifyDone();
-}
-
-if (window.testRunner)
- testRunner.waitUntilDone();
-
-</script>
-
-<style>
-body {
- width: 1024px;
- height: 720px;
- left: 0px;
- top: 0px;
- margin: 0px;
- position: absolute;
- z-index: -1;
-}
-</style>
-
-</head>
-<body onload="onLoad()">
-<div id="div" style="background-color: red; position: relative; top: 32px; left: 32px; width: 200px; height: 200px;"></div>
-</body>
-</html>
-
</del></span></pre></div>
<a id="branchessafari6011branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188219 => 188220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/Source/WebCore/ChangeLog 2015-08-10 20:32:06 UTC (rev 188220)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2015-08-10 Dana Burkart <dburkart@apple.com>
+
+ Merge r188190. rdar://problem/22191482
+
+ 2015-08-08 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r179871.
+ https://bugs.webkit.org/show_bug.cgi?id=147810
+
+ Breaks product images on http://www.apple.com/shop/buy-
+ mac/macbook (Requested by smfr on #webkit).
+
+ Reverted changeset:
+
+ "Render: properly update body's background image"
+ https://bugs.webkit.org/show_bug.cgi?id=140183
+ http://trac.webkit.org/changeset/179871
+
</ins><span class="cx"> 2015-08-06 Dana Burkart <dburkart@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r187962. rdar://problem/21827815
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorerenderingRenderBoxcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/rendering/RenderBox.cpp (188219 => 188220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/rendering/RenderBox.cpp 2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/Source/WebCore/rendering/RenderBox.cpp 2015-08-10 20:32:06 UTC (rev 188220)
</span><span class="lines">@@ -53,7 +53,6 @@
</span><span class="cx"> #include "RenderInline.h"
</span><span class="cx"> #include "RenderIterator.h"
</span><span class="cx"> #include "RenderLayer.h"
</span><del>-#include "RenderLayerBacking.h"
</del><span class="cx"> #include "RenderLayerCompositor.h"
</span><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderNamedFlowThread.h"
</span><span class="lines">@@ -110,20 +109,9 @@
</span><span class="cx"> // The <body> only paints its background if the root element has defined a background independent of the body,
</span><span class="cx"> // or if the <body>'s parent is not the document element's renderer (e.g. inside SVG foreignObject).
</span><span class="cx"> auto documentElementRenderer = bodyElementRenderer->document().documentElement()->renderer();
</span><del>-
- if (!documentElementRenderer)
- return false;
-
- if (documentElementRenderer->hasBackground())
- return false;
-
- if (documentElementRenderer != bodyElementRenderer->parent())
- return false;
-
- if (bodyElementRenderer->isComposited() && documentElementRenderer->isComposited())
- return downcast<RenderLayerModelObject>(documentElementRenderer)->layer()->backing()->graphicsLayer()->drawsContent();
-
- return true;
</del><ins>+ return documentElementRenderer
+ && !documentElementRenderer->hasBackground()
+ && (documentElementRenderer == bodyElementRenderer->parent());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RenderBox::RenderBox(Element& element, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
</span></span></pre></div>
<a id="branchessafari6011branchSourceWebCorerenderingRenderLayerBackingcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (188219 => 188220)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-08-10 20:24:35 UTC (rev 188219)
+++ branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp 2015-08-10 20:32:06 UTC (rev 188220)
</span><span class="lines">@@ -2010,7 +2010,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((changeType == BackgroundImageChanged) && canCreateTiledImage(renderer().style()))
</span><del>- updateAfterLayout(NeedsFullRepaint | IsUpdateRoot);
</del><ins>+ updateGeometry();
</ins><span class="cx">
</span><span class="cx"> if ((changeType == MaskImageChanged) && m_maskLayer) {
</span><span class="cx"> // The composited layer bounds relies on box->maskClipRect(), which changes
</span></span></pre>
</div>
</div>
</body>
</html>