Title: [188220] branches/safari-601.1-branch
- Revision
- 188220
- Author
- dburk...@apple.com
- Date
- 2015-08-10 13:32:06 -0700 (Mon, 10 Aug 2015)
Log Message
Merge r188190. rdar://problem/22191482
Modified Paths
Removed Paths
Diff
Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (188219 => 188220)
--- 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)
@@ -1,3 +1,21 @@
+2015-08-10 Dana Burkart <dburk...@apple.com>
+
+ Merge r188190. rdar://problem/22191482
+
+ 2015-08-08 Commit Queue <commit-qu...@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
+
2015-08-07 Alexey Proskuryakov <a...@apple.com>
Correct expectations for platform/mac/fast/scrolling/scroll-div-with-nested-nonscrollable-iframe.html.
Deleted: branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html (188219 => 188220)
--- 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)
@@ -1,24 +0,0 @@
-<!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>
-
Deleted: branches/safari-601.1-branch/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html (188219 => 188220)
--- 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)
@@ -1,49 +0,0 @@
-<!doctype html>
-<html>
-<head>
-<script language="_javascript_">
-
-function onLoad() {
- document.body.style.background = ""
-
- 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>
-
Modified: branches/safari-601.1-branch/Source/WebCore/ChangeLog (188219 => 188220)
--- 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)
@@ -1,3 +1,21 @@
+2015-08-10 Dana Burkart <dburk...@apple.com>
+
+ Merge r188190. rdar://problem/22191482
+
+ 2015-08-08 Commit Queue <commit-qu...@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
+
2015-08-06 Dana Burkart <dburk...@apple.com>
Merge r187962. rdar://problem/21827815
Modified: branches/safari-601.1-branch/Source/WebCore/rendering/RenderBox.cpp (188219 => 188220)
--- 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)
@@ -53,7 +53,6 @@
#include "RenderInline.h"
#include "RenderIterator.h"
#include "RenderLayer.h"
-#include "RenderLayerBacking.h"
#include "RenderLayerCompositor.h"
#include "RenderNamedFlowFragment.h"
#include "RenderNamedFlowThread.h"
@@ -110,20 +109,9 @@
// The <body> only paints its background if the root element has defined a background independent of the body,
// or if the <body>'s parent is not the document element's renderer (e.g. inside SVG foreignObject).
auto documentElementRenderer = bodyElementRenderer->document().documentElement()->renderer();
-
- 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;
+ return documentElementRenderer
+ && !documentElementRenderer->hasBackground()
+ && (documentElementRenderer == bodyElementRenderer->parent());
}
RenderBox::RenderBox(Element& element, Ref<RenderStyle>&& style, unsigned baseTypeFlags)
Modified: branches/safari-601.1-branch/Source/WebCore/rendering/RenderLayerBacking.cpp (188219 => 188220)
--- 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)
@@ -2010,7 +2010,7 @@
}
if ((changeType == BackgroundImageChanged) && canCreateTiledImage(renderer().style()))
- updateAfterLayout(NeedsFullRepaint | IsUpdateRoot);
+ updateGeometry();
if ((changeType == MaskImageChanged) && m_maskLayer) {
// The composited layer bounds relies on box->maskClipRect(), which changes
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
