Title: [188190] trunk
Revision
188190
Author
[email protected]
Date
2015-08-08 11:40:38 -0700 (Sat, 08 Aug 2015)

Log Message

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

Modified Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (188189 => 188190)


--- trunk/LayoutTests/ChangeLog	2015-08-08 06:33:40 UTC (rev 188189)
+++ trunk/LayoutTests/ChangeLog	2015-08-08 18:40:38 UTC (rev 188190)
@@ -1,3 +1,17 @@
+2015-08-08  Commit Queue  <[email protected]>
+
+        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  Myles C. Maxfield  <[email protected]>
 
         [El Capitan] Test Gardening

Deleted: trunk/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html (188189 => 188190)


--- trunk/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html	2015-08-08 06:33:40 UTC (rev 188189)
+++ trunk/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex-expected.html	2015-08-08 18:40:38 UTC (rev 188190)
@@ -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: trunk/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html (188189 => 188190)


--- trunk/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html	2015-08-08 06:33:40 UTC (rev 188189)
+++ trunk/LayoutTests/compositing/backgrounds/background-image-with-negative-zindex.html	2015-08-08 18:40:38 UTC (rev 188190)
@@ -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: trunk/Source/WebCore/ChangeLog (188189 => 188190)


--- trunk/Source/WebCore/ChangeLog	2015-08-08 06:33:40 UTC (rev 188189)
+++ trunk/Source/WebCore/ChangeLog	2015-08-08 18:40:38 UTC (rev 188190)
@@ -1,3 +1,17 @@
+2015-08-08  Commit Queue  <[email protected]>
+
+        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  Gyuyoung Kim  <[email protected]>
 
         Reduce uses of PassRefPtr in bindings

Modified: trunk/Source/WebCore/rendering/RenderBox.cpp (188189 => 188190)


--- trunk/Source/WebCore/rendering/RenderBox.cpp	2015-08-08 06:33:40 UTC (rev 188189)
+++ trunk/Source/WebCore/rendering/RenderBox.cpp	2015-08-08 18:40:38 UTC (rev 188190)
@@ -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: trunk/Source/WebCore/rendering/RenderLayerBacking.cpp (188189 => 188190)


--- trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2015-08-08 06:33:40 UTC (rev 188189)
+++ trunk/Source/WebCore/rendering/RenderLayerBacking.cpp	2015-08-08 18:40:38 UTC (rev 188190)
@@ -2005,7 +2005,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
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to